Merge pull request #96 from Jason2866/patch-2

Update 100322

Author: Jason2866

Diff for: boards.txt

@@ -54,6 +54,7 @@ esp32s3.build.flash_size=4MB
 esp32s3.build.flash_freq=80m
 esp32s3.build.flash_mode=dio
 esp32s3.build.boot=qio
+esp32s3.build.boot_freq=80m
 esp32s3.build.partitions=default
 esp32s3.build.defines=
 esp32s3.build.loop_core=
@@ -82,21 +83,25 @@ esp32s3.menu.PSRAM.opi.build.psram_type=opi
 esp32s3.menu.FlashMode.qio=QIO 80MHz
 esp32s3.menu.FlashMode.qio.build.flash_mode=dio
 esp32s3.menu.FlashMode.qio.build.boot=qio
+esp32s3.menu.FlashMode.qio.build.boot_freq=80m
 esp32s3.menu.FlashMode.qio.build.flash_freq=80m
 esp32s3.menu.FlashMode.qio.build.flash_type=qspi
 esp32s3.menu.FlashMode.qio120=QIO 120MHz
 esp32s3.menu.FlashMode.qio120.build.flash_mode=dio
 esp32s3.menu.FlashMode.qio120.build.boot=qio
-esp32s3.menu.FlashMode.qio120.build.flash_freq=120m
+esp32s3.menu.FlashMode.qio120.build.boot_freq=120m
+esp32s3.menu.FlashMode.qio120.build.flash_freq=80m
 esp32s3.menu.FlashMode.qio120.build.flash_type=qspi
 esp32s3.menu.FlashMode.dio=DIO 80MHz
 esp32s3.menu.FlashMode.dio.build.flash_mode=dio
 esp32s3.menu.FlashMode.dio.build.boot=dio
+esp32s3.menu.FlashMode.dio.build.boot_freq=80m
 esp32s3.menu.FlashMode.dio.build.flash_freq=80m
 esp32s3.menu.FlashMode.dio.build.flash_type=qspi
 esp32s3.menu.FlashMode.opi=OPI 80MHz
 esp32s3.menu.FlashMode.opi.build.flash_mode=dout
 esp32s3.menu.FlashMode.opi.build.boot=opi
+esp32s3.menu.FlashMode.opi.build.boot_freq=80m
 esp32s3.menu.FlashMode.opi.build.flash_freq=80m
 esp32s3.menu.FlashMode.opi.build.flash_type=opi
 
@@ -107,8 +112,8 @@ esp32s3.menu.FlashSize.8M.build.flash_size=8MB
 esp32s3.menu.FlashSize.8M.build.partitions=default_8MB
 esp32s3.menu.FlashSize.16M=16MB (128Mb)
 esp32s3.menu.FlashSize.16M.build.flash_size=16MB
-esp32s3.menu.FlashSize.32M=32MB (256Mb)
-esp32s3.menu.FlashSize.32M.build.flash_size=32MB
+#esp32s3.menu.FlashSize.32M=32MB (256Mb)
+#esp32s3.menu.FlashSize.32M.build.flash_size=32MB
 
 esp32s3.menu.LoopCore.1=Core 1
 esp32s3.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1

Diff for: libraries/RainMaker/examples/RMakerCustom/.skip.esp32s3

@@ -541,7 +541,7 @@ def _get_pid(self):
         active_port = self._port.port
 
         # Pyserial only identifies regular ports, URL handlers are not supported
-        if not active_port.startswith(("COM", "/dev/")):
+        if not active_port.lower().startswith(("com", "/dev/")):
             print("\nDevice PID identification is only supported on COM and /dev/ serial ports.")
             return
         # Return the real path if the active port is a symlink
@@ -674,7 +674,8 @@ def connect(self, mode='default_reset', attempts=DEFAULT_CONNECT_ATTEMPTS, detec
                 chip_magic_value = self.read_reg(ESPLoader.CHIP_DETECT_MAGIC_REG_ADDR)
                 if chip_magic_value not in self.CHIP_DETECT_MAGIC_VALUE:
                     actually = None
-                    for cls in [ESP8266ROM, ESP32ROM, ESP32S2ROM, ESP32S3BETA2ROM, ESP32S3ROM, ESP32C3ROM, ESP32H2BETA1ROM, ESP32C2ROM, ESP32H2BETA2ROM]:
+                    for cls in [ESP8266ROM, ESP32ROM, ESP32S2ROM, ESP32S3BETA2ROM, ESP32S3ROM,
+                                ESP32C3ROM, ESP32H2BETA1ROM, ESP32H2BETA2ROM, ESP32C2ROM, ESP32C6BETAROM]:
                         if chip_magic_value in cls.CHIP_DETECT_MAGIC_VALUE:
                             actually = cls
                             break

Diff for: libraries/RainMaker/examples/RMakerSonoffDualR3/.skip.esp32s3

@@ -78,7 +78,7 @@ typedef struct  {
  *
  */
 typedef struct {
-    int mck_io_num;     /*!< MCK in out pin*/
+    int mck_io_num;     /*!< MCK in out pin. Note that ESP32 supports setting MCK on GPIO0/GPIO1/GPIO3 only*/
     int bck_io_num;     /*!< BCK in out pin*/
     int ws_io_num;      /*!< WS in out pin*/
     int data_out_num;   /*!< DATA out pin*/
@@ -97,8 +97,22 @@ typedef struct {
     i2s_channel_fmt_t       channel_format;             /*!< I2S channel format.*/
     i2s_comm_format_t       communication_format;       /*!< I2S communication format */
     int                     intr_alloc_flags;           /*!< Flags used to allocate the interrupt. One or multiple (ORred) ESP_INTR_FLAG_* values. See esp_intr_alloc.h for more info */
-    int                     dma_buf_count;              /*!< I2S DMA Buffer Count */
-    int                     dma_buf_len;                /*!< I2S DMA Buffer Length */
+    int                     dma_buf_count;              /**< The total number of DMA buffers to receive/transmit data.
+                                                          * A descriptor includes some information such as buffer address,
+                                                          * the address of the next descriptor, and the buffer length.
+                                                          * Since one descriptor points to one buffer, therefore, 'dma_desc_num' can be interpreted as the total number of DMA buffers used to store data from DMA interrupt.
+                                                          * Notice that these buffers are internal to'i2s_read' and descriptors are created automatically inside of the I2S driver.
+                                                          * Users only need to set the buffer number while the length is derived from the parameter described below.
+                                                          */
+    int                     dma_buf_len;                /**< Number of frames in a DMA buffer.
+                                                          *  A frame means the data of all channels in a WS cycle.
+                                                          *  The real_dma_buf_size = dma_buf_len * chan_num * bits_per_chan / 8.
+                                                          *  For example, if two channels in stereo mode (i.e., 'channel_format' is set to 'I2S_CHANNEL_FMT_RIGHT_LEFT') are active,
+                                                          *  and each channel transfers 32 bits (i.e., 'bits_per_sample' is set to 'I2S_BITS_PER_CHAN_32BIT'),
+                                                          *  then the total number of bytes of a frame is 'channel_format' * 'bits_per_sample' = 2 * 32 / 8 = 8 bytes.
+                                                          *  We assume that the current 'dma_buf_len' is 100, then the real length of the DMA buffer is 8 * 100 = 800 bytes.
+                                                          *  Note that the length of an internal real DMA buffer shouldn't be greater than 4092.
+                                                          */
     bool                    use_apll;                   /*!< I2S using APLL as main I2S clock, enable it to get accurate clock */
     bool                    tx_desc_auto_clear;         /*!< I2S auto clear tx descriptor if there is underflow condition (helps in avoiding noise in case of data unavailability) */
     int                     fixed_mclk;                 /*!< I2S using fixed MCLK output. If use_apll = true and fixed_mclk > 0, then the clock output for i2s is fixed and equal to the fixed_mclk value. If fixed_mclk set, mclk_multiple won't take effect */

Diff for: libraries/RainMaker/examples/RMakerSwitch/.skip.esp32s3

@@ -85,6 +85,7 @@ esp_err_t ledc_timer_config(const ledc_timer_config_t* timer_conf);
  * @brief LEDC update channel parameters
  * @note  Call this function to activate the LEDC updated parameters.
  *        After ledc_set_duty, we need to call this function to update the settings.
+ *        And the new LEDC parameters don't take effect until the next PWM cycle.
  * @note  ledc_set_duty, ledc_set_duty_with_hpoint and ledc_update_duty are not thread-safe, do not call these functions to
  *        control one LEDC channel in different tasks at the same time.
  *        A thread-safe version of API is ledc_set_duty_and_update
@@ -203,6 +204,9 @@ esp_err_t ledc_set_duty(ledc_mode_t speed_mode, ledc_channel_t channel, uint32_t
 
 /**
  * @brief LEDC get duty
+ *        This function returns the duty at the present PWM cycle.
+ *        You shouldn't expect the function to return the new duty in the same cycle of calling ledc_update_duty,
+ *        because duty update doesn't take effect until the next cycle.
  *
  * @param speed_mode Select the LEDC channel group with specified speed mode. Note that not all targets support high speed mode.
  * @param channel LEDC channel (0 - LEDC_CHANNEL_MAX-1), select from ledc_channel_t
@@ -385,7 +389,8 @@ void ledc_fade_func_uninstall(void);
  *        Other duty operations will have to wait until the fade operation has finished.
  * @param speed_mode Select the LEDC channel group with specified speed mode. Note that not all targets support high speed mode.
  * @param channel LEDC channel number
- * @param fade_mode Whether to block until fading done.
+ * @param fade_mode Whether to block until fading done. See ledc_types.h ledc_fade_mode_t for more info.
+ *        Note that this function will not return until fading to the target duty if LEDC_FADE_WAIT_DONE mode is selected.
  *
  * @return
  *     - ESP_OK Success

Diff for: platform.txt

@@ -18,7 +18,12 @@
 #include <stdbool.h>
 #include "dsp_err.h"
 #include "esp_idf_version.h"
+
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 4, 0)
+#include "esp_cpu.h"
+#else
 #include "soc/cpu.h"
+#endif
 
 #ifdef __cplusplus
 extern "C"
@@ -58,4 +63,4 @@ int dsp_power_of_two(int x);
 #define dsp_get_cpu_cycle_count  xthal_get_ccount
 #endif
 
-#endif // _dsp_common_H_
+#endif // _dsp_common_H_

Diff for: tools/esptool.py

@@ -15,11 +15,16 @@
 
 #ifndef dsp_platform_h_
 #define dsp_platform_h_
+#include "esp_idf_version.h"
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 4, 0)
+#include "esp_cpu.h"
+#else
 #include "soc/cpu.h"
+#endif
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/portable.h"
 #include "freertos/task.h"
 #include "freertos/semphr.h"
 
-#endif // dsp_platform_h_
+#endif // dsp_platform_h_

Diff for: tools/platformio-build-esp32.py

@@ -43,7 +43,7 @@ extern "C"
  */
 esp_err_t dsps_conv_f32_ae32(const float *Signal, const int siglen, const float *Kernel, const int kernlen, float *convout);
 esp_err_t dsps_conv_f32_ansi(const float *Signal, const int siglen, const float *Kernel, const int kernlen, float *convout);
-/**}@*/
+/**@}*/
 
 #ifdef __cplusplus
 }

Diff for: tools/platformio-build-esp32c3.py

@@ -43,7 +43,7 @@ extern "C"
  */
 esp_err_t dsps_corr_f32_ansi(const float *Signal, const int siglen, const float *Pattern, const int patlen, float *dest);
 esp_err_t dsps_corr_f32_ae32(const float *Signal, const int siglen, const float *Pattern, const int patlen, float *dest);
-/**}@*/
+/**@}*/
 
 #ifdef __cplusplus
 }

Diff for: tools/platformio-build-esp32s2.py

@@ -69,8 +69,6 @@ esp_err_t dsps_fft2r_init_sc16(int16_t *fft_table_buff, int table_size);
  * Free resources of Complex FFT. This function delete coefficients table if it was allocated by dsps_fft2r_init_fc32.
  * The implementation use ANSI C and could be compiled and run on any platform
  *
- *
- * @return
  */
 void dsps_fft2r_deinit_fc32(void);
 void dsps_fft2r_deinit_sc16(void);
@@ -128,13 +126,13 @@ esp_err_t dsps_fft2r_sc16_aes3_(int16_t *data, int N, int16_t *w);
 esp_err_t dsps_bit_rev_fc32_ansi(float *data, int N);
 esp_err_t dsps_bit_rev_sc16_ansi(int16_t *data, int N);
 esp_err_t dsps_bit_rev2r_fc32(float *data, int N);
-
-/**@{*/
+/**@}*/
 
 esp_err_t dsps_bit_rev_lookup_fc32_ansi(float *data, int reverse_size, uint16_t *reverse_tab);
 esp_err_t dsps_bit_rev_lookup_fc32_ae32(float *data, int reverse_size, uint16_t *reverse_tab);
 esp_err_t dsps_bit_rev_lookup_fc32_aes3(float *data, int reverse_size, uint16_t *reverse_tab);
 
+/**@{*/
 /**
  * @brief      Generate coefficients table for the FFT radix 2
  *

Diff for: tools/platformio-build-esp32s3.py

@@ -30,7 +30,7 @@
 #if CONFIG_IDF_TARGET_ESP32S3
 #define dsps_fft2r_fc32_aes3_enabled 1
 #define dsps_fft2r_sc16_aes3_enabled 1
-#endif 
+#endif
 
 
 #endif // _dsps_fft2r_platform_H_

Diff for: tools/sdk/esp32/bin/bootloader_dio_40m.bin

@@ -65,7 +65,6 @@ esp_err_t dsps_fft4r_init_fc32(float *fft_table_buff, int max_fft_size);
  * The implementation use ANSI C and could be compiled and run on any platform
  *
  *
- * @return
  */
 void dsps_fft4r_deinit_fc32(void);
 /**@}*/
@@ -115,7 +114,7 @@ esp_err_t dsps_bit_rev4r_fc32(float *data, int N);
 esp_err_t dsps_bit_rev4r_fc32_ae32(float *data, int N);
 esp_err_t dsps_bit_rev4r_direct_fc32_ansi(float *data, int N);
 esp_err_t dsps_bit_rev4r_sc16_ansi(int16_t *data, int N);
-
+/**@}*/
 
 /**@{*/
 /**

Diff for: tools/sdk/esp32/bin/bootloader_dio_80m.bin

@@ -0,0 +1,135 @@
+// Copyright 2015-2019 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License
+#ifndef _ESP_TTS_H_
+#define _ESP_TTS_H_
+
+#include "stdlib.h"
+#include "stdio.h"
+#include "esp_tts_voice.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+	NONE_MODE      = 0,    //do not play any word before playing a specific number
+	ALI_PAY_MODE,          //play zhi fu bao shou kuan before playing a specific number
+	WEIXIN_PAY_MODE        //play wei xin shou kuan before playing a specific number
+} pay_mode_t;
+
+typedef void * esp_tts_handle_t;
+
+
+/**
+ * @brief Init an instance of the TTS voice set structure.
+ *
+ * @param template      The const esp_tts_voice_template.
+ * @param data          The customize voice data
+ * @return
+ *         - NULL: Init failed
+ *         - Others: The instance of voice set
+ */
+esp_tts_voice_t *esp_tts_voice_set_init(const esp_tts_voice_t *template, void *data);
+
+/**
+ * @brief Init an instance of the TTS voice set structure.
+ *
+ * @param template      The const esp_tts_voice_template.
+ * @param data          The customize voice data
+ * @return
+ *         - NULL: Init failed
+ *         - Others: The instance of voice set
+ */
+void esp_tts_voice_set_free(esp_tts_voice_t *voice);
+
+/**
+ * @brief Creates an instance of the TTS structure.
+ *
+ * @param voice      Voice set containing all basic phonemes.
+ * @return
+ *         - NULL: Create failed
+ *         - Others: The instance of TTS structure
+ */
+esp_tts_handle_t esp_tts_create(esp_tts_voice_t *voice);
+
+/**
+ * @brief parse money pronuciation.
+ *
+ * @param tts_handle   Instance of TTS
+ * @param yuan         The number of yuan    
+ * @param jiao         The number of jiao
+ * @param fen          The number of fen   
+ * @param mode         The pay mode: please refer to pay_mode_t
+ * @return
+ *        - 0: failed
+ *        - 1: succeeded
+ */
+int esp_tts_parse_money(esp_tts_handle_t tts_handle, int yuan, int jiao, int fen, pay_mode_t mode);
+
+/**
+ * @brief parse Chinese PinYin pronuciation.
+ *
+ * @param tts_handle   Instance of TTS
+ * @param pinyin       PinYin string, like this "da4 jia1 hao3"    
+ * @return
+ *         - 0: failed
+ *         - 1: succeeded
+ */
+int esp_tts_parse_pinyin(esp_tts_handle_t tts_handle, const char *pinyin);
+
+/**
+ * @brief parse Chinese string.
+ *
+ * @param tts_handle   Instance of TTS
+ * @param str          Chinese string, like this "大家好"    
+ * @return
+ *         - 0: failed
+ *         - 1: succeeded
+ */
+int esp_tts_parse_chinese(esp_tts_handle_t tts_handle, const char *str);
+
+/**
+ * @brief output TTS voice data by stream.
+ *
+ * @Warning The output data should not be freed. 
+            Once the output length is 0, the all voice data has been output.  
+ *
+ * @param tts_handle   Instance of TTS
+ * @param len          The length of output data 
+ * @param speed        The speech speed speed of synthesized speech, 
+                       range:0~5, 0: the slowest speed, 5: the fastest speech 
+ * @return
+ *        - voice raw data
+ */
+short* esp_tts_stream_play(esp_tts_handle_t tts_handle, int *len, unsigned int speed);
+
+/**
+ * @brief reset tts stream and clean all cache of TTS instance.
+ *
+ * @param tts_handle   Instance of TTS
+ */
+void esp_tts_stream_reset(esp_tts_handle_t tts_handle);
+
+/**
+ * @brief Free the TTS instance
+ *
+ * @param tts_handle The instance of TTS. 
+ */
+void esp_tts_destroy(esp_tts_handle_t tts_handle);
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#endif

Diff for: tools/sdk/esp32/bin/bootloader_dout_40m.bin

@@ -0,0 +1,25 @@
+#ifndef _ESP_TTS_PARSER_H_
+#define _ESP_TTS_PARSER_H_
+
+#include "stdlib.h"
+#include "esp_tts_voice.h"
+
+
+typedef struct {
+	int *syll_idx;
+	int syll_num;
+	int total_num;
+	esp_tts_voice_t *voice;
+}esp_tts_utt_t;
+
+esp_tts_utt_t* esp_tts_parser_chinese   (const char* str, esp_tts_voice_t *voice);
+
+esp_tts_utt_t* esp_tts_parser_money(char *play_tag, int yuan, int jiao, int fen, esp_tts_voice_t *voice);
+
+esp_tts_utt_t* esp_tts_parser_pinyin(char* pinyin, esp_tts_voice_t *voice);
+
+esp_tts_utt_t* esp_tts_utt_alloc(int syll_num, esp_tts_voice_t *voice);
+
+void esp_tts_utt_free(esp_tts_utt_t *utt);
+
+#endif