Adding possiblity to not initialize speaker

Author: TinyuZhao

examples/Basics/speak/speak.ino

@@ -476,6 +476,7 @@ int checkAETCC608AInit() {
 
   myECCX08.end();
   Wire1.begin(21, 22, 100000UL);
+  return 0;
 }
 
 int checkSDCard() {

examples/FactoryTest/FactoryTest/FactoryTest.ino

@@ -6,7 +6,7 @@
 M5Core2::M5Core2() : isInited(0) {}
 
 void M5Core2::begin(bool LCDEnable, bool SDEnable, bool SerialEnable,
-                    bool I2CEnable, mbus_mode_t mode) {
+                    bool I2CEnable, mbus_mode_t mode, bool SpeakerEnable) {
   // Correct init once
   if (isInited == true) {
     return;
@@ -43,7 +43,10 @@ void M5Core2::begin(bool LCDEnable, bool SDEnable, bool SerialEnable,
   }
 
   // TONE
-  Spk.begin();
+
+  if (SpeakerEnable == true) {
+    Spk.begin();
+  }
 
   if (SerialEnable == true) {
     Serial.println("OK");

src/M5Core2.cpp

@@ -88,7 +88,7 @@ class M5Core2 {
   M5Core2();
   void begin(bool LCDEnable = true, bool SDEnable = true,
              bool SerialEnable = true, bool I2CEnable = false,
-             mbus_mode_t mode = kMBusModeOutput);
+             mbus_mode_t mode = kMBusModeOutput, bool SpeakerEnable = true);
   void update();
 
   void shutdown();

src/M5Core2.h

@@ -87,7 +87,13 @@ void Speaker::Write1Byte(uint8_t Addr, uint8_t Data) {
   Wire1.endTransmission();
 }
 
-void Speaker::DingDong(void) {
+const size_t Speaker::PlaySound(const unsigned char* data,
+                                const size_t& amount_of_bytes) {
   size_t bytes_written = 0;
-  i2s_write(Speak_I2S_NUMBER, ding, 35988, &bytes_written, portMAX_DELAY);
+  if (data == nullptr) {
+    return bytes_written;
+  }
+  i2s_write(Speak_I2S_NUMBER, data, amount_of_bytes, &bytes_written,
+            portMAX_DELAY);
+  return bytes_written;
 }

src/Speaker.cpp

@@ -5,7 +5,6 @@
 #include <freertos/task.h>
 #include <driver/i2s.h>
 #include <esp_err.h>
-#include <utility/ding.c>
 #include <Wire.h>
 
 #define CONFIG_I2S_BCK_PIN 12  //定义I2S相关端口
@@ -21,13 +20,15 @@
 
 class Speaker {
  private:
-  size_t bytes_written = 0;
   void Write1Byte(uint8_t Addr, uint8_t Data);
   uint8_t Read8bit(uint8_t Addr);
 
  public:
   void begin(void);
   bool InitI2SSpeakOrMic(int mode);
-  void DingDong(void);
+  // Plays the given amount of bytes from the given data array and returns the amount of bytes,
+  // that were actually played by the speaker.
+  const size_t PlaySound(const unsigned char* data,
+                         const size_t& amount_of_bytes);
 };
 #endif

src/Speaker.h

@@ -607,11 +607,6 @@ static inline void swap_coord(T &a, T &b) {
   b = t;
 }
 
-#ifndef min
-// Return minimum of two numbers, may already be defined
-#define min(a, b) (((a) < (b)) ? (a) : (b))
-#endif
-
 // This structure allows sketches to retrieve the user setup parameters at runtime
 // by calling getSetup(), zero impact on code size unless used, mainly for diagnostics
 typedef struct {