esphome 2024.7.0b2__py3-none-any.whl → 2024.7.0b3__py3-none-any.whl

esphome/components/i2s_audio/__init__.py

@@ -25,6 +25,10 @@ CONF_I2S_LRCLK_PIN = "i2s_lrclk_pin"
 CONF_I2S_AUDIO = "i2s_audio"
 CONF_I2S_AUDIO_ID = "i2s_audio_id"
 
+CONF_I2S_MODE = "i2s_mode"
+CONF_PRIMARY = "primary"
+CONF_SECONDARY = "secondary"
+
 i2s_audio_ns = cg.esphome_ns.namespace("i2s_audio")
 I2SAudioComponent = i2s_audio_ns.class_("I2SAudioComponent", cg.Component)
 I2SAudioIn = i2s_audio_ns.class_("I2SAudioIn", cg.Parented.template(I2SAudioComponent))
@@ -32,6 +36,12 @@ I2SAudioOut = i2s_audio_ns.class_(
     "I2SAudioOut", cg.Parented.template(I2SAudioComponent)
 )
 
+i2s_mode_t = cg.global_ns.enum("i2s_mode_t")
+I2S_MODE_OPTIONS = {
+    CONF_PRIMARY: i2s_mode_t.I2S_MODE_MASTER,  # NOLINT
+    CONF_SECONDARY: i2s_mode_t.I2S_MODE_SLAVE,  # NOLINT
+}
+
 # https://github.com/espressif/esp-idf/blob/master/components/soc/{variant}/include/soc/soc_caps.h
 I2S_PORTS = {
     VARIANT_ESP32: 2,

esphome/components/i2s_audio/microphone/__init__.py

@@ -7,6 +7,9 @@ from esphome.components import microphone, esp32
 from esphome.components.adc import ESP32_VARIANT_ADC1_PIN_TO_CHANNEL, validate_adc_pin
 
 from .. import (
+    CONF_I2S_MODE,
+    CONF_PRIMARY,
+    I2S_MODE_OPTIONS,
     i2s_audio_ns,
     I2SAudioComponent,
     I2SAudioIn,
@@ -68,6 +71,9 @@ BASE_SCHEMA = microphone.MICROPHONE_SCHEMA.extend(
             _validate_bits, cv.enum(BITS_PER_SAMPLE)
         ),
         cv.Optional(CONF_USE_APLL, default=False): cv.boolean,
+        cv.Optional(CONF_I2S_MODE, default=CONF_PRIMARY): cv.enum(
+            I2S_MODE_OPTIONS, lower=True
+        ),
     }
 ).extend(cv.COMPONENT_SCHEMA)
 
@@ -107,6 +113,7 @@ async def to_code(config):
         cg.add(var.set_din_pin(config[CONF_I2S_DIN_PIN]))
         cg.add(var.set_pdm(config[CONF_PDM]))
 
+    cg.add(var.set_i2s_mode(config[CONF_I2S_MODE]))
     cg.add(var.set_channel(config[CONF_CHANNEL]))
     cg.add(var.set_sample_rate(config[CONF_SAMPLE_RATE]))
     cg.add(var.set_bits_per_sample(config[CONF_BITS_PER_SAMPLE]))

esphome/components/i2s_audio/microphone/i2s_audio_microphone.cpp

@@ -46,7 +46,7 @@ void I2SAudioMicrophone::start_() {
     return;  // Waiting for another i2s to return lock
   }
   i2s_driver_config_t config = {
-      .mode = (i2s_mode_t) (I2S_MODE_MASTER | I2S_MODE_RX),
+      .mode = (i2s_mode_t) (this->i2s_mode_ | I2S_MODE_RX),
       .sample_rate = this->sample_rate_,
       .bits_per_sample = this->bits_per_sample_,
       .channel_format = this->channel_,
@@ -174,8 +174,7 @@ size_t I2SAudioMicrophone::read(int16_t *buf, size_t len) {
     size_t samples_read = bytes_read / sizeof(int32_t);
     samples.resize(samples_read);
     for (size_t i = 0; i < samples_read; i++) {
-      int32_t temp = reinterpret_cast<int32_t *>(buf)[i] >> 14;
-      samples[i] = clamp<int16_t>(temp, INT16_MIN, INT16_MAX);
+      samples[i] = reinterpret_cast<int32_t *>(buf)[i] >> 16;
     }
     memcpy(buf, samples.data(), samples_read * sizeof(int16_t));
     return samples_read * sizeof(int16_t);

esphome/components/i2s_audio/microphone/i2s_audio_microphone.h

@@ -30,6 +30,8 @@ class I2SAudioMicrophone : public I2SAudioIn, public microphone::Microphone, pub
   }
 #endif
 
+  void set_i2s_mode(i2s_mode_t mode) { this->i2s_mode_ = mode; }
+
   void set_channel(i2s_channel_fmt_t channel) { this->channel_ = channel; }
   void set_sample_rate(uint32_t sample_rate) { this->sample_rate_ = sample_rate; }
   void set_bits_per_sample(i2s_bits_per_sample_t bits_per_sample) { this->bits_per_sample_ = bits_per_sample; }
@@ -46,6 +48,7 @@ class I2SAudioMicrophone : public I2SAudioIn, public microphone::Microphone, pub
   bool adc_{false};
 #endif
   bool pdm_{false};
+  i2s_mode_t i2s_mode_{};
   i2s_channel_fmt_t channel_;
   uint32_t sample_rate_;
   i2s_bits_per_sample_t bits_per_sample_;

esphome/components/improv_serial/improv_serial_component.cpp

@@ -57,7 +57,7 @@ optional<uint8_t> ImprovSerialComponent::read_byte_() {
         }
       }
       break;
-#ifdef USE_LOGGER_USB_CDC
+#if defined(USE_LOGGER_USB_CDC) && defined(CONFIG_ESP_CONSOLE_USB_CDC)
     case logger::UART_SELECTION_USB_CDC:
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
       if (esp_usb_console_available_for_read()) {
@@ -99,7 +99,7 @@ void ImprovSerialComponent::write_data_(std::vector<uint8_t> &data) {
 #endif  // !USE_ESP32_VARIANT_ESP32C3 && !USE_ESP32_VARIANT_ESP32S2 && !USE_ESP32_VARIANT_ESP32S3
       uart_write_bytes(this->uart_num_, data.data(), data.size());
       break;
-#ifdef USE_LOGGER_USB_CDC
+#if defined(USE_LOGGER_USB_CDC) && defined(CONFIG_ESP_CONSOLE_USB_CDC)
     case logger::UART_SELECTION_USB_CDC: {
       const char *msg = (char *) data.data();
       esp_usb_console_write_buf(msg, data.size());
@@ -109,6 +109,7 @@ void ImprovSerialComponent::write_data_(std::vector<uint8_t> &data) {
 #ifdef USE_LOGGER_USB_SERIAL_JTAG
     case logger::UART_SELECTION_USB_SERIAL_JTAG:
       usb_serial_jtag_write_bytes((char *) data.data(), data.size(), 20 / portTICK_PERIOD_MS);
+      delay(10);
       usb_serial_jtag_ll_txfifo_flush();  // fixes for issue in IDF 4.4.7
       break;
 #endif  // USE_LOGGER_USB_SERIAL_JTAG

esphome/components/micro_wake_word/__init__.py

@@ -357,7 +357,9 @@ CONFIG_SCHEMA = cv.All(
         {
             cv.GenerateID(): cv.declare_id(MicroWakeWord),
             cv.GenerateID(CONF_MICROPHONE): cv.use_id(microphone.Microphone),
-            cv.Required(CONF_MODELS): cv.ensure_list(MODEL_SCHEMA),
+            cv.Required(CONF_MODELS): cv.ensure_list(
+                cv.maybe_simple_value(MODEL_SCHEMA, key=CONF_MODEL)
+            ),
             cv.Optional(CONF_ON_WAKE_WORD_DETECTED): automation.validate_automation(
                 single=True
             ),

esphome/const.py

@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2024.7.0b2"
+__version__ = "2024.7.0b3"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 VALID_SUBSTITUTIONS_CHARACTERS = (

{esphome-2024.7.0b2.dist-info → esphome-2024.7.0b3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: esphome
-Version: 2024.7.0b2
+Version: 2024.7.0b3
 Summary: Make creating custom firmwares for ESP32/ESP8266 super easy.
 Author-email: The ESPHome Authors <esphome@nabucasa.com>
 License: MIT

{esphome-2024.7.0b2.dist-info → esphome-2024.7.0b3.dist-info}/RECORD

@@ -5,7 +5,7 @@ esphome/codegen.py,sha256=LCJVpAwy1L9DTBsIvbgAbHj1TOXUSPgBoN--aio0gBk,1855
 esphome/config.py,sha256=wztK2UmO7-hc6HFDAi6YWtrPVy5mH0diKuqpsWp4-XA,39616
 esphome/config_helpers.py,sha256=MKf_wzO35nn41FvigXE0iYKDslPgL2ruf8R-EPtTT2I,3256
 esphome/config_validation.py,sha256=G79LGVIh5BdpGkzuehkm7Db_llpbC2of4dKqZEpHc3A,64838
-esphome/const.py,sha256=NtIcVGsfAcat_0JQxJ86ZH3v2zS3lIygXvzfAyiua7g,38954
+esphome/const.py,sha256=QXPuiRfzBxts2SEE3uaaOGfXjxCEcXvMgPpU5qwqNrA,38954
 esphome/coroutine.py,sha256=IG2kC92OrenyiRm7Qo9uC-4qU4b4-Lmj0TkMIjRG2RY,9344
 esphome/cpp_generator.py,sha256=hW2EfubUiildhKXZIdV8Dr3Q9TM5oHybFwiTo5-vEUE,31203
 esphome/cpp_helpers.py,sha256=KadRBBoo4QRT-VwdWFtvxv_FYjqhZTkBhfMX-JhEMwg,4803
@@ -1110,15 +1110,15 @@ esphome/components/i2c/i2c_bus_arduino.cpp,sha256=VXWH0NcAgkncjiSbpNjOY2GOJopWPM
 esphome/components/i2c/i2c_bus_arduino.h,sha256=7mhPi-tZGVmX9XhmtIBQYv9Of4qTpmhJO-FKQDqsIao,1222
 esphome/components/i2c/i2c_bus_esp_idf.cpp,sha256=UtiYP_soPgE6p22rbRJ67OQDPGsKFYqYL31KSmOCcfI,12912
 esphome/components/i2c/i2c_bus_esp_idf.h,sha256=6h3QKsi2M3AuchqY3qTOJe-FWW6hgA9HfrSFVPCdqag,1454
-esphome/components/i2s_audio/__init__.py,sha256=7cUXPRJWWf9oLGBsjhkyssL7iOhZLyQ5DiGcuGMaqTA,2316
+esphome/components/i2s_audio/__init__.py,sha256=KG_F3w1nFG-dF9DEjhSl5plwcO_hBmYEU8iIZAljP4E,2580
 esphome/components/i2s_audio/i2s_audio.cpp,sha256=DVthNnLWc_nk0Y5Ck1NyvdKavU9IQ6hcHGE11lMfMQw,734
 esphome/components/i2s_audio/i2s_audio.h,sha256=xZxkC9I0YrqsMlOR5RXhfMC1tVfmkLqNmd__VKRwkyk,1313
 esphome/components/i2s_audio/media_player/__init__.py,sha256=jlk-y5UGX8fc4dsXda2HQNyp4Thy5m-YkLOCsD5ZkZo,3556
 esphome/components/i2s_audio/media_player/i2s_audio_media_player.cpp,sha256=OlvkjzYSdaxIjJiQF-BbjThoY91_rvGJ4woRjyB9mwY,7538
 esphome/components/i2s_audio/media_player/i2s_audio_media_player.h,sha256=iUx93Xwi7DgWtyNaHIkJ7FJ2kUK6-fdeTs87opqTcRo,2062
-esphome/components/i2s_audio/microphone/__init__.py,sha256=R4PrvuU8uOiM7hxiDzXtFIq38MRHhyHg3DuyUoPQC4U,3752
-esphome/components/i2s_audio/microphone/i2s_audio_microphone.cpp,sha256=-sPxhn2Q0WO1kLZmBzW5gx5iu55PF0CtWOv7J25qogU,6187
-esphome/components/i2s_audio/microphone/i2s_audio_microphone.h,sha256=Wcivbj_cjOIp3aaKNCIQhiesktv1OWMACbdNCDl0TKc,1494
+esphome/components/i2s_audio/microphone/__init__.py,sha256=uPZ7e0pGxbNklDqIoqLcTmvhnSTcQ16q3pSDFIgEy70,3982
+esphome/components/i2s_audio/microphone/i2s_audio_microphone.cpp,sha256=LfcloU1ws1AGcm5FCyHCdWnLRunVqJB3iGv_RfYHaOE,6122
+esphome/components/i2s_audio/microphone/i2s_audio_microphone.h,sha256=V0QfxCYBu9DUoO1Ui0O7zB2iP-9P_wduN3Cf2b27AWI,1586
 esphome/components/i2s_audio/speaker/__init__.py,sha256=0nzQXnjQaYv7YklVp8Landvz57x-bhrLJuta92LiDXk,2724
 esphome/components/i2s_audio/speaker/i2s_audio_speaker.cpp,sha256=C4ZN8HTWiwGtOmL1y3ICnoCH1-iLaB2dPKAz3g26wts,8187
 esphome/components/i2s_audio/speaker/i2s_audio_speaker.h,sha256=q2pF17NGG_MCBUJiBPprzT-IKaQylKX988LrQxtLzBU,1756
@@ -1141,7 +1141,7 @@ esphome/components/improv_base/__init__.py,sha256=9r7mI_71pUHiGghXvlHP4nnSklm6wg
 esphome/components/improv_base/improv_base.cpp,sha256=eh-YebkuhEhZktdNz84oSoigtGAQz2LP0c0lqc29-M4,857
 esphome/components/improv_base/improv_base.h,sha256=VOqjBy5U0Sh8tNOYWQPIkIZWwjisZKY1pf65lOO_Q_s,322
 esphome/components/improv_serial/__init__.py,sha256=AFjbmaHHn72e2WUrneWiE3DIBty9btxFjsWgRt2jmoE,1600
-esphome/components/improv_serial/improv_serial_component.cpp,sha256=-q5Y9KCcDDFYUtzNOOiBYOdrrVf2a4DyyQk1xQ-OimA,10297
+esphome/components/improv_serial/improv_serial_component.cpp,sha256=iKIxHFp4MydwdLnDkeTZKTn79JlKm_WfsaPNbR4eG4w,10404
 esphome/components/improv_serial/improv_serial_component.h,sha256=TNP28Qxc7I8VcRS5C7_aVQaISXBthjR5zVX_wDLGjR8,2220
 esphome/components/ina219/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 esphome/components/ina219/ina219.cpp,sha256=tk0F5y4889lDgfj7XN-P8zQz-5vwDMkRtrv6hil0XPE,6547
@@ -1495,7 +1495,7 @@ esphome/components/mhz19/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 esphome/components/mhz19/mhz19.cpp,sha256=CBBVBMqGUsrc-4PMOaBDuKCAFNr43Kukt3a018kQI0k,3924
 esphome/components/mhz19/mhz19.h,sha256=DTuwpBz6gAZVn_QIUnmPiE4Y188XYiOS9WxIggcjZJ4,2050
 esphome/components/mhz19/sensor.py,sha256=IwZAf9K8LE3Ang8I53jjr41hpSwsC7qHnEjsOexNp8M,3220
-esphome/components/micro_wake_word/__init__.py,sha256=ysRnDFzi56ypvzMru8lP_JqaeM2Tmb5kpGwo40hYCBg,15820
+esphome/components/micro_wake_word/__init__.py,sha256=WLqfgLyGTF7S6kwvvOoiyHaxxVRL4u478WUjV9FhnLo,15889
 esphome/components/micro_wake_word/micro_wake_word.cpp,sha256=qj_wsPQY23sg12Wr2nIvitFSvghzfXkBamak7ZPNeAI,15280
 esphome/components/micro_wake_word/micro_wake_word.h,sha256=3Ge-mL0fVeM-s6XdmeoPGATLZ7x8tr73iXEkO9nqLJ4,6091
 esphome/components/micro_wake_word/preprocessor_settings.h,sha256=fz5-wfah78sWnY-iNXuGu6K5TpbGfeQCcgPIdPBNPg4,488
@@ -3119,9 +3119,9 @@ esphome/dashboard/util/itertools.py,sha256=8eLrWEWmICLtXNxkKdYPQV0c_N4GEz8m9Npnb
 esphome/dashboard/util/password.py,sha256=cQz3b9B-ijTe7zS6BeCW0hc3pWv6JjC78jmnycYYAh8,321
 esphome/dashboard/util/subprocess.py,sha256=T8EW6dbU4LPd2DG1dRrdh8li71tt6J1isn411poMhkk,1022
 esphome/dashboard/util/text.py,sha256=ENDnfN4O0NdA3CKVJjQYabFbwbrsIhVKrAMQe53qYu4,534
-esphome-2024.7.0b2.dist-info/LICENSE,sha256=HzEjkBInJe44L4WvAOPfhPJJDNj6YbnqFyvGWRzArGM,36664
-esphome-2024.7.0b2.dist-info/METADATA,sha256=UFr1ogkAb6DPxpDjjBKl8ax-uyZ4vU1oXGOvIf56U3A,3265
-esphome-2024.7.0b2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-esphome-2024.7.0b2.dist-info/entry_points.txt,sha256=mIxVNuWtbYzeEcaWCl-AQ-97aBOWbnYBAK8nbF6P4M0,50
-esphome-2024.7.0b2.dist-info/top_level.txt,sha256=0GSXEW3cnITpgG3qnsSMz0qoqJHAFyfw7Y8MVtEf1Yk,8
-esphome-2024.7.0b2.dist-info/RECORD,,
+esphome-2024.7.0b3.dist-info/LICENSE,sha256=HzEjkBInJe44L4WvAOPfhPJJDNj6YbnqFyvGWRzArGM,36664
+esphome-2024.7.0b3.dist-info/METADATA,sha256=e3LWrKNMO9xv3Y6LKKcJCnNzxGQVVig2aZ5AsGfou1c,3265
+esphome-2024.7.0b3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+esphome-2024.7.0b3.dist-info/entry_points.txt,sha256=mIxVNuWtbYzeEcaWCl-AQ-97aBOWbnYBAK8nbF6P4M0,50
+esphome-2024.7.0b3.dist-info/top_level.txt,sha256=0GSXEW3cnITpgG3qnsSMz0qoqJHAFyfw7Y8MVtEf1Yk,8
+esphome-2024.7.0b3.dist-info/RECORD,,