add function of tone (#111)

add function of tone 
for this issue #24

cores/arduino/Arduino.h

@@ -49,13 +49,14 @@ void yield(void);
 } // extern "C"
 #endif // __cplusplus
 
-#ifdef __cplusplus
+// Move the following content to the file wiring.h  //by TempersLee
-#  include "WCharacter.h"
+// #ifdef __cplusplus
-#  include "WString.h"
+// #include "WCharacter.h"
-#  include "WMath.h"
+// #include "WString.h"
-//#  include <Tone.h>
+// #include "WMath.h"
-#  include <HardwareSerial.h>
+// #  include <Tone.h>
-#endif
+// #  include <HardwareSerial.h>
+// #endif
 
 // Include pins variant
 #include "pins_arduino.h"

cores/arduino/HardwareTimer.cpp

@@ -73,7 +73,7 @@ HardwareTimer::HardwareTimer(TIM_TypeDef *instance)
   NVIC_EnableIRQ(TIM2_IRQn);
 #endif
 
-#if defined(TIM3_BASE) && defined(TIM3_IRQn)  //v006 has no interruption
+#if defined(TIM3_BASE) && !defined(CH32VM00X)  //v006 has no interruption
   NVIC_EnableIRQ(TIM3_IRQn);  
 #endif
 

cores/arduino/Tone.cpp

@@ -0,0 +1,149 @@
+/* Tone.cpp
+
+  A Tone Generator Library
+
+  Written by Brett Hagman
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+//Modified 3 june 2024 by TempersLee for CH32duino
+
+#include "Arduino.h"
+#include "HardwareTimer.h"
+
+#if defined(TIM_MODULE_ENABLED) && defined(TIMER_TONE) && !defined(TIM_MODULE_ONLY)
+
+#define MAX_FREQ  65535
+
+typedef struct {
+  PinName pin;
+  int32_t count;
+} timerPinInfo_t;
+
+static void timerTonePinInit(PinName p, uint32_t frequency, uint32_t duration);
+static void tonePeriodElapsedCallback();
+static timerPinInfo_t TimerTone_pinInfo = {NC, 0};
+static HardwareTimer *TimerTone = NULL;
+
+/**
+  * @brief  Tone Period elapsed callback in non-blocking mode
+  * @param  htim : timer handle
+  * @retval None
+  */
+static void tonePeriodElapsedCallback()
+{
+  GPIO_TypeDef *port = get_GPIO_Port(CH_PORT(TimerTone_pinInfo.pin));
+
+  if (port != NULL) {
+    if (TimerTone_pinInfo.count != 0) {
+      if (TimerTone_pinInfo.count > 0) {
+        TimerTone_pinInfo.count--;
+      }
+      digital_io_toggle(port, CH_MAP_GPIO_PIN(TimerTone_pinInfo.pin));
+    } else {
+      digital_io_write(port, CH_MAP_GPIO_PIN(TimerTone_pinInfo.pin), 0);
+    }
+  }
+}
+
+/**
+  * @brief  This function will reset the tone timer
+  * @param  port : pointer to port
+  * @param  pin : pin number to toggle
+  * @retval None
+  */
+static void timerTonePinDeinit()
+{
+  if (TimerTone != NULL) {
+    TimerTone->timerHandleDeinit();
+  }
+  if (TimerTone_pinInfo.pin != NC) {
+    pin_function(TimerTone_pinInfo.pin, CH_PIN_DATA(CH_MODE_INPUT, CH_CNF_INPUT_FLOAT, NOPULL, AFIO_NONE));
+    TimerTone_pinInfo.pin = NC;
+  }
+}
+
+static void timerTonePinInit(PinName p, uint32_t frequency, uint32_t duration)
+{
+  uint32_t timFreq = 2 * frequency;
+
+  if (frequency <= MAX_FREQ) {
+    if (frequency == 0) {
+      if (TimerTone != NULL) {
+        TimerTone->pause();
+      }
+    } else {
+      TimerTone_pinInfo.pin = p;
+
+      //Calculate the toggle count
+      if (duration > 0) {
+        TimerTone_pinInfo.count = ((timFreq * duration) / 1000);
+      } else {
+        TimerTone_pinInfo.count = -1;
+      }
+
+      pin_function(TimerTone_pinInfo.pin, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_PP, NOPULL, AFIO_NONE));
+
+      TimerTone->setOverflow(timFreq, HERTZ_FORMAT);
+      TimerTone->attachInterrupt(tonePeriodElapsedCallback);
+      TimerTone->resume();
+    }
+  }
+}
+
+// frequency (in hertz) and duration (in milliseconds).
+void tone(uint8_t _pin, unsigned int frequency, unsigned long duration)
+{
+  PinName p = digitalPinToPinName(_pin);
+
+  if (TimerTone == NULL) {
+    TimerTone = new HardwareTimer(TIMER_TONE);
+  }
+
+  if (p != NC) {
+    if ((TimerTone_pinInfo.pin == NC) || (TimerTone_pinInfo.pin == p)) {
+      timerTonePinInit(p, frequency, duration);
+    }
+  }
+}
+
+void noTone(uint8_t _pin, bool destruct)
+{
+  PinName p = digitalPinToPinName(_pin);
+  if ((p != NC) && (TimerTone_pinInfo.pin == p) && (TimerTone != NULL)) {
+    if (destruct) {
+      timerTonePinDeinit();
+      delete (TimerTone);
+      TimerTone = NULL;
+    } else {
+      TimerTone->pause();
+    }
+  }
+}
+#else
+#warning "TIMER_TONE or TIM_MODULE_ENABLED not defined"
+void tone(uint8_t _pin, unsigned int frequency, unsigned long duration)
+{
+  (void)(_pin);
+  (void)(frequency);
+  (void)(duration);
+}
+
+void noTone(uint8_t _pin, bool destruct)
+{
+  (void)(_pin);
+  (void)(destruct);
+}
+#endif /* TIM_MODULE_ENABLED && TIMER_TONE && !TIM_MODULE_ONLY*/

cores/arduino/Tone.h

@@ -0,0 +1,41 @@
+/*
+  Copyright (c) 2011 Arduino.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef _WIRING_TONE_
+#define _WIRING_TONE_
+
+#ifdef __cplusplus
+  /*
+  * \brief Generate a tone to a pin.
+  *
+  * \param _pin
+  * \param frequency Tone frequency (in hertz)
+  * \param duration  Tone duration (in milliseconds)
+  */
+  extern void tone(uint8_t _pin, unsigned int frequency, unsigned long duration = 0);
+
+  /*
+  * \brief Stop tone generation on pin.
+  *
+  * \param _pin
+  */
+  extern void noTone(uint8_t _pin, bool destruct = false);
+
+#endif
+
+#endif /* _WIRING_TONE_ */

cores/arduino/wiring.h

@@ -40,9 +40,9 @@
 #include <board.h>
 
 #ifdef __cplusplus
-  // #include "HardwareTimer.h"
+  #include "HardwareTimer.h"
-  // #include "Tone.h"
+  #include "Tone.h"
-  // #include "WCharacter.h"
+  #include "WCharacter.h"
   #include "WInterrupts.h"
   #include "WMath.h"
   #include "WSerial.h"

variants/CH32V00x/CH32V003F4/variant_CH32V003F4.h

@@ -103,6 +103,15 @@
   #define PIN_WIRE_SCL          PC2
 #endif
 
+// Timer Definitions
+#ifndef TIMER_TONE
+  #define TIMER_TONE            TIM2
+#endif
+#ifndef TIMER_SERVO
+  #define TIMER_SERVO           TIM1
+#endif
+
+
 /*----------------------------------------------------------------------------
  *        Arduino objects - C++ only
  *----------------------------------------------------------------------------*/

variants/CH32VM00X/CH32V006K8/variant_CH32V006K8.h

@@ -116,6 +116,13 @@
   #define PIN_WIRE_SCL          PC2
 #endif
 
+#ifndef TIMER_TONE
+  #define TIMER_TONE            TIM2
+#endif
+#ifndef TIMER_SERVO
+  #define TIMER_SERVO           TIM1
+#endif
+
 /*----------------------------------------------------------------------------
  *        Arduino objects - C++ only
  *----------------------------------------------------------------------------*/