From: oharboe at B. <oh...@ma...> - 2009-10-07 08:56:48
|
Author: oharboe Date: 2009-10-07 08:56:45 +0200 (Wed, 07 Oct 2009) New Revision: 2811 Modified: zy1000/trunk/build/tcl/index.tcl zy1000/trunk/build/tcl/preconfig.tcl zy1000/trunk/build/tcl/reload.tcl zy1000/trunk/build/tcl/upgrade.tcl zy1000/trunk/build/tcl/zy1000.tcl zy1000/trunk/snapshots/discover.zip zy1000/trunk/snapshots/jimtcl.zip Log: zy1000 1.55 snapshot Modified: zy1000/trunk/build/tcl/index.tcl =================================================================== --- zy1000/trunk/build/tcl/index.tcl 2009-10-07 06:53:44 UTC (rev 2810) +++ zy1000/trunk/build/tcl/index.tcl 2009-10-07 06:56:45 UTC (rev 2811) @@ -246,7 +246,7 @@ <tcl> if {[string compare $form_action "Reboot ZY1000"]==0} { append buffer "Rebooting ZY1000..." - reboot + zy1000_reboot } </tcl> Modified: zy1000/trunk/build/tcl/preconfig.tcl =================================================================== --- zy1000/trunk/build/tcl/preconfig.tcl 2009-10-07 06:53:44 UTC (rev 2810) +++ zy1000/trunk/build/tcl/preconfig.tcl 2009-10-07 06:56:45 UTC (rev 2811) @@ -145,7 +145,7 @@ if {[string compare $form_action "Select and reload"]==0} { capture "trunc /config/settings/openocd.cfg" capture "append_file /config/settings/openocd.cfg script $form_target" - reboot + zy1000_reboot } set form_target [load_target] Modified: zy1000/trunk/build/tcl/reload.tcl =================================================================== --- zy1000/trunk/build/tcl/reload.tcl 2009-10-07 06:53:44 UTC (rev 2810) +++ zy1000/trunk/build/tcl/reload.tcl 2009-10-07 06:56:45 UTC (rev 2811) @@ -151,7 +151,7 @@ if {[string compare $form_action "Reload"]==0} { append buffer "Reloading Config Scripts...<p>" - reboot + zy1000_reboot } </tcl> <form enctype="multipart/form-data" action="reload.tcl" method="post"> Modified: zy1000/trunk/build/tcl/upgrade.tcl =================================================================== --- zy1000/trunk/build/tcl/upgrade.tcl 2009-10-07 06:53:44 UTC (rev 2810) +++ zy1000/trunk/build/tcl/upgrade.tcl 2009-10-07 06:56:45 UTC (rev 2811) @@ -194,7 +194,7 @@ if {[check_firmware $form_filecontent]} { write_firmware $form_filecontent append buffer "<br><div style='font-size:14px;'>Upgraded Zylin JTAG, rebooting (wait ca. 30 seconds)...</div><br>" - reboot + zy1000_reboot } else { append buffer "<br>Not a valid Zylin JTAG firmware file.<br>" } @@ -208,7 +208,7 @@ } } rmdir /config/settings - reboot + zy1000_reboot append buffer "Restoring factory settings (wait ca. 30 seconds)...<br>" } else { append buffer {<div style="font-size:14px;">Upgrade Zylin JTAG firmware + reboot. </div><p>} Modified: zy1000/trunk/build/tcl/zy1000.tcl =================================================================== --- zy1000/trunk/build/tcl/zy1000.tcl 2009-10-07 06:53:44 UTC (rev 2810) +++ zy1000/trunk/build/tcl/zy1000.tcl 2009-10-07 06:56:45 UTC (rev 2811) @@ -228,13 +228,13 @@ $fp puts -nonewline "$form_ip,$form_mask,$form_gateway" $fp close append buffer "Set $form_ip,$form_mask,$form_gateway to $form_filename. Reloading settings..." - reboot + zy1000_reboot } elseif {[string compare $form_action "Use DHCP"]==0} { set fp [aio.open $form_filename w]; $fp puts -nonewline "" $fp close append buffer "Using DHCP. Reloading settings..." - reboot + zy1000_reboot } else { </tcl> <form action="zy1000.tcl" method="post"> Modified: zy1000/trunk/snapshots/discover.zip =================================================================== (Binary files differ) Modified: zy1000/trunk/snapshots/jimtcl.zip =================================================================== (Binary files differ) |