Skip to content

Commit

Permalink
update tp 0.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@Tinyu-Zhao
Tinyu-Zhao committed Mar 12, 2022
2 parents bec1328 + 7440195 commit 0750f6e
Show file tree
Hide file tree
Showing 13 changed files with 2,310 additions and 1,619 deletions.
2 changes: 1 addition & 1 deletion examples/Advanced/WIFI/BasicHttpClient/BasicHttpClient.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ HTTPClient http;

void setup() {
M5.begin(); //Init M5Core2. 初始化 M5Core2
wifiMulti.addAP("M5-2.4G", "Office@888888"); //Storage wifi configuration information. 存储wifi配置信息
wifiMulti.addAP("WIFINAME", "WIFIPASSWORD"); //Storage wifi configuration information. 存储wifi配置信息
M5.Lcd.print("\nConnecting Wifi...\n"); //print format output string on lcd. 串口格式化输出字符串
}

Expand Down
157 changes: 94 additions & 63 deletions examples/Basics/record/record.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,105 +7,136 @@
* 获取更多资料请访问：https://docs.m5stack.com/zh_CN/core/core2
*
* describe：NS4168--I2S power amplifier. 功放示例
* date：2021/7/21
* date：2022/2/22
*******************************************************************************
*/
#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_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 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
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_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_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缓冲区长度
.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. 开启欠流自动清除描述符
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;
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使用的时钟和位宽
#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. 设置屏幕背景色为白色
M5.Lcd.setTextColor(BLACK); //Set the text color to black. 设置文字颜色为黑色
M5.Lcd.setTextSize(2); //Set font size to 2. 设置字体大小为2
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); //Init M5Core2. 初始化 M5Core2
M5.Axp.SetSpkEnable(true); //Enable speaker power. 启用扬声器电源
DisplayInit();
M5.Lcd.setTextColor(RED);
M5.Lcd.setCursor(10, 10); // Set the cursor at (10,10). 将光标设在（10，10）处
M5.Lcd.printf("Recorder!"); // 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 recording!");
delay(100); //delay 100ms. 延迟100ms
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.Axp.SetSpkEnable(true); // Enable speaker power. 启用扬声器电源
DisplayInit();
M5.Lcd.setTextColor(RED);
M5.Lcd.setCursor(10,
10); // Set the cursor at (10,10). 将光标设在（10，10）处
M5.Lcd.printf("Recorder!"); // 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 recording!");
delay(100); // delay 100ms. 延迟100ms
}

/* 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);
data_offset = 0;
InitI2SSpeakOrMic(MODE_MIC);
size_t byte_read;
while (1){
i2s_read(Speak_I2S_NUMBER, (char *)(microphonedata0 + data_offset), DATA_SIZE, &byte_read, (100 / portTICK_RATE_MS));
data_offset += 1024;
if(data_offset == 1024 * 100 || M5.Touch.ispressed() != true)
break;
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);
data_offset = 0;
InitI2SSpeakOrMic(MODE_MIC);
size_t byte_read;
while (1) {
i2s_read(Speak_I2S_NUMBER,
(char *)(microphonedata0 + data_offset), DATA_SIZE,
&byte_read, (100 / portTICK_RATE_MS));
data_offset += 1024;
if (data_offset == 1024 * 100 || M5.Touch.ispressed() != true)
break;
}
size_t bytes_written;
InitI2SSpeakOrMic(MODE_SPK);
i2s_write(Speak_I2S_NUMBER, microphonedata0, data_offset,
&bytes_written, portMAX_DELAY);
}
size_t bytes_written;
InitI2SSpeakOrMic(MODE_SPK);
i2s_write(Speak_I2S_NUMBER, microphonedata0, data_offset, &bytes_written, portMAX_DELAY);
}
}
}
4 changes: 2 additions & 2 deletions examples/Basics/sleep/sleep.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* 获取更多资料请访问：https://docs.m5stack.com/zh_CN/core/core2
*
* describe：Sleep--Axp电源休眠
* date：2021/7/21
* date：2022/3/12
*******************************************************************************
*/
#include <M5Core2.h>
Expand Down Expand Up @@ -37,7 +37,7 @@ void setup(){
M5.Lcd.println("Going to deep sleep for 5 seconds.");
delay(2500);

M5.Axp.DeepSleep(SLEEP_SEC(5)); //Wake up after 5 seconds of light sleep, the CPU will reboot and the program will start from the beginning. 轻度睡眠5秒后唤醒,CPU将重新启动，程序将从头开始执行
M5.Axp.DeepSleep(SLEEP_SEC(5)); //Wake up after 5 seconds of deep sleep, the CPU will reboot and the program will start from the beginning. 深度睡眠5秒后唤醒,CPU将重新启动，程序将从头开始执行
}

void loop()
Expand Down
Loading

0 comments on commit 0750f6e

Please sign in to comment.