Merge pull request #19 from lovyan03/dev

Changed to automatically detect pin settings in sample code.

Author: Forairaaaaa

examples/KWS_ASR/KWS_ASR.ino

@@ -27,9 +27,12 @@ void setup()
     // language = "zh_CN";
 
     /* Init module serial port */
-    Serial2.begin(115200, SERIAL_8N1, 16, 17);  // Basic
-    // Serial2.begin(115200, SERIAL_8N1, 13, 14);  // Core2
-    // Serial2.begin(115200, SERIAL_8N1, 18, 17);  // CoreS3
+    // int rxd = 16, txd = 17;  // Basic
+    // int rxd = 13, txd = 14;  // Core2
+    // int rxd = 18, txd = 17;  // CoreS3
+    int rxd = M5.getPin(m5::pin_name_t::port_c_rxd);
+    int txd = M5.getPin(m5::pin_name_t::port_c_txd);
+    Serial2.begin(115200, SERIAL_8N1, rxd, txd);
 
     /* Init module */
     module_llm.begin(&Serial2);

examples/SerialTextAssistant/SerialTextAssistant.ino

@@ -25,9 +25,12 @@ void setup()
     CommSerialPort.begin(115200);
 
     /* Init module serial port */
-    Serial2.begin(115200, SERIAL_8N1, 16, 17);  // Basic
-    // Serial2.begin(115200, SERIAL_8N1, 13, 14);  // Core2
-    // Serial2.begin(115200, SERIAL_8N1, 18, 17);  // CoreS3
+    // int rxd = 16, txd = 17;  // Basic
+    // int rxd = 13, txd = 14;  // Core2
+    // int rxd = 18, txd = 17;  // CoreS3
+    int rxd = M5.getPin(m5::pin_name_t::port_c_rxd);
+    int txd = M5.getPin(m5::pin_name_t::port_c_txd);
+    Serial2.begin(115200, SERIAL_8N1, rxd, txd);
 
     /* Init module */
     module_llm.begin(&Serial2);

examples/TTS/TTS.ino

@@ -22,9 +22,12 @@ void setup()
     // language = "zh_CN";
 
     /* Init module serial port */
-    Serial2.begin(115200, SERIAL_8N1, 16, 17);  // Basic
-    // Serial2.begin(115200, SERIAL_8N1, 13, 14);  // Core2
-    // Serial2.begin(115200, SERIAL_8N1, 18, 17);  // CoreS3
+    // int rxd = 16, txd = 17;  // Basic
+    // int rxd = 13, txd = 14;  // Core2
+    // int rxd = 18, txd = 17;  // CoreS3
+    int rxd = M5.getPin(m5::pin_name_t::port_c_rxd);
+    int txd = M5.getPin(m5::pin_name_t::port_c_txd);
+    Serial2.begin(115200, SERIAL_8N1, rxd, txd);
 
     /* Init module */
     module_llm.begin(&Serial2);

examples/TextAssistant/TextAssistant.ino

@@ -17,9 +17,12 @@ void setup()
     M5.Display.setTextScroll(true);
 
     /* Init module serial port */
-    Serial2.begin(115200, SERIAL_8N1, 16, 17);  // Basic
-    // Serial2.begin(115200, SERIAL_8N1, 13, 14);  // Core2
-    // Serial2.begin(115200, SERIAL_8N1, 18, 17);  // CoreS3
+    // int rxd = 16, txd = 17;  // Basic
+    // int rxd = 13, txd = 14;  // Core2
+    // int rxd = 18, txd = 17;  // CoreS3
+    int rxd = M5.getPin(m5::pin_name_t::port_c_rxd);
+    int txd = M5.getPin(m5::pin_name_t::port_c_txd);
+    Serial2.begin(115200, SERIAL_8N1, rxd, txd);
 
     /* Init module */
     module_llm.begin(&Serial2);

examples/VoiceAssistant/VoiceAssistant.ino

@@ -42,9 +42,12 @@ void setup()
     M5.Display.setTextScroll(true);
 
     /* Init module serial port */
-    Serial2.begin(115200, SERIAL_8N1, 16, 17);  // Basic
-    // Serial2.begin(115200, SERIAL_8N1, 13, 14);  // Core2
-    // Serial2.begin(115200, SERIAL_8N1, 18, 17);  // CoreS3
+    // int rxd = 16, txd = 17;  // Basic
+    // int rxd = 13, txd = 14;  // Core2
+    // int rxd = 18, txd = 17;  // CoreS3
+    int rxd = M5.getPin(m5::pin_name_t::port_c_rxd);
+    int txd = M5.getPin(m5::pin_name_t::port_c_txd);
+    Serial2.begin(115200, SERIAL_8N1, rxd, txd);
 
     /* Init module */
     module_llm.begin(&Serial2);

examples/YOLO/YOLO.ino

@@ -28,9 +28,12 @@ void setup()
     M5.Display.setTextScroll(true);
 
     /* Init module serial port */
-    Serial2.begin(115200, SERIAL_8N1, 16, 17);  // Basic
-    // Serial2.begin(115200, SERIAL_8N1, 13, 14);  // Core2
-    // Serial2.begin(115200, SERIAL_8N1, 18, 17);  // CoreS3
+    // int rxd = 16, txd = 17;  // Basic
+    // int rxd = 13, txd = 14;  // Core2
+    // int rxd = 18, txd = 17;  // CoreS3
+    int rxd = M5.getPin(m5::pin_name_t::port_c_rxd);
+    int txd = M5.getPin(m5::pin_name_t::port_c_txd);
+    Serial2.begin(115200, SERIAL_8N1, rxd, txd);
 
     /* Init module */
     module_llm.begin(&Serial2);