From 0090e3c9e214d91b6ee6e48e714126dc75cafbde Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Tue, 16 May 2017 17:45:56 +0200 Subject: [PATCH] Update CTS export function: sort registers and add 'disable all triggers' during configuration. --- web/include/CtsCommands.pm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/web/include/CtsCommands.pm b/web/include/CtsCommands.pm index cab1718..2d19fa8 100644 --- a/web/include/CtsCommands.pm +++ b/web/include/CtsCommands.pm @@ -92,7 +92,10 @@ sub commandDump { $result .= "# generated: " . time2str('%Y-%m-%d %H:%M', time) . "\n"; $result .= "# CTS Compile time: " . time2str('%Y-%m-%d %H:%M', $cts->getTrb()->read(0x40)) . "\n#\n"; $result .= "# " . $prefix . "Dev. Reg. Value\n"; + + $result .= sprintf($prefix . "setbit 0x%04x 0xa00c 0x80000000 # Disable all triggers\n", $cts->getTrb()->getEndpoint()); + my $settings; foreach my $reg ( @{$cts->getExportRegisters()} ) { my $val = $cts->getRegisters->{$reg}->format(); my @compact = split /, /, $val->{'_compact'}; @@ -110,8 +113,8 @@ sub commandDump { push @ccompact, $tmp if ($tmp); unshift @ccompact, "" if ($#ccompact > 0); - - $result .= sprintf($prefix . "w 0x%04x 0x%04x 0x%08x # %s: %s\n", + if($cts->getRegisters->{$reg}->getAddress() == 0xa00c) { $val->{'_raw'} |= 0x80000000;} #needed to keep triggers offset + $settings->{$cts->getRegisters->{$reg}->getAddress()} = sprintf($prefix . "w 0x%04x 0x%04x 0x%08x # %s: %s\n", $cts->getTrb()->getEndpoint(), $cts->getRegisters->{$reg}->getAddress(), $val->{'_raw'}, @@ -119,7 +122,10 @@ sub commandDump { join "\n" . (" " x 28) . "# ", @ccompact ); } - + foreach my $s (sort keys %$settings) { + $result .= $settings->{$s}; + } + $result .= sprintf($prefix . "clearbit 0x%04x 0xa00c 0x80000000 # Enable all triggers\n", $cts->getTrb()->getEndpoint()); return $result; } -- 2.43.0