diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 17aaffc0..5f03d2dc 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -25,6 +25,7 @@ jobs: - ShellyPlus2PM - ShellyPlusI4 - ShellyPlusPlugS + - ShellyPlus1Mini - ShellyMini1Gen3 - ShellyMini1PMGen3 - ShellyRGBW2 diff --git a/Makefile b/Makefile index 48d956ef..4c4cc72a 100644 --- 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 + Shelly1 Shelly1L Shelly1PM Shelly25 Shelly2 ShellyColorBulb ShellyDuo ShellyI3 ShellyPlug ShellyPlugS ShellyPlusPlugS ShellyPlus1 ShellyPlus1PM ShellyPlus2PM ShellyPlusI4 ShellyRGBW2 ShellyVintage ShellyU ShellyU25 ShellyUDuo ShellyURGBW2 ShellyUNI ShellyPlus1Mini .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 +build: Shelly1 Shelly1L Shelly1PM Shelly25 Shelly2 ShellyColorBulb ShellyDuo ShellyI3 ShellyPlug ShellyPlugS ShellyPlusPlugS ShellyPlus1 ShellyPlus1PM ShellyPlus2PM ShellyPlusI4 ShellyRGBW2 ShellyVintage ShellyU ShellyU25 ShellyURGBW2 ShellyUNI ShellyPlus1Mini release: $(MAKE) build CLEAN=1 RELEASE=1 @@ -84,6 +84,10 @@ ShellyPlusI4: PLATFORM=esp32 ShellyPlusI4: build-ShellyPlusI4 @true +ShellyPlus1Mini: PLATFORM=esp32 +ShellyPlus1Mini: build-ShellyPlus1Mini + @true + ShellyMini1Gen3: PLATFORM=esp32c3 ShellyMini1Gen3: build-ShellyMini1Gen3 @true diff --git a/README.md b/README.md index 0eae28be..cf9c4e96 100644 --- a/README.md +++ b/README.md @@ -22,15 +22,15 @@ Reverting to stock firmware is also possible [see here](https://github.com/mongo ### Plus devices -| |[+1]|[+1PM]|[+2PM]|+i4 [AC]/[DC]|[+Plug S] -|- |- |- |- |- |- -|Switch & Co.1 |✓ |✓ |✓ |✗ |✓ -|Stateless Input2 |✓ |✓ |✓ |✓ |✗ -|Sensors3 |✓ |✓ |✓ |✓ |✗ -|Garage door opener |✓ |✓ |✓ |✗ |✗ -|Roller shutter mode |✗ |✗ |✓ |✗ |✗ -|Power measurement |✗ |✓ |✓ |✗ |✓ -|Temperature/Humidity measurement4|✓ |✓ |✓ |✓ |✗ +| |[+1]|[+1Mini]|[+1PM]|[+2PM]|+i4 [AC]/[DC]|[+Plug S] +|- |- |- |- |- |- |- +|Switch & Co.1 |✓ |✓ |✓ |✓ |✗ |✓ +|Stateless Input2 |✓ |✓ |✓ |✓ |✓ |✗ +|Sensors3 |✓ |✗ |✓ |✓ |✓ |✗ +|Garage door opener |✓ |✓ |✓ |✓ |✗ |✗ +|Roller shutter mode |✗ |✗ |✗ |✓ |✗ |✗ +|Power measurement |✗ |✗ |✓ |✓ |✗ |✓ +|Temperature/Humidity measurement4|✓ |✗ |✓ |✓ |✓ |✗ ### Pro devices @@ -152,12 +152,19 @@ See [here](https://github.com/mongoose-os-apps/shelly-homekit/wiki/Development) See [here](AUTHORS.md). +## Support + +If you like the project, consider a Donation to markib via [Paypal](https://www.paypal.com/donate/?hosted_button_id=RVFA9G5VMXRX8) + ## License This firmware is free software and is distributed under [Apache 2.0 license](LICENSE). [1]: https://www.shelly.cloud/en/products/shop/1xs1 [+1]: https://www.shelly.cloud/en/products/shop/shelly-plus-1 +[+1Mini]: https://www.shelly.cloud/en/products/shop/shelly-plus-1-mini +[Mini1G3]: https://www.shelly.cloud/en/products/shop/shelly-1-mini-gen-3 +[Mini1PMG3]: https://www.shelly.cloud/en/products/shop/shelly-1-pm-mini-gen3 [+1PM]: https://www.shelly.cloud/en/products/shop/shelly-plus-1-pm-2-pack/shelly-plus-1-pm [+2PM]: https://www.shelly.cloud/en/products/shop/shelly-plus-2-pm [+Plug S]: https://www.shelly.cloud/en/products/shop/shelly-plus-plug-s diff --git a/fs_src/index.html b/fs_src/index.html index d27bce5e..1bc1fc39 100644 --- a/fs_src/index.html +++ b/fs_src/index.html @@ -425,14 +425,8 @@

Firmware

href="https://github.com/mongoose-os-apps/shelly-homekit/blob/master/AUTHORS.md">Shelly-HomeKit contributors.
Use GitHub to report bugs and - request features. + request features. If you like the firmware consider a Donation.
-
- - - -
diff --git a/mos.yml b/mos.yml index 4b7134e5..3f445651 100644 --- a/mos.yml +++ b/mos.yml @@ -713,6 +713,46 @@ conds: - ["gdo1.name", "Garage Door"] - ["gdo1.open_sensor_mode", 2] + - when: build_vars.MODEL == "ShellyPlus1Mini" + apply: + name: Plus1Mini + sources: + - src/ShellyMini1Gen3 + libs: + - location: https://github.com/mongoose-os-libs/mongoose + build_vars: + MGOS_ROOT_FS_TYPE: LFS + MGOS_ROOT_FS_SIZE: 458752 + ESP_IDF_EXTRA_PARTITION: "aux,0x55,0x00,0x3f0000,48K" + ESP_IDF_EXTRA_PARTITION_2: "shelly,data,0x88,0x3fc000,16K,encrypted" + ESP_IDF_SDKCONFIG_OPTS: > + ${build_vars.ESP_IDF_SDKCONFIG_OPTS} + CONFIG_FREERTOS_UNICORE=y + CONFIG_ESPTOOLPY_FLASHMODE_DIO=y + cdefs: + LED_GPIO: 0 + LED_ON: 0 + BTN_GPIO: 1 + BTN_DOWN: 0 + PRODUCT_HW_REV: "0.1.6" + STOCK_FW_MODEL: Plus1Mini + MAX_NUM_HAP_SESSIONS: 16 + config_schema: + - ["device.id", "ShellyPlus1Mini-??????"] + - ["shelly.name", "ShellyPlus1Mini-??????"] + - ["wifi.ap.ssid", "ShellyPlus1Mini-??????"] + - ["sw1", "sw", {title: "SW1 settings"}] + - ["sw1.name", "Shelly SW"] + - ["in1", "in", {title: "Input 1 settings"}] + - ["in1.ssw.name", "Shelly SSW1"] + - ["in1.sensor.name", "Shelly S1"] + - ["in2", "in", {title: "Input 2 settings"}] + - ["in2.ssw.name", "Shelly SSW2"] + - ["in2.sensor.name", "Shelly S2"] + - ["gdo1", "gdo", {title: "GDO1 settings"}] + - ["gdo1.name", "Garage Door"] + - ["gdo1.open_sensor_mode", 2] + - when: build_vars.MODEL == "ShellyPlus1" apply: name: Plus1