Indention improved

This commit is contained in:
ollo 2020-03-06 23:55:14 +01:00
parent 344fb0ab9a
commit b5f46a14d2
2 changed files with 28 additions and 26 deletions

View File

@ -100,29 +100,29 @@ else
inv46 = "off"
end
end
if (_dim ~= nil) then
dim = _dim
if ( _dim ~= nil) then
dim = _dim
end
if (_fcolor ~= nil) then
fcolor = _fcolor
fcolor = _fcolor
end
if (_bcolor ~= nil) then
bcolor = _bcolor
bcolor = _bcolor
end
if (_colorMin1 ~= nil) then
colorMin1 = _colorMin1
colorMin1 = _colorMin1
end
if (_colorMin2 ~= nil) then
colorMin2 = _colorMin2
colorMin2 = _colorMin2
end
if (_colorMin3 ~= nil) then
colorMin3 = _colorMin3
colorMin3 = _colorMin3
end
if (_colorMin4 ~= nil) then
colorMin4 = _colorMin4
colorMin4 = _colorMin4
end
if (_threequater ~= nil) then
threequater = _threequater
threequater = _threequater
end
print("SSID = " .. tostring(ssid))

View File

@ -3,6 +3,7 @@
LUATOOL=./tools/luatool.py
DEVICE=$1
BAUD=115200
# check the serial connection
@ -19,30 +20,31 @@ if [ $# -eq 0 ]; then
fi
if [ $# -eq 1 ]; 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 telnet.lua wordclock.lua init.lua"
else
FILES=$2
fi
# Format filesystem first
#echo "Format the complete ESP"
#$LUATOOL -p $DEVICE -w -b 115200
#if [ $? -ne 0 ]; then
# echo "STOOOOP"
# exit 1
#fi
echo "Format the complete ESP"
$LUATOOL -p $DEVICE -w -b $BAUD
if [ $? -ne 0 ]; then
echo "STOOOOP"
exit 1
fi
echo "Reboot the ESP"
echo "node.restart()" >> $DEVICE
sleep 1
for i in $(seq 0 5); do
echo "Stop TMR $i"
echo "tmr.stop($i)" >> $DEVICE
sleep 1
done
#stty -F $DEVICE $BAUD
#echo "Reboot the ESP"
#echo "node.restart()" >> $DEVICE
#sleep 1
#for i in $(seq 0 5); do
# echo "Stop TMR $i"
# echo "tmr.stop($i)" >> $DEVICE
# sleep 1
#done
echo
#echo
echo "Start Flasing ..."
for f in $FILES; do
if [ ! -f $f ]; then
@ -51,7 +53,7 @@ for f in $FILES; do
exit 1
fi
echo "------------- $f ------------"
$LUATOOL -p $DEVICE -f $f -b 115200 -t $f
$LUATOOL -p $DEVICE -f $f -b $BAUD -t $f
if [ $? -ne 0 ]; then
echo "STOOOOP"
exit 1