Merge pull request #123 from Schluggi/v3

All changes for firmware 3.0.0

docs/requirements.txt

@@ -1,20 +1,43 @@
+Babel==2.13.1
 bracex==2.4
-click==8.1.7
+cairocffi==1.6.1
+CairoSVG==2.7.1
+certifi==2022.12.7
+cffi==1.16.0
+charset-normalizer==3.1.0
+click==8.1.3
 colorama==0.4.6
+cssselect2==0.7.0
+defusedxml==0.7.1
 ghp-import==2.1.0
+idna==3.4
 importlib-metadata==6.8.0
 Jinja2==3.1.2
 Markdown==3.5.1
 MarkupSafe==2.1.3
 mergedeep==1.3.4
 mkdocs==1.5.3
 mkdocs-awesome-pages-plugin==2.9.2
+mkdocs-material==9.4.6
+mkdocs-material-extensions==1.3
 natsort==8.4.0
 packaging==23.2
+paginate==0.5.6
+pathspec==0.11.2
+Pillow==10.1.0
+platformdirs==3.11.0
+pycparser==2.21
+Pygments==2.16.1
+pymdown-extensions==10.3.1
 python-dateutil==2.8.2
 PyYAML==6.0.1
 pyyaml_env_tag==0.1
+regex==2023.10.3
+requests==2.31.0
 six==1.16.0
+tinycss2==1.2.1
+urllib3==2.0.7
 watchdog==3.0.0
 wcmatch==8.5
+webencodings==0.5.1
 zipp==3.17.0

docs/sensors.md

@@ -5,7 +5,7 @@ want but notice the compatibility.
 
 <hr>
 
-## 🌡️Temperature, Humidity, Pressure & Air Quality
+## 🌡️Temperature, Humidity, Pressure, VOC & Air Quality
 
 For these measurements we recommend the industrial sensors BME680/BME688 or the
 BME280 (cheaper but without air
@@ -25,6 +25,8 @@ Related to [#7](https://github.com/Schluggi/AIOsense/issues/7) sometimes SMD
 soldering can be inaccessible or difficult.
 You can use a BME PCB module instead.
 
+The default offset is -6 °C. 
+
 ### Where to buy?
 
 | Part                | Shops                                                                                                                                                                                                                                                                                                   |
@@ -90,9 +92,7 @@ for their high quality digital audio.
 | INMP441 | [Amazon DE³](https://amzn.to/40y8twJ), [AliExpress](https://de.aliexpress.com/wholesale?catId=0&initiative_id=SB_20221127114658&SearchText=inmp441&spm=a2g0o.tm800107193.1000002.0&dida=y) |
 
 ### Compatibility
-
-> **WARNING**: Not supported yet!
-> This sensor is fully compatible with any other sensor or module.
+> **AIOsense v2.1.0**: This sensor is fully compatible with any other sensor or module besides the buzzer. Please disconnect the buzzer first. 
 
 <hr>
 

esphome/esphome.yaml

@@ -1,20 +1,19 @@
 substitutions:
   name: "aiosense-bedroom"  # lowercase only, have to be unique
   friendly_name: "AIOsense Bedroom"  # device name and entity prefix
-  version: "2.1.0"  # your AIOsense version
 
   # bh1750_update_interval: 5s
 
-  # bmex80_address: "0x76"  # for some modules you have to change it to 0x77
-  # bmex80_update_interval: 30s
+  # bme_address: "0x76"  # for some modules you have to change it to 0x77
+  # bme_update_interval: 30s
 
+  # co2_offset: "0"  # bsec only
   # humidity_offset: "0"
+  # iaq_offset: "0" # bsec only
   # illuminance_offset: "0"
   # pressure_offset: "0"
-  # temperature_offset: "0"
-
-  # bme680_bsec_sample_rate: lp # lp -> 3s, ulp ->5min
-  # bme680_bsec_temperature_offset: "0"
+  temperature_offset: "-6"
+  # voc_offset: "0" # bsec only
 
   # LD2410(c) does not work? Please notice:
   # https://aiosense.readthedocs.io/en/latest/debugging/#ld2410c-does-not-work
@@ -28,29 +27,35 @@ substitutions:
 packages:
   remote_package:
     url: https://github.com/schluggi/AIOsense
-    ref: main
+    ref: esphome-v3.0.0
     refresh: 1d
     files:
       - esphome/packages/config/base.yaml
 
-      # --- select your board ---
-      - esphome/packages/config/esp32-c3-mini.yaml
+      # ----- board -----
+      # - esphome/packages/config/esp32-c3-mini.yaml
       # - esphome/packages/config/esp32-d1-mini.yaml
       # - esphome/packages/config/esp32-s2-mini.yaml
+      - esphome/packages/config/esp32-s3-mini.yaml
       # - esphome/packages/config/esp8266-d1-mini.yaml
 
-      # --- select your sensors ---
+      # ----- modules -----
       - esphome/packages/sensors/bh1750.yaml
-      # - esphome/packages/sensors/buzzer.yaml  # AIOsense >= 2.1.x only
       # - esphome/packages/sensors/bme280.yaml  # enable for bme280
-      - esphome/packages/sensors/bme680.yaml  # disable for bme280
-      # - esphome/packages/sensors/bme680_bsec.yaml  # does not work yet
-      - esphome/packages/sensors/occupancy.yaml  # only if pir & mmWave are on
+      - esphome/packages/sensors/bme68x_bsec.yaml  # disable for bme280
+      - esphome/packages/sensors/buzzer.yaml  # PCB >= v2.1.0
+      - esphome/packages/sensors/occupancy.yaml  # only if pir & mmWave are activated
       - esphome/packages/sensors/pir.yaml
-      - esphome/packages/sensors/rgb_led.yaml  # esp32-c3-mini only
-      # - esphome/packages/sensors/led.yaml  # d1-mini only
+
+      # ----- voice assistant (use rgb_led for esp32-c3 & esp32-s3 only-----
+      # - esphome/packages/sensors/voice_assistant-rgb_led.yaml
+      - esphome/packages/sensors/voice_assistant-led.yaml
+
+      # ----- led modules (use rgb_led for esp32-c3 & esp32-s3 only) -----
+      - esphome/packages/sensors/rgb_led.yaml
+      # - esphome/packages/sensors/led.yaml
 
-      # --- select your radar sensor ---
+      # ----- mmWave radar sensor -----
       # - esphome/packages/sensors/ld2410.yaml
       - esphome/packages/sensors/sen0395.yaml
 

esphome/packages/config/base.yaml

@@ -1,5 +1,5 @@
 substitutions:
-  version: "2.0.0"
+  version: "3.0.0"
 
 esphome:
   name: "${name}"

esphome/packages/config/esp32-c3-mini.yaml

@@ -1,8 +1,12 @@
 substitutions:
-  buzzer_pin: GPIO0
-  pir_pin: GPIO4
+  buzzer_pin: A0
+  i2s_bclk_pin: A1
+  i2s_din_pin: "${buzzer_pin}"
+  i2s_lrclk_pin: A5
+  pir_pin: A4
   rgb_led_pin: GPIO7
-  sen0395_io_pin: GPIO2
+  rgb_led_type: GRB
+  sen0395_io_pin: A2
   uart_rx_pin: GPIO20
   uart_tx_pin: GPIO21
 

esphome/packages/config/esp32-d1-mini.yaml

@@ -1,5 +1,8 @@
 substitutions:
-  buzzer_pin: GPIO19  # untested
+  buzzer_pin: GPIO19
+  i2s_bclk_pin: GPIO14
+  i2s_din_pin: "${buzzer_pin}"
+  i2s_lrclk_pin: GPIO15
   led_pin: GPIO2
   pir_pin: GPIO23
   sen0395_io_pin: GPIO26

esphome/packages/config/esp32-s2-mini.yaml

@@ -1,5 +1,8 @@
 substitutions:
   buzzer_pin: GPIO9
+  i2s_bclk_pin: GPIO7
+  i2s_din_pin: "${buzzer_pin}"
+  i2s_lrclk_pin: GPIO12
   led_invert: "true"
   led_pin: GPIO15
   pir_pin: GPIO11

esphome/packages/config/esp32-s3-mini.yaml

@@ -0,0 +1,26 @@
+substitutions:
+  buzzer_pin: GPIO13
+  i2s_bclk_pin: GPIO12
+  i2s_din_pin: "${buzzer_pin}"
+  i2s_lrclk_pin: GPIO10
+  pir_pin: GPIO11
+  rgb_led_pin: GPIO47
+  rgb_led_type: RGB
+  sen0395_io_pin: GPIO4
+  uart_rx_pin: GPIO44
+  uart_tx_pin: GPIO43
+
+esp32:
+  board: esp32-s3-devkitc-1
+  variant: esp32s3
+  framework:
+    type: arduino
+    version: latest
+
+i2c:
+  sda: GPIO35
+  scl: GPIO36
+
+sensor:
+  - platform: internal_temperature
+    name: "CPU Temperature"

esphome/packages/sensors/bme280.yaml

@@ -1,8 +1,8 @@
 # https://esphome.io/cookbook/bme280_environment.html
 
 substitutions:
-  bmex80_address: "0x76"
-  bmex80_update_interval: 30s
+  bme_address: "0x76"
+  bme_update_interval: 30s
   humidity_offset: "0"
   pressure_offset: "0"
   temperature_offset: "0"
@@ -62,8 +62,8 @@ number:
 sensor:
   - platform: bme280
     id: bme280_sensor
-    address: "${bmex80_address}"
-    update_interval: "${bmex80_update_interval}"
+    address: "${bme_address}"
+    update_interval: "${bme_update_interval}"
     temperature:
       name: "Temperature"
       filters:

esphome/packages/sensors/bme680.yaml

@@ -1,8 +1,8 @@
 # https://esphome.io/components/sensor/bme680.html
 
 substitutions:
-  bmex80_address: "0x76"
-  bmex80_update_interval: "30s"
+  bme_address: "0x76"
+  bme_update_interval: "30s"
   humidity_offset: "0"
   pressure_offset: "0"
   temperature_offset: "0"
@@ -62,8 +62,8 @@ number:
 sensor:
   - platform: bme680
     id: bme680_sensor
-    address: "${bmex80_address}"
-    update_interval: "${bmex80_update_interval}"
+    address: "${bme_address}"
+    update_interval: "${bme_update_interval}"
     temperature:
       name: "Temperature"
       filters: