Pre beta

do.sh

@@ -0,0 +1,79 @@
+#!/bin/bash
+
+if [ -n "$1" ]
+then
+    while [ -n "$1" ]
+    do
+        case $1 in
+            clean)
+            $IDF_PATH/tools/idf.py clean
+            ;;
+            build)
+            $IDF_PATH/tools/idf.py all
+            ;;
+            build-front)
+            cd components/thingjs_front/ && npm run build && cd ../..
+            ;;
+            build-all)
+            cd components/thingjs_front/ && npm run build && cd ../.. && $IDF_PATH/tools/idf.py all
+            ;;
+            flash)
+            $IDF_PATH/tools/idf.py flash
+            ;;
+            erase)
+            $IDF_PATH/tools/idf.py erase
+            ;;
+            monitor)
+            $IDF_PATH/tools/idf.py monitor
+            ;;
+            pull-all)
+            echo "Pull esp32"
+            git pull
+            echo "Pulling thingjs_boards"
+            cd components/thingjs_boards/ && git pull && cd ..
+            echo "Pulling thingjs_extern"
+            cd thingjs_extern && git pull && cd ..
+            echo "Pulling thingjs_front"
+            cd thingjs_front && git pull && cd ..
+            echo "Pulling thingjs_stdi"
+            cd thingjs_stdi && git pull && cd ..
+            ;;
+            checkout-all)
+            if [[ $2 == "-b" ]]; then
+              over_params="-b"
+              shift
+            fi
+            echo "Checkout esp32 to $over_params $2"
+            git checkout $over_params $2 && git pull
+            echo "Checkout thingjs_boards to $over_params $2"
+            cd components/thingjs_boards/ && git checkout $over_params $2 && git pull
+            cd ..
+            echo "Checkout thingjs_front to $over_params $2"
+            cd thingjs_front && git checkout $over_params $2 && git pull
+            cd ..
+            echo "Checkout thingjs_stdi to $over_params $2"
+            cd thingjs_stdi && git checkout $over_params $2 && git pull
+            cd ..
+            shift
+            ;;
+            air)
+            if [ ! -d "./build/" ]
+            then
+                echo "Prepare firmware..."
+                $IDF_PATH/tools/idf.py all
+            fi
+
+            ip=$(awk -F "=" '/controller-ip/ {print $2}' config.ini)
+            echo "Try to upload firmware to $ip"
+            curl -m 60 -# -F 'data=@./build/ThingJS.bin;filename=firmware.bin' "http://$ip/firmware"
+            echo ""
+            ;;
+            *)
+            echo "Unknown command $1"
+            ;;
+        esac
+        shift
+    done
+else
+    $IDF_PATH/tools/idf.py all
+fi

partitions.csv

@@ -3,6 +3,6 @@
 nvs,      data, nvs,     0x9000,  0x4000,
 otadata,  data, ota,     0xd000,  0x2000
 phy_init, data, phy,     0xf000,  0x1000,
-ota_0,    app,  ota_0,   0x10000, 0x140000,
-ota_1,    app,  ota_1,   ,        0x140000,
-storage,  data, spiffs,  ,        0x170000,
+ota_0,    app,  ota_0,   0x10000, 0x160000,
+ota_1,    app,  ota_1,   ,        0x160000,
+storage,  data, spiffs,  ,        0x130000,

sdkconfig

@@ -4,7 +4,6 @@
 #
 CONFIG_IDF_TARGET_ESP32=y
 CONFIG_IDF_TARGET="esp32"
-CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
 
 #
 # SDK tool configuration