Fix lots of warnings;

Optimizing speak and record example

examples/Basics/record/record.ino

@@ -1,86 +1,20 @@
 /*
 *******************************************************************************
-* Copyright (c) 2021 by M5Stack
+* Copyright (c) 2023 by M5Stack
 * Equipped with M5Core2 sample source code
 * 配套 M5Core2 示例源代码
 * Visit for more information: https://docs.m5stack.com/en/core/core2
 * 获取更多资料请访问: https://docs.m5stack.com/zh_CN/core/core2
 *
 * Describe: NS4168--I2S power amplifier. 功放示例
-* Date: 2022/2/22
+* Date: 2023/7/31
 *******************************************************************************
 */
 #include <M5Core2.h>
-#include <driver/i2s.h>
-
-#define CONFIG_I2S_BCK_PIN 12 // Define I2S related ports. 定义I2S相关端口
-#define CONFIG_I2S_LRCK_PIN 0
-#define CONFIG_I2S_DATA_PIN 2
-#define CONFIG_I2S_DATA_IN_PIN 34
-
-#define Speak_I2S_NUMBER I2S_NUM_0 // Define the speaker port. 定义扬声器端口
-
-#define MODE_MIC 0 // Define the working mode. 定义工作模式
-#define MODE_SPK 1
-#define DATA_SIZE 1024
 
 uint8_t microphonedata0[1024 * 100];
 int data_offset = 0;
 
-bool InitI2SSpeakOrMic(int mode) { // Init I2S. 初始化I2S
- esp_err_t err = ESP_OK;
-
- i2s_driver_uninstall(
- Speak_I2S_NUMBER); // Uninstall the I2S driver. 卸载I2S驱动
- i2s_config_t i2s_config = {
- .mode = (i2s_mode_t)(I2S_MODE_MASTER), // Set the I2S operating mode.
- // 设置I2S工作模式
- .sample_rate = 44100, // Set the I2S sampling rate. 设置I2S采样率
- .bits_per_sample = I2S_BITS_PER_SAMPLE_16BIT, // Fixed 12-bit stereo MSB.
- // 固定为12位立体声MSB
- .channel_format =
- I2S_CHANNEL_FMT_ONLY_RIGHT, // Set the channel format. 设置频道格式
- .communication_format =
- I2S_COMM_FORMAT_STAND_I2S, // Set the format of the communication.
- // 设置通讯格式
- .intr_alloc_flags =
- ESP_INTR_FLAG_LEVEL1, // Set the interrupt flag. 设置中断的标志
- .dma_buf_count = 2, // DMA buffer count. DMA缓冲区计数
- .dma_buf_len = 128, // DMA buffer length. DMA缓冲区长度
- };
- if (mode == MODE_MIC) {
- i2s_config.mode =
- (i2s_mode_t)(I2S_MODE_MASTER | I2S_MODE_RX | I2S_MODE_PDM);
- } else {
- i2s_config.mode = (i2s_mode_t)(I2S_MODE_MASTER | I2S_MODE_TX);
- i2s_config.use_apll = false; // I2S clock setup. I2S时钟设置
- i2s_config.tx_desc_auto_clear =
- true; // Enables auto-cleanup descriptors for understreams.
- // 开启欠流自动清除描述符
- }
- // Install and drive I2S. 安装并驱动I2S
- err += i2s_driver_install(Speak_I2S_NUMBER, &i2s_config, 0, NULL);
-
- i2s_pin_config_t tx_pin_config;
-#if (ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(4, 3, 0))
- tx_pin_config.mck_io_num = I2S_PIN_NO_CHANGE;
-#endif
- tx_pin_config.bck_io_num =
- CONFIG_I2S_BCK_PIN; // Link the BCK to the CONFIG_I2S_BCK_PIN pin.
- // 将BCK链接至CONFIG_I2S_BCK_PIN引脚
- tx_pin_config.ws_io_num = CONFIG_I2S_LRCK_PIN; // ...
- tx_pin_config.data_out_num = CONFIG_I2S_DATA_PIN; // ...
- tx_pin_config.data_in_num = CONFIG_I2S_DATA_IN_PIN; // ...
- err +=
- i2s_set_pin(Speak_I2S_NUMBER,
- &tx_pin_config); // Set the I2S pin number. 设置I2S引脚编号
- err += i2s_set_clk(
- Speak_I2S_NUMBER, 44100, I2S_BITS_PER_SAMPLE_16BIT,
- I2S_CHANNEL_MONO); // Set the clock and bitwidth used by I2S Rx and Tx.
- // 设置I2S RX、Tx使用的时钟和位宽
- return true;
-}
-
 void DisplayInit(void) { // Initialize the display. 显示屏初始化
  M5.Lcd.fillScreen(WHITE); // Set the screen background color to white.
  // 设置屏幕背景色为白色
@@ -94,7 +28,8 @@ the program in the setUp () function will be run, and this part will only be run
 once. 在 M5Core2
 启动或者复位后，即会开始执行setup()函数中的程序，该部分只会执行一次。 */
 void setup() {
- M5.begin(true, true, true, true); // Init M5Core2. 初始化 M5Core2
+ M5.begin(true, true, true, true, kMBusModeOutput,
+ true); // Init M5Core2. 初始化 M5Core2
  M5.Axp.SetSpkEnable(true); // Enable speaker power. 启用扬声器电源
  DisplayInit();
  M5.Lcd.setTextColor(RED);
@@ -122,7 +57,7 @@ void loop() {
  delay(100);
  M5.Axp.SetLDOEnable(3, false);
  data_offset = 0;
- InitI2SSpeakOrMic(MODE_MIC);
+ M5.Spk.InitI2SSpeakOrMic(MODE_MIC);
  size_t byte_read;
  while (1) {
  i2s_read(Speak_I2S_NUMBER, (char *)(microphonedata0 + data_offset),
@@ -131,7 +66,7 @@ void loop() {
  if (data_offset == 1024 * 100 || M5.Touch.ispressed() != true) break;
  }
  size_t bytes_written;
- InitI2SSpeakOrMic(MODE_SPK);
+ M5.Spk.InitI2SSpeakOrMic(MODE_SPK);
  i2s_write(Speak_I2S_NUMBER, microphonedata0, data_offset, &bytes_written,
  portMAX_DELAY);
  }

examples/Basics/speak/speak.ino

@@ -1,17 +1,69 @@
 /*
 *******************************************************************************
-* Copyright (c) 2021 by M5Stack
+* Copyright (c) 2023 by M5Stack
 * Equipped with M5Core2 sample source code
 * 配套 M5Core2 示例源代码
 * Visit for more information: https://docs.m5stack.com/en/core/core2
 * 获取更多资料请访问: https://docs.m5stack.com/zh_CN/core/core2
 *
 * Describe: Speaker example. 喇叭示例
-* Date: 2022/7/26
+* Date: 2023/7/31
 *******************************************************************************
 */
 #include <M5Core2.h>
 
+extern const unsigned char previewR[120264];
+
+void DisplayInit(void) { // Initialize the display. 显示屏初始化
+ M5.Lcd.fillScreen(WHITE); // Set the screen background color to white.
+ // 设置屏幕背景色为白色
+ M5.Lcd.setTextColor(
+ BLACK); // Set the text color to black. 设置文字颜色为黑色
+ M5.Lcd.setTextSize(2); // Set font size to 2. 设置字体大小为2
+}
+
+/* After M5Core2 is started or reset
+the program in the setUp () function will be run, and this part will only be run once.
+在 M5Core2 启动或者复位后，即会开始执行setup()函数中的程序，该部分只会执行一次。 */
+void setup() {
+ M5.begin(true, true, true, true, mbus_mode_t::kMBusModeOutput,
+ true); // Init M5Core2. 初始化 M5Core2
+ DisplayInit();
+ M5.Lcd.setTextColor(RED);
+ M5.Lcd.setCursor(10,
+ 10); // Set the cursor at (10,10). 将光标设在（10，10）处
+ M5.Lcd.printf("Speak Test!"); // The screen prints the formatted string and
+ // wraps it. 屏幕打印格式化字符串并换行
+ M5.Lcd.setTextColor(BLACK);
+ M5.Lcd.setCursor(10, 26);
+ M5.Lcd.printf("Press Left Button to listen DingDong!");
+ M5.Spk.PlaySound(
+ previewR,
+ sizeof(previewR)); // Play the DingDong sound. 播放 DingDong 声音
+ delay(100);
+}
+
+/* After the program in setup() runs, it runs the program in loop()
+The loop() function is an infinite loop in which the program runs repeatedly
+在setup()函数中的程序执行完后，会接着执行loop()函数中的程序
+loop()函数是一个死循环，其中的程序会不断的重复运行 */
+void loop() {
+ TouchPoint_t pos =
+ M5.Touch.getPressPoint(); // Stores the touch coordinates in pos.
+ // 将触摸坐标存储在pos.内
+ if (pos.y > 240)
+ if (pos.x < 109) {
+ M5.Axp.SetLDOEnable(3, true); // Open the vibration. 开启震动马达
+ delay(100);
+ M5.Axp.SetLDOEnable(3, false);
+ delay(100);
+ M5.Spk.PlaySound(
+ previewR,
+ sizeof(previewR)); // Play the DingDong sound. 播放 DingDong 声音
+ }
+ delay(10);
+}
+
 const unsigned char previewR[120264] = {
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -10035,53 +10087,3 @@ const unsigned char previewR[120264] = {
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-void DisplayInit(void) { // Initialize the display. 显示屏初始化
- M5.Lcd.fillScreen(WHITE); // Set the screen background color to white.
- // 设置屏幕背景色为白色
- M5.Lcd.setTextColor(
- BLACK); // Set the text color to black. 设置文字颜色为黑色
- M5.Lcd.setTextSize(2); // Set font size to 2. 设置字体大小为2
-}
-
-//在 M5Core
-//启动或者复位后，即会开始执行setup()函数中的程序，该部分只会执行一次。
-void setup() {
- M5.begin(true, true, true, true, mbus_mode_t::kMBusModeOutput,
- true); // Init M5Core2. 初始化 M5Core2
- DisplayInit();
- M5.Lcd.setTextColor(RED);
- M5.Lcd.setCursor(10,
- 10); // Set the cursor at (10,10). 将光标设在（10，10）处
- M5.Lcd.printf("Speak Test!"); // The screen prints the formatted string and
- // wraps it. 屏幕打印格式化字符串并换行
- M5.Lcd.setTextColor(BLACK);
- M5.Lcd.setCursor(10, 26);
- M5.Lcd.printf("Press Left Button to listen DingDong!");
- M5.Spk.PlaySound(
- previewR,
- sizeof(previewR)); // Play the DingDong sound. 播放 DingDong 声音
- delay(100);
-}
-
-/* After the program in setup() runs, it runs the program in loop()
-The loop() function is an infinite loop in which the program runs repeatedly
-在setup()函数中的程序执行完后，会接着执行loop()函数中的程序
-loop()函数是一个死循环，其中的程序会不断的重复运行 */
-void loop() {
- TouchPoint_t pos =
- M5.Touch.getPressPoint(); // Stores the touch coordinates in pos.
- // 将触摸坐标存储在pos.内
- if (pos.y > 240)
- if (pos.x < 109) {
- M5.Axp.SetLDOEnable(3, true); // Open the vibration. 开启震动马达
- delay(100);
- M5.Axp.SetLDOEnable(3, false);
- delay(100);
- M5.Spk.PlaySound(
- previewR,
- sizeof(
- previewR)); // Play the DingDong sound. 播放 DingDong 声音
- }
- delay(10);
-}

library.json

@@ -10,7 +10,7 @@
  "type": "git",
  "url": "https://github.com/m5stack/M5Core2.git"
  },
- "version": "0.1.5",
+ "version": "0.1.6",
  "frameworks": "arduino",
  "platforms": "espressif32",
  "headers": "M5Core2.h"

library.properties

@@ -1,5 +1,5 @@
 name=M5Core2
-version=0.1.5
+version=0.1.6
 author=M5Stack
 maintainer=M5Stack
 sentence=Library for M5Stack Core2 development kit

src/Fonts/Custom/Orbitron_Light_24.h

@@ -393,6 +393,7 @@ const GFXfont Orbitron_Light_24 PROGMEM = {
  24,
 #ifdef USE_M5_FONT_CREATOR
  0,
+ nullptr,
  0,
 #endif
 };

src/Fonts/Custom/Orbitron_Light_32.h

@@ -582,6 +582,7 @@ const GFXfont Orbitron_Light_32 PROGMEM = {
  32,
 #ifdef USE_M5_FONT_CREATOR
  0,
+ nullptr,
  0,
 #endif
 };

src/Fonts/Custom/Roboto_Thin_24.h

@@ -332,6 +332,7 @@ const GFXfont Roboto_Thin_24 PROGMEM = {
  29,
 #ifdef USE_M5_FONT_CREATOR
  0,
+ nullptr,
  0,
 #endif
 };

src/Fonts/Custom/Satisfy_24.h

@@ -392,6 +392,7 @@ const GFXfont Satisfy_24 PROGMEM = {
  36,
 #ifdef USE_M5_FONT_CREATOR
  0,
+ nullptr,
  0,
 #endif
 };

src/Fonts/Custom/Yellowtail_32.h

@@ -581,6 +581,7 @@ const GFXfont Yellowtail_32 PROGMEM = {
  45,
 #ifdef USE_M5_FONT_CREATOR
  0,
+ nullptr,
  0,
 #endif
 };