Ollo/Wordclock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remote upgrade script detects clock successfully

Browse Source
This commit is contained in:
Ollo 2021-03-21 18:21:04 +01:00
parent c513f7c899
commit 116c30f5e5
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tools/remoteFlash.sh
View File

@ -2,6 +2,7 @@
MQTTSERVER=$1 MQTTSERVER=$1
MQTTPREFIX=$2 MQTTPREFIX=$2
CUSTOMFILE=$3
FLASHTOOL=./tools/tcpFlash.py FLASHTOOL=./tools/tcpFlash.py
@ -31,19 +32,27 @@ fi
echo "Activate Telnet server" echo "Activate Telnet server"
mosquitto_pub -h $MQTTSERVER -t "$MQTTPREFIX/cmd/telnet" -m "a" mosquitto_pub -h $MQTTSERVER -t "$MQTTPREFIX/cmd/telnet" -m "a"
TELNETIP=$(mosquitto_sub -h $MQTTSERVER -t "$MQTTPREFIX/telnet" -C 1) TELNETIP=$(mosquitto_sub -h $MQTTSERVER -t "$MQTTPREFIX/telnet" -C 1)
echo "Upgrading $MQTTPREFIX via telenet on $TELNETIP" echo "Upgrading $MQTTPREFIX via telenet on $TELNETIP ..."
sleep 1
echo "stopWordclock()" > $UPGRADEPREP echo "if (mlt ~= nil) then mlt:unregister() end" > $UPGRADEPREP
echo "uart.write(0, tostring(node.heap())" >> $UPGRADEPREP echo "uart.write(0, tostring(node.heap())" >> $UPGRADEPREP
echo "c = string.char(0,0,128)" >> $UPGRADEPREP echo "collectgarbage()" >> $UPGRADEPREP
echo "" >> $UPGRADEPREP
echo "download = string.char(0,0,64)" >> $UPGRADEPREP
echo "w = string.char(0,0,0)" >> $UPGRADEPREP echo "w = string.char(0,0,0)" >> $UPGRADEPREP
echo "ws2812.write(w:rep(4) .. c .. w:rep(15) .. c .. w:rep(9) .. c .. w:rep(30) .. c .. w:rep(41) .. c )" >> $UPGRADEPREP echo "ws2812.write(w:rep(4) .. download .. w:rep(15) .. download .. w:rep(9) .. download .. w:rep(30) .. download .. w:rep(41) .. download )" >> $UPGRADEPREP
echo "collectgarbage()" >> $UPGRADEPREP
$FLASHTOOL -f $UPGRADEPREP -t $TELNETIP -v $FLASHTOOL -f $UPGRADEPREP -t $TELNETIP -v
exit 2 if [[ "$CUSTOMFILE" == "" ]]; then
FILES="displayword.lua main.lua timecore.lua webpage.html webserver.lua wordclock.lua init.lua" FILES="displayword.lua main.lua timecore.lua webpage.html webserver.lua wordclock.lua init.lua"
echo "Start Flasing ..."
else
FILES=$CUSTOMFILE
echo "Start Flasing $FILES"
fi
echo "Start Flasing ..." exit 2
for f in $FILES; do for f in $FILES; do
if [ ! -f $f ]; then if [ ! -f $f ]; then
echo "Cannot find $f" echo "Cannot find $f"

2
tools/tcpFlash.py
View File

@ -72,8 +72,6 @@ def main(nodeip, luafile, volatile=None):
s.close() s.close()
sys.exit(3) sys.exit(3)
sendCmd(s, "for i=0,5 do tmr.stop(i) end")
sendCmd(s, "collectgarbage()")
if (volatile is None): if (volatile is None):
print "Flashing " + luafile print "Flashing " + luafile
sendCmd(s, "file.remove(\"" + luafile+"\");", True) sendCmd(s, "file.remove(\"" + luafile+"\");", True)