m5stack runs with native tone support now.

variants/m5stack_core/Speaker.cpp

@@ -1,33 +0,0 @@
-#include "Speaker.h"
-
-TONE::TONE(void) {
-  _volume = 5;
-  _begun = false;
-}
-
-void TONE::begin() {
-  _begun = true;
-  ledcSetup(TONE_PIN_CHANNEL, 0, 13);
-  ledcAttachPin(PIN_BUZZER, TONE_PIN_CHANNEL);
-}
-
-void TONE::end() {
-  mute();
-  ledcDetachPin(PIN_BUZZER);
-  _begun = false;
-}
-
-void TONE::tone(uint16_t frequency) {
-  if(!_begun) begin();
-  ledcWriteTone(TONE_PIN_CHANNEL, frequency);
-  ledcWrite(TONE_PIN_CHANNEL, 0x400 >> _volume);
-}
-
-void TONE::setVolume(uint8_t volume) {
-  _volume = 11 - volume;
-}
-
-void TONE::mute() {
-  ledcWriteTone(TONE_PIN_CHANNEL, 0);
-  digitalWrite(PIN_BUZZER, 0);
-}

variants/m5stack_core/Speaker.h

@@ -1,30 +0,0 @@
-#ifndef _SPEAKER_H_
-  #define _SPEAKER_H_
-
-  #include "configuration.h"
-
-  #ifdef __cplusplus
-    extern "C"
-    {
-  #endif /* __cplusplus */
-  #include "esp32-hal-dac.h"
-  #ifdef __cplusplus
-    }
-  #endif /* __cplusplus */
-
-  class TONE {
-    public:
-      TONE(void);
-
-      void begin();
-      void end();
-      void mute();
-      void tone(uint16_t frequency);
-      void setVolume(uint8_t volume);
-
-    private:
-      uint8_t _volume;
-      bool _begun;
-      bool speaker_on;
-  };
-#endif

variants/m5stack_core/platformio.ini

@@ -6,7 +6,6 @@ monitor_port = COM8
 monitor_filters = esp32_exception_decoder
 build_src_filter = 
   ${esp32_base.build_src_filter}
-  +<../variants/m5stack_core>
 build_flags = 
   ${esp32_base.build_flags} -I variants/m5stack_core
   -DILI9341_DRIVER

variants/m5stack_core/variant.h

@@ -11,7 +11,6 @@
 #define BUTTON_PIN 38
 
 #define PIN_BUZZER 25
-#define TONE_PIN_CHANNEL 0
 
 #undef RF95_SCK
 #undef RF95_MISO