Merge pull request #3 from alfran/development

Development

Author: alfran

cores/arduino/HardwareSPI.h

@@ -128,6 +128,10 @@ void HardwareTimer::attachInterrupt(int channel, voidFuncPtr handler) {
     timer_attach_interrupt(this->dev, (uint8)channel, handler);
 }
 
+void HardwareTimer::toneAttachInterrupt(int channel, voidFuncPtr handler) {
+    tone_attach_interrupt(this->dev, (uint8)channel, handler);
+}
+
 void HardwareTimer::detachInterrupt(int channel) {
     timer_detach_interrupt(this->dev, (uint8)channel);
 }

cores/arduino/HardwareTimer.cpp

@@ -192,6 +192,7 @@ class HardwareTimer {
      * @see voidFuncPtr
      */
     void attachInterrupt(int channel, voidFuncPtr handler);
+    void toneAttachInterrupt(int channel, voidFuncPtr handler); // alfran : used for tone
 
     /**
      * @brief Remove the interrupt handler attached to the given

cores/arduino/HardwareTimer.h

@@ -24,7 +24,7 @@ extern "C" {
 
 }
 
-#include "HardwareSPI.h"
+#include "SPI.h"
 SPIClass SPI;
 
 SPI_HandleTypeDef hSPIx;

cores/arduino/HardwareSPI.cpp cores/arduino/SPI.cppcores/arduino/HardwareSPI.cpp renamed to cores/arduino/SPI.cpp

@@ -40,7 +40,7 @@ Version Modified By Date     Comments
 
 volatile static int toggle_count=0;
 static int tone_pin;
-int timer_CH = 2;
+int timer_CH = 5;
 
 HardwareTimer timer(timer_CH);
 
@@ -55,7 +55,7 @@ void tone(uint8_t pin, unsigned int frequency, unsigned long duration)
   timer.setOverflow(1000000/frequency/4);
 	timer.setMode(TIMER_CH1, TIMER_OUTPUT_COMPARE);
   timer.setCompare(TIMER_CH1, 1);  // Interrupt 1 count after each update
-	timer.attachInterrupt(TIMER_CH1, handler_tone);
+	timer.toneAttachInterrupt(TIMER_CH1, handler_tone);
   timer.refresh(); // start it up
   timer.resume();
 
@@ -66,17 +66,23 @@ void tone(uint8_t pin, unsigned int frequency, unsigned long duration)
 void noTone(uint8_t pin)
 {
     timer.pause();
-    gpio_write_bit(PIN_MAP[pin].gpio_device, PIN_MAP[pin].gpio_bit, 0);
-
-return;
+		timer.setPrescaleFactor(1);
+		timer.setOverflow(0xFFFF);
+		timer.setMode(TIMER_CH1, TIMER_PWM);
+		timer.refresh();
+	  timer.resume();
+		gpio_write_bit(PIN_MAP[pin].gpio_device, PIN_MAP[pin].gpio_bit, 0);
+		pinMode(pin,INPUT); //to fix dfu issue
+
+		return;
 }
-
+/*
 void set_timer(int ch)
 {
   HardwareTimer timer(ch);
   timer_CH = ch;
 }
-
+*/
 void handler_tone(void)
 {
   if (toggle_count != 0){

cores/arduino/Tone.cpp

@@ -67,7 +67,7 @@ void analogWrite(uint8 pin, uint16 passed_val)
         timer_dev *dev = PIN_MAP[pin].timer_device;
     	if (pin >= GPIO_PINS || dev == NULL || dev->type == TIMER_BASIC)
     	{
-        	return;
+					return;
     	}
 		  if (PIN_MAP[pin].alternate_function != AFx)
 			{
@@ -76,6 +76,7 @@ void analogWrite(uint8 pin, uint16 passed_val)
 		timer_set_compare(dev, PIN_MAP[pin].timer_channel, duty_cycle);
 		timer_cc_enable(dev, PIN_MAP[pin].timer_channel);
 		gpio_set_mode(PIN_MAP[pin].gpio_device, PIN_MAP[pin].gpio_bit, GPIO_AF_OUTPUT_PP);
+
 	}
 }