small fixes

mongoose-os-apps · Nov 28, 2024 · 69efd7c · 69efd7c
1 parent f37ee89
commit 69efd7c
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 32 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -10,29 +10,30 @@ jobs:
       fail-fast: false
       matrix:
         model:
-          - Shelly1
-          - Shelly1L
-          - Shelly1PM
-          - Shelly2
-          - Shelly25
-          - ShellyColorBulb
-          - ShellyDuo
-          - ShellyI3
-          - ShellyPlug
-          - ShellyPlugS
-          - ShellyPlus1
-          - ShellyPlus1PM
-          - ShellyPlus2PM
-          - ShellyPlusI4
-          - ShellyPlusPlugS
-          - ShellyPlusRGBWPM
-          - ShellyPlus1Mini
-          - ShellyPlus1PMMini
-          - ShellyMini1Gen3
-          - ShellyMini1PMGen3
-          - ShellyRGBW2
-          - ShellyUNI
-          - ShellyVintage
+          # - Shelly1
+          # - Shelly1L
+          # - Shelly1PM
+          # - Shelly2
+          - Shelly2PMGen3
+          # - Shelly25
+          # - ShellyColorBulb
+          # - ShellyDuo
+          # - ShellyI3
+          # - ShellyPlug
+          # - ShellyPlugS
+          # - ShellyPlus1
+          # - ShellyPlus1PM
+          # - ShellyPlus2PM
+          # - ShellyPlusI4
+          # - ShellyPlusPlugS
+          # - ShellyPlusRGBWPM
+          # - ShellyPlus1Mini
+          # - ShellyPlus1PMMini
+          # - ShellyMini1Gen3
+          # - ShellyMini1PMGen3
+          # - ShellyRGBW2
+          # - ShellyUNI
+          # - ShellyVintage
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 MAKEFLAGS += --warn-undefined-variables --no-builtin-rules
 
 .PHONY: build check-format format release upload \
-        Shelly1 Shelly1L Shelly1PM Shelly25 Shelly2 ShellyColorBulb ShellyDuo ShellyI3 ShellyPlug ShellyPlugS ShellyPlusPlugS ShellyPlus1 ShellyPlus1PM ShellyPlus2PM ShellyPlusI4 ShellyRGBW2 ShellyVintage ShellyU ShellyU25 ShellyUDuo ShellyURGBW2 ShellyUNI ShellyPlus1Mini ShellyPlusRGBWPM ShellyMini1Gen3 ShellyMini1PMGen3
+        Shelly1 Shelly1L Shelly1PM Shelly25 Shelly2 ShellyColorBulb ShellyDuo ShellyI3 ShellyPlug ShellyPlugS ShellyPlusPlugS ShellyPlus1 ShellyPlus1PM ShellyPlus2PM ShellyPlusI4 ShellyRGBW2 ShellyVintage ShellyU ShellyU25 ShellyUDuo ShellyURGBW2 ShellyUNI ShellyPlus1Mini ShellyPlusRGBWPM ShellyMini1Gen3 ShellyMini1PMGen3 Shelly2PMGen3
 .SUFFIXES:
 
 MOS ?= mos
@@ -27,7 +27,7 @@ ifneq "$(VERBOSE)$(V)" "00"
   MOS_BUILD_FLAGS_FINAL += --verbose
 endif
 
-build: Shelly1 Shelly1L Shelly1PM Shelly25 Shelly2 ShellyColorBulb ShellyDuo ShellyI3 ShellyPlug ShellyPlugS ShellyPlusPlugS ShellyPlus1 ShellyPlus1PM ShellyPlus2PM ShellyPlusI4 ShellyRGBW2 ShellyVintage ShellyU ShellyU25 ShellyURGBW2 ShellyUNI ShellyPlus1Mini ShellyPlusRGBWPM ShellyMini1Gen3 ShellyMini1PMGen3
+build: Shelly1 Shelly1L Shelly1PM Shelly25 Shelly2 ShellyColorBulb ShellyDuo ShellyI3 ShellyPlug ShellyPlugS ShellyPlusPlugS ShellyPlus1 ShellyPlus1PM ShellyPlus2PM ShellyPlusI4 ShellyRGBW2 ShellyVintage ShellyU ShellyU25 ShellyURGBW2 ShellyUNI ShellyPlus1Mini ShellyPlusRGBWPM ShellyMini1Gen3 ShellyMini1PMGen3 Shelly2PMGen3
 
 release:
 	$(MAKE) build CLEAN=1 RELEASE=1
@@ -96,6 +96,10 @@ ShellyPlus1Mini: PLATFORM=esp32c3
 ShellyPlus1Mini: build-ShellyPlus1Mini
 	@true
 
+Shelly2PMGen3: PLATFORM=esp32c3
+Shelly2PMGen3: build-Shelly2PMGen3
+	@true
+
 ShellyMini1Gen3: PLATFORM=esp32c3
 ShellyMini1Gen3: build-ShellyMini1Gen3
 	@true

diff --git a/mos.yml b/mos.yml
@@ -736,7 +736,7 @@ conds:
 
   - when: build_vars.MODEL == "Shelly2PMGen3"
     apply:
-      name: 2PMG3
+      name: S2PMG3
       sources:
         - src/DS18XXX
         - src/DHT
@@ -748,6 +748,7 @@ conds:
         - location: https://github.com/mongoose-os-libs/onewire
         - location: https://github.com/mongoose-os-libs/dht
         - location: https://github.com/mongoose-os-libs/ade7953
+        - location: https://github.com/mongoose-os-libs/mongoose
       build_vars:
         OTA_DATA_ADDR: 0x10000
         OTA_DATA_SIZE: 0x4000
@@ -770,18 +771,14 @@ conds:
         BTN_GPIO: 19
         BTN_DOWN: 0
         PRODUCT_HW_REV: "??"
-        STOCK_FW_MODEL: 2PMG3
+        STOCK_FW_MODEL: S2PMG3
         MAX_NUM_HAP_SESSIONS: 16
         RELAY1_GPIO: 5
         RELAY2_GPIO: 3
         SWITCH1_GPIO: 18
         SWITCH2_GPIO: 10
         ADC_GPIO: 1
-      cdefs:
-        PRODUCT_HW_REV: "0.1.9"
-        STOCK_FW_MODEL: Plus2PMG3
-        MAX_NUM_HAP_SESSIONS: 16
-        SHELLY_HAVE_PM: 1
+        SDA_GPIO: 6
       config_schema:
         - ["device.id",    "Shelly2PMG3-??????"]
         - ["shelly.name",  "Shelly2PMG3-??????"]