FIJI.pm: fix phases of RST_EXT_IN_NAME and resort some entries

bin/FIJI.pm

@@ -346,8 +346,8 @@ BEGIN {
             ini_name    => "RST_EXT_ACT",
             type        => 'bit',
             values      => [qw(0 1)],
-            phases_opt  => ['setup', 'download'],
             default     => '1',
+            phases_opt  => ['setup', 'download'],
             depends_on  => 'RST_EXT_EN',
             group       => 'reset_external',
             order       => 20,
@@ -361,7 +361,6 @@ BEGIN {
             type        => "external_port",
             group       => 'reset_external',
             depends_on  => 'RST_EXT_EN',
-            phases_opt  => [qw(instrument download)],
             order       => 30,
         },
 
@@ -446,8 +445,8 @@ BEGIN {
             ini_name    => "RST_DUT_IN_ACT",
             type        => 'bit',
             values      => [qw(0 1)],
-            phases_opt  => ['setup'],
             default     => '1',
+            phases_opt  => ['setup'],
             depends_on  => 'RST_DUT_IN_EN',
             group       => 'reset_to_dut',
             order       => 20,
@@ -471,8 +470,8 @@ BEGIN {
             ini_name    => "TRIG_DUT_ACT",
             type        => 'bit',
             values      => [qw(0 1)],
-            phases_opt  => ['setup'],
             default     => '1',
+            phases_opt  => ['setup'],
             depends_on  => 'TRIG_DUT_EN',
             group       => 'trigger',
             order       => 20,
@@ -507,8 +506,8 @@ BEGIN {
             ini_name    => "TRIG_EXT_ACT",
             type        => 'bit',
             values      => [qw(0 1)],
-            phases_opt  => ['setup'],
             default     => '1',
+            phases_opt  => ['setup'],
             depends_on  => 'TRIG_EXT_EN',
             group       => 'trigger',
             order       => 50,
@@ -518,8 +517,8 @@ BEGIN {
             help        => "Specify the name of the external trigger port in the wrapper.\nThis port name must not exist in the toplevel.",
             ini_name    => "TRIG_EXT_IN_NAME",
             type        => "external_port",
-            phases_opt  => ['setup'],
             default     => "s_fiji_trig_ext_i",
+            phases_opt  => ['setup'],
             depends_on  => 'TRIG_EXT_EN',
             group       => "trigger",
             order       => 60,
@@ -551,8 +550,8 @@ BEGIN {
             ini_name    => "FD_1_INVERT",
             type        => 'boolean',
             values      => [qw(0 1)],
-            phases_opt  => ['setup'],
             default     => '0',
+            phases_opt  => ['setup'],
             depends_on  => 'FD_1_EN',
             group       => 'fault_detect',
             order       => 30,
@@ -584,8 +583,8 @@ BEGIN {
             ini_name    => "FD_2_INVERT",
             type        => 'boolean',
             values      => [qw(0 1)],
-            phases_opt  => ['setup'],
             default     => '0',
+            phases_opt  => ['setup'],
             depends_on  => 'FD_2_EN',
             group       => 'fault_detect',
             order       => 60,
@@ -605,8 +604,8 @@ BEGIN {
             help        => "Specify the name of the FIJI-to-Host serial TX port in the wrapper.\nThis port name must not exist in the toplevel.",
             ini_name    => "TX_OUT_NAME",
             type        => "external_port",
-            phases_opt  => [qw(instrument download)],
             default     => "s_fiji_tx_o",
+            phases_opt  => [qw(instrument download)],
             group       => "general_control",
             order       => 12,
         },

bin/FIJI/Settings.pm

@@ -746,7 +746,7 @@ sub _validate_hashmap {
         } else {
             my $rv = validate_value($map_ref, $nl_ref, $entry_key, \$consts_ref->{$entry_key}, undef, $consts_ref);
             if (defined($rv)) {
-                my $msg = sprintf("%s = \"%s\" is invalid (%s).", $entry_key, !defined($consts_ref->{$entry_key}) ? "<undef>" : $consts_ref->{$entry_key}, $rv);
+                my $msg = sprintf("%s = \"%s\" is invalid (%s)%s.", $entry_key, !defined($consts_ref->{$entry_key}) ? "<undef>" : $consts_ref->{$entry_key}, $rv, defined($phase) ? " in phase $phase" : "");
                 if (scalar(grep { $_ eq $phase } @{$map_ref->{$entry_key}->{'phases_opt'}}) == 0) {
                     $logger->error($msg);
                     $errors = "" if !defined($errors);