From 22f72b1de90ae8b4684286bb7279cfbdba50ff43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B8=D0=BE=D0=BD=D1=82=D0=B8=D0=BA=20=D0=A0=D0=BE?= =?UTF-8?q?=D0=BC=D0=B0=D0=BD?= Date: Thu, 31 Oct 2019 16:29:25 +0300 Subject: [PATCH 1/7] Remove 1wire & ledc interfaces --- components/thingjs_boards | 2 +- components/thingjs_core | 2 +- components/thingjs_front | 2 +- components/thingjs_stdi | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/thingjs_boards b/components/thingjs_boards index f0fa8b1..e84a95a 160000 --- a/components/thingjs_boards +++ b/components/thingjs_boards @@ -1 +1 @@ -Subproject commit f0fa8b1ae59d9bfe63d8a86f98ce43c5de33269d +Subproject commit e84a95a41c456afad06c8bfa8b53ce794e4efb03 diff --git a/components/thingjs_core b/components/thingjs_core index bc6b0a9..78b6be9 160000 --- a/components/thingjs_core +++ b/components/thingjs_core @@ -1 +1 @@ -Subproject commit bc6b0a96713870e818c68037738cd48650a073cd +Subproject commit 78b6be98e1aa89c81846b08a90a52cf99a83f073 diff --git a/components/thingjs_front b/components/thingjs_front index aba2bfa..3a6f272 160000 --- a/components/thingjs_front +++ b/components/thingjs_front @@ -1 +1 @@ -Subproject commit aba2bfa8e1dc02208525cfa2179efc23159f3328 +Subproject commit 3a6f272d608d4df13def52ba2ae5ff443c346ac1 diff --git a/components/thingjs_stdi b/components/thingjs_stdi index 4455e3c..07f0944 160000 --- a/components/thingjs_stdi +++ b/components/thingjs_stdi @@ -1 +1 @@ -Subproject commit 4455e3cac03ced16e9be4c6e911985ed5a570484 +Subproject commit 07f0944550a58307846123b8ae4c550ea41dc87b From 96298e43ec92b2b9ca6b0a5726fbbf542ab41c75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B8=D0=BE=D0=BD=D1=82=D0=B8=D0=BA=20=D0=A0=D0=BE?= =?UTF-8?q?=D0=BC=D0=B0=D0=BD?= Date: Sat, 30 May 2020 14:02:58 +0300 Subject: [PATCH 2/7] Pre-beta Added http/https interface Added clock interface Added ds3231 interface Added sample applications lucerna, clock, http Some refactoring --- components/thingjs_boards | 2 +- components/thingjs_core | 2 +- components/thingjs_extern | 2 +- components/thingjs_front | 2 +- components/thingjs_stdi | 2 +- do.sh | 79 +++++++++++++++++++++++++++++++++++++++ partitions.csv | 6 +-- 7 files changed, 87 insertions(+), 8 deletions(-) create mode 100755 do.sh diff --git a/components/thingjs_boards b/components/thingjs_boards index e84a95a..1753284 160000 --- a/components/thingjs_boards +++ b/components/thingjs_boards @@ -1 +1 @@ -Subproject commit e84a95a41c456afad06c8bfa8b53ce794e4efb03 +Subproject commit 17532840280db1b26055f5a383d3cc3724821edd diff --git a/components/thingjs_core b/components/thingjs_core index 78b6be9..f9bfa3e 160000 --- a/components/thingjs_core +++ b/components/thingjs_core @@ -1 +1 @@ -Subproject commit 78b6be98e1aa89c81846b08a90a52cf99a83f073 +Subproject commit f9bfa3edeff0afc78d4198c9a2c23aa644dabbc0 diff --git a/components/thingjs_extern b/components/thingjs_extern index 2b73b55..3a348c5 160000 --- a/components/thingjs_extern +++ b/components/thingjs_extern @@ -1 +1 @@ -Subproject commit 2b73b551da5ed69466457f1b22cb1d0b8e4a6a2f +Subproject commit 3a348c5ec0744c1e0b81ce108142015d31ec1dc4 diff --git a/components/thingjs_front b/components/thingjs_front index 3a6f272..66c583c 160000 --- a/components/thingjs_front +++ b/components/thingjs_front @@ -1 +1 @@ -Subproject commit 3a6f272d608d4df13def52ba2ae5ff443c346ac1 +Subproject commit 66c583c25dd56179f5c71ee377b0c5dffee329c0 diff --git a/components/thingjs_stdi b/components/thingjs_stdi index 07f0944..a1e4b55 160000 --- a/components/thingjs_stdi +++ b/components/thingjs_stdi @@ -1 +1 @@ -Subproject commit 07f0944550a58307846123b8ae4c550ea41dc87b +Subproject commit a1e4b5519fd0129a10f91d3b4fb6ea3b5fd05fc3 diff --git a/do.sh b/do.sh new file mode 100755 index 0000000..54cf0b7 --- /dev/null +++ b/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 diff --git a/partitions.csv b/partitions.csv index 9f96b1f..e478321 100644 --- a/partitions.csv +++ b/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, \ No newline at end of file +ota_0, app, ota_0, 0x10000, 0x160000, +ota_1, app, ota_1, , 0x160000, +storage, data, spiffs, , 0x130000, \ No newline at end of file From 81f62802ab0f2ab13aa0c2b5e4d4c37574af14d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B8=D0=BE=D0=BD=D1=82=D0=B8=D0=BA=20=D0=A0=D0=BE?= =?UTF-8?q?=D0=BC=D0=B0=D0=BD?= Date: Sat, 30 May 2020 14:08:40 +0300 Subject: [PATCH 3/7] Update core library --- sdkconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/sdkconfig b/sdkconfig index 51cbc32..fa1968c 100644 --- a/sdkconfig +++ b/sdkconfig @@ -4,7 +4,6 @@ # CONFIG_IDF_TARGET_ESP32=y CONFIG_IDF_TARGET="esp32" -CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000 # # SDK tool configuration From 8cc2fd4b4c6bf3d1e1b31898671ee9dbc49c3c6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B8=D0=BE=D0=BD=D1=82=D0=B8=D0=BA=20=D0=A0=D0=BE?= =?UTF-8?q?=D0=BC=D0=B0=D0=BD?= Date: Sat, 30 May 2020 14:08:49 +0300 Subject: [PATCH 4/7] Update core library --- components/thingjs_core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/thingjs_core b/components/thingjs_core index f9bfa3e..a82efb9 160000 --- a/components/thingjs_core +++ b/components/thingjs_core @@ -1 +1 @@ -Subproject commit f9bfa3edeff0afc78d4198c9a2c23aa644dabbc0 +Subproject commit a82efb96b74093a70eb7b1e6be59875872e12d9b From 83a9b386928f79259c887ff61d418b98d61ddba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B8=D0=BE=D0=BD=D1=82=D0=B8=D0=BA=20=D0=A0=D0=BE?= =?UTF-8?q?=D0=BC=D0=B0=D0=BD?= Date: Sat, 30 May 2020 14:21:43 +0300 Subject: [PATCH 5/7] Move to frontend master --- components/thingjs_front | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/thingjs_front b/components/thingjs_front index 66c583c..9a1514a 160000 --- a/components/thingjs_front +++ b/components/thingjs_front @@ -1 +1 @@ -Subproject commit 66c583c25dd56179f5c71ee377b0c5dffee329c0 +Subproject commit 9a1514af1f77e580c0c7d8fc7502b9d53c9ee94c From 18b42d64480977e5da01f179c2738703b73e09e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B8=D0=BE=D0=BD=D1=82=D0=B8=D0=BA=20=D0=A0=D0=BE?= =?UTF-8?q?=D0=BC=D0=B0=D0=BD?= Date: Sat, 30 May 2020 14:33:48 +0300 Subject: [PATCH 6/7] Fix refs to front & stdi again... --- components/thingjs_front | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/thingjs_front b/components/thingjs_front index 9a1514a..a46117d 160000 --- a/components/thingjs_front +++ b/components/thingjs_front @@ -1 +1 @@ -Subproject commit 9a1514af1f77e580c0c7d8fc7502b9d53c9ee94c +Subproject commit a46117dd07aaa7d7f9e4e9d763f5057f223db797 From 40fcba0919090a2e599aec7d0bc838fc23b13d87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B8=D0=BE=D0=BD=D1=82=D0=B8=D0=BA=20=D0=A0=D0=BE?= =?UTF-8?q?=D0=BC=D0=B0=D0=BD?= Date: Sat, 30 May 2020 14:57:41 +0300 Subject: [PATCH 7/7] Update front ref --- components/thingjs_front | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/thingjs_front b/components/thingjs_front index a46117d..1a00337 160000 --- a/components/thingjs_front +++ b/components/thingjs_front @@ -1 +1 @@ -Subproject commit a46117dd07aaa7d7f9e4e9d763f5057f223db797 +Subproject commit 1a003373679bfbd6d36c45a7331d9e8022d5b8b1