Merge branch 'master' of https://github.com/stevstrong/Arduino_STM32 into stevstrong-master

Author: rogerclarkmelbourne

STM32F1/boards.txt

@@ -211,6 +211,12 @@ genericSTM32F103C.menu.upload_method.BMPMethod.upload.protocol=gdb_bmp
 genericSTM32F103C.menu.upload_method.BMPMethod.upload.tool=bmp_upload
 genericSTM32F103C.menu.upload_method.BMPMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG
 
+
+genericSTM32F103C.menu.upload_method.jlinkMethod=JLink
+genericSTM32F103C.menu.upload_method.jlinkMethod.upload.protocol=jlink
+genericSTM32F103C.menu.upload_method.jlinkMethod.upload.tool=jlink_upload
+genericSTM32F103C.menu.upload_method.jlinkMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DSERIAL_USB -DGENERIC_BOOTLOADER 
+
 ########################### Generic STM32F103R ###########################
 
 genericSTM32F103R.name=Generic STM32F103R series
@@ -519,4 +525,4 @@ genericGD32F103C.menu.cpu_speed.speed_96mhz=96Mhz (Stable)
 genericGD32F103C.menu.cpu_speed.speed_96mhz.build.f_cpu=96000000L
 
 genericGD32F103C.menu.cpu_speed.speed_72mhz=72Mhz (compatibility)
-genericGD32F103C.menu.cpu_speed.speed_72mhz.build.f_cpu=72000000L
+genericGD32F103C.menu.cpu_speed.speed_72mhz.build.f_cpu=72000000L

STM32F1/cores/maple/HardwareTimer.cpp

@@ -142,6 +142,28 @@ void HardwareTimer::refresh(void) {
     timer_generate_update(this->dev);
 }
 
+/*  CARLOS Changes to add encoder mode.*/
+
+//direction of movement. (to be better described). 
+    uint8 HardwareTimer::getDirection(){
+        return get_direction(this->dev);
+    }
+    
+//set if the encoder will count edges on one, which or both channels. 
+    void HardwareTimer::setEdgeCounting(uint32 counting) {
+        (dev->regs).gen->SMCR = counting;//TIMER_SMCR_SMS_ENCODER3; //choose encoder 3, counting on 
+    
+    }
+    
+    uint8 HardwareTimer::getEdgeCounting() {
+        return (dev->regs).gen->SMCR;
+    }
+    
+    
+
+//set the polarity of counting... not sure how interesting this is.. 
+    void HardwareTimer::setPolarity(){} 
+
 /* -- Deprecated predefined instances -------------------------------------- */
 
 HardwareTimer Timer1(1);

STM32F1/cores/maple/HardwareTimer.h

@@ -38,6 +38,10 @@
 /** Timer mode. */
 typedef timer_mode TimerMode;
 
+//CARLOS
+//defines for the ENCODER mode.
+
+
 /**
  * @brief Interface to one of the 16-bit timer peripherals.
  */
@@ -205,6 +209,23 @@ class HardwareTimer {
      */
     void refresh(void);
 
+//CARLOS.
+/*
+    added these functions to make sense for the encoder mode. 
+*/
+//direction of movement. (to be better described). 
+    uint8 getDirection();
+    
+//set if the encoder will count edges on one, which or both channels. 
+    void setEdgeCounting(uint32 counting);
+    uint8 getEdgeCounting(); //not sure if needed. 
+
+//set the polarity of counting... not sure how interesting this is.. 
+    void setPolarity();
+    
+//add the filtering definition for the input channel.
+    
+
     /* Escape hatch */
 
     /**

STM32F1/cores/maple/libmaple/adc.c

@@ -44,7 +44,7 @@
  *
  * @param dev ADC peripheral to initialize
  */
-void adc_init(const adc_dev *dev) {
+void adc_init(adc_dev *dev) {
     rcc_clk_enable(dev->clk_id);
     rcc_reset_dev(dev->clk_id);
 }
@@ -55,7 +55,7 @@ void adc_init(const adc_dev *dev) {
  * @param event Event used to trigger the start of conversion.
  * @see adc_extsel_event
  */
-void adc_set_extsel(const adc_dev *dev, adc_extsel_event event) {
+void adc_set_extsel(adc_dev *dev, adc_extsel_event event) {
     uint32 cr2 = dev->regs->CR2;
     cr2 &= ~ADC_CR2_EXTSEL;
     cr2 |= event;
@@ -71,7 +71,7 @@ void adc_set_extsel(const adc_dev *dev, adc_extsel_event event) {
  * @param smp_rate sample rate to set
  * @see adc_smp_rate
  */
-void adc_set_sample_rate(const adc_dev *dev, adc_smp_rate smp_rate) {
+void adc_set_sample_rate(adc_dev *dev, adc_smp_rate smp_rate) {
     uint32 adc_smpr1_val = 0, adc_smpr2_val = 0;
     int i;
 
@@ -95,7 +95,7 @@ void adc_set_sample_rate(const adc_dev *dev, adc_smp_rate smp_rate) {
  * @param channel channel to convert
  * @return conversion result
  */
-uint16 adc_read(const adc_dev *dev, uint8 channel) {
+uint16 adc_read(adc_dev *dev, uint8 channel) {
     adc_reg_map *regs = dev->regs;
 
     adc_set_reg_seqlen(dev, 1);

STM32F1/cores/maple/libmaple/adc_f1.c

@@ -34,6 +34,7 @@
 
 #include <libmaple/adc.h>
 #include <libmaple/gpio.h>
+#include <libmaple/nvic.h>//Added by bubulindo. 
 
 /*
  * Devices
@@ -42,26 +43,126 @@
 adc_dev adc1 = {
     .regs   = ADC1_BASE,
     .clk_id = RCC_ADC1,
+    .handlers = {[3]=0}, //added by bubulindo. EOC, JEOC, AWD
+    .irq_num = NVIC_ADC_1_2,
 };
 /** ADC1 device. */
-const adc_dev *ADC1 = &adc1;
+adc_dev *ADC1 = &adc1;
 
 adc_dev adc2 = {
     .regs   = ADC2_BASE,
     .clk_id = RCC_ADC2,
 };
 /** ADC2 device. */
-const adc_dev *ADC2 = &adc2;
+adc_dev *ADC2 = &adc2;
 
 #if defined(STM32_HIGH_DENSITY) || defined(STM32_XL_DENSITY)
 adc_dev adc3 = {
     .regs   = ADC3_BASE,
     .clk_id = RCC_ADC3,
+    .handlers = {[3]=0}, //added by bubulindo. EOC, JEOC, AWD
+    .irq_num = NVIC_ADC3,//added by bubulindo. 
 };
 /** ADC3 device. */
-const adc_dev *ADC3 = &adc3;
+adc_dev *ADC3 = &adc3;
 #endif
 
+
+/*
+    adc irq routine. 
+    Added by bubulindo. 
+*/
+void __irq_adc() {
+    //get status
+    uint32 adc_sr = ADC1->regs->SR;
+//End Of Conversion
+    if (adc_sr & (1U << ADC_SR_EOC_BIT)) {
+      ADC1->regs->SR &= ~(1<<ADC_SR_EOC_BIT);
+      void (*handler)(void) = ADC1->handlers[ADC_EOC];
+      if (handler) {
+        handler();
+      }
+    }
+//Injected End Of Conversion
+    if (adc_sr & (1U << ADC_SR_JEOC_BIT)) {
+      ADC1->regs->SR &= ~(1<<ADC_SR_JEOC_BIT);
+      void (*handler)(void) = ADC1->handlers[ADC_JEOC];
+      if (handler) {
+        handler();
+      }
+    }
+//Analog Watchdog
+    if (adc_sr & (1U << ADC_SR_AWD_BIT)) {
+      ADC1->regs->SR &= ~(1<<ADC_SR_AWD_BIT);
+      void (*handler)(void) = ADC1->handlers[ADC_AWD];
+      if (handler) {
+        handler();
+      }
+    }
+};//end of adc irq
+
+
+/*
+    ADC3 IRQ handler. 
+    added by bubulindo
+*/
+#if defined(STM32_HIGH_DENSITY) || defined(STM32_XL_DENSITY)
+void __irq_adc3() {
+    //get status
+    uint32 adc_sr = ADC3->regs->SR;
+//End Of Conversion
+    if (adc_sr & (1U << ADC_SR_EOC_BIT)) {
+      ADC3->regs->SR &= ~(1<<ADC_SR_EOC_BIT);
+      void (*handler)(void) = ADC3->handlers[ADC_EOC];
+      if (handler) {
+        handler();
+      }
+    }
+//Injected End Of Conversion
+    if (adc_sr & (1U << ADC_SR_JEOC_BIT)) {
+      ADC3->regs->SR &= ~(1<<ADC_SR_JEOC_BIT);
+      void (*handler)(void) = ADC3->handlers[ADC_JEOC];
+      if (handler) {
+        handler();
+      }
+    }
+//Analog Watchdog
+    if (adc_sr & (1U << ADC_SR_AWD_BIT)) {
+      ADC3->regs->SR &= ~(1<<ADC_SR_AWD_BIT);
+      void (*handler)(void) = ADC3->handlers[ADC_AWD];
+      if (handler) {
+        handler();
+      }
+    }
+};//end of ADC3 irq
+#endif
+
+/*
+    enable interrupts on the ADC: 
+    use ADC_EOC, ADC_JEOC, ADC_AWD
+    This will set up the interrupt bit in the ADC as well as in the NVIC.
+    added by bubulindo
+*/
+void adc_enable_irq(adc_dev* dev, uint8 interrupt) {//ADC1 for now.
+  dev->regs->CR1 |= (1U<<(interrupt +ADC_CR1_EOCIE_BIT));
+  nvic_irq_enable(dev->irq_num);
+  }
+
+/*
+    attach interrupt functionality for ADC
+    use ADC_EOC, ADC_JEOC, ADC_AWD
+    added by bubulindo
+*/
+
+void adc_attach_interrupt(adc_dev *dev,
+                            uint8 interrupt, 
+                            voidFuncPtr handler) {
+    dev->handlers[interrupt] = handler;
+    adc_enable_irq(dev, interrupt);
+    //enable_irq(dev, interrupt); //I need to create this function. to enable NVIC
+    //    nvic_irq_enable()
+    }
+
 /*
  * STM32F1 routines
  */
@@ -73,7 +174,7 @@ const adc_dev *ADC3 = &adc3;
  *
  * @param dev adc device
  */
-void adc_calibrate(const adc_dev *dev) {
+void adc_calibrate(adc_dev *dev) {
     __io uint32 *rstcal_bit = bb_perip(&(dev->regs->CR2), 3);
     __io uint32 *cal_bit = bb_perip(&(dev->regs->CR2), 2);
 
@@ -94,19 +195,19 @@ void adc_set_prescaler(adc_prescaler pre) {
     rcc_set_prescaler(RCC_PRESCALER_ADC, (uint32)pre);
 }
 
-void adc_foreach(void (*fn)(const adc_dev*)) {
+void adc_foreach(void (*fn)(adc_dev*)) {
     fn(ADC1);
     fn(ADC2);
 #if defined(STM32_HIGH_DENSITY) || defined(STM32_XL_DENSITY)
     fn(ADC3);
 #endif
 }
 
-void adc_config_gpio(const adc_dev *ignored, gpio_dev *gdev, uint8 bit) {
+void adc_config_gpio(adc_dev *ignored, gpio_dev *gdev, uint8 bit) {
     gpio_set_mode(gdev, bit, GPIO_INPUT_ANALOG);
 }
 
-void adc_enable_single_swstart(const adc_dev *dev) {
+void adc_enable_single_swstart(adc_dev *dev) {
     adc_init(dev);
     adc_set_extsel(dev, ADC_SWSTART);
     adc_set_exttrig(dev, 1);

STM32F1/cores/maple/libmaple/timer.c

@@ -38,6 +38,8 @@
 static void disable_channel(timer_dev *dev, uint8 channel);
 static void pwm_mode(timer_dev *dev, uint8 channel);
 static void output_compare_mode(timer_dev *dev, uint8 channel);
+static void encoder_mode(timer_dev *dev, uint8 channel) ;//CARLOS
+
 
 static inline void enable_irq(timer_dev *dev, timer_interrupt_id iid);
 
@@ -230,6 +232,10 @@ void timer_set_mode(timer_dev *dev, uint8 channel, timer_mode mode) {
     case TIMER_OUTPUT_COMPARE:
         output_compare_mode(dev, channel);
         break;
+    //added by CARLOS. 
+    case TIMER_ENCODER: 
+        encoder_mode(dev, channel); //find a way to pass all the needed stuff on the 8bit var
+        break;
     }
 }
 
@@ -293,6 +299,13 @@ void timer_detach_interrupt(timer_dev *dev, uint8 interrupt) {
     dev->handlers[interrupt] = NULL;
 }
 
+//CARLOS 
+uint8 get_direction(timer_dev *dev){
+    return *bb_perip(&(dev->regs).gen->CR1, TIMER_CR1_DIR_BIT);
+}
+
+
+
 /*
  * Utilities
  */
@@ -313,6 +326,31 @@ static void output_compare_mode(timer_dev *dev, uint8 channel) {
     timer_cc_enable(dev, channel);
 }
 
+//added by CARLOS.
+static void encoder_mode(timer_dev *dev, uint8 channel) {
+    
+    //prescaler. 
+    //(dev->regs).gen->PSC = 1;
+
+    //map inputs. 
+    (dev->regs).gen->CCMR1 = TIMER_CCMR1_CC1S_INPUT_TI1 | TIMER_CCMR1_CC2S_INPUT_TI2 | TIMER_CCMR1_IC2F | TIMER_CCMR1_IC1F ;
+
+    (dev->regs).gen->SMCR = TIMER_SMCR_SMS_ENCODER3; //choose encoder 3, counting on both edges. 
+
+    //polarity
+    //(dev->regs).gen->CCER = TIMER_CCER_CC1P; //to invert the counting, only one of the inputs should be inverted.  
+
+    //set the interval used by the encoder.
+    //timer_set_reload(dev, 1000);
+
+//    (dev->regs).gen->CR1  |=TIMER_CR1_UDIS_BIT;
+
+    //run timer
+    timer_resume(dev);
+}
+
+
+
 static void enable_adv_irq(timer_dev *dev, timer_interrupt_id id);
 static void enable_bas_gen_irq(timer_dev *dev);
 

STM32F1/cores/maple/libmaple/usb/stm32f1/usb_cdcacm.c

@@ -449,7 +449,7 @@ uint32 usb_cdcacm_rx(uint8* buf, uint32 len) {
 
     /* If all bytes have been read, re-enable the RX endpoint, which
      * was set to NAK when the current batch of bytes was received. */
-    if (n_unread_bytes <=0) {
+    if (n_unread_bytes == 0) {
         usb_set_ep_rx_count(USB_CDCACM_RX_ENDP, USB_CDCACM_RX_EPSIZE);
         usb_set_ep_rx_stat(USB_CDCACM_RX_ENDP, USB_EP_STAT_RX_VALID);
     }
@@ -565,7 +565,7 @@ static void vcomDataRxCb(void) {
 
 	n_unread_bytes += ep_rx_size;
 
-    if ( n_unread_bytes<=0 ) {
+    if ( n_unread_bytes == 0 ) {
         usb_set_ep_rx_count(USB_CDCACM_RX_ENDP, USB_CDCACM_RX_EPSIZE);
         usb_set_ep_rx_stat(USB_CDCACM_RX_ENDP, USB_EP_STAT_RX_VALID);
     }

STM32F1/cores/maple/libmaple/usb/usb_lib/usb_core.c

@@ -31,9 +31,6 @@
 #define USB_StatusIn() Send0LengthData()
 #define USB_StatusOut() vSetEPRxStatus(EP_RX_VALID)
 
-#define StatusInfo0 StatusInfo.bw.bb1 /* Reverse bb0 & bb1 */
-#define StatusInfo1 StatusInfo.bw.bb0
-
 /* Private macro -------------------------------------------------------------*/
 /* Private variables ---------------------------------------------------------*/
 u16_u8 StatusInfo;
@@ -857,11 +854,11 @@ u8 Setup0_Process(void)
     pInformation->USBbmRequestType = *pBuf.b++; /* bmRequestType */
     pInformation->USBbRequest = *pBuf.b++; /* bRequest */
     pBuf.w++;  /* word not accessed because of 32 bits addressing */
-    pInformation->USBwValue = ByteSwap(*pBuf.w++); /* wValue */
+    pInformation->USBwValue = *pBuf.w++; /* wValue in Little Endian */
     pBuf.w++;  /* word not accessed because of 32 bits addressing */
-    pInformation->USBwIndex  = ByteSwap(*pBuf.w++); /* wIndex */
+    pInformation->USBwIndex  = *pBuf.w++; /* wIndex in Little Endian */
     pBuf.w++;  /* word not accessed because of 32 bits addressing */
-    pInformation->USBwLength = *pBuf.w; /* wLength */
+    pInformation->USBwLength = *pBuf.w; /* wLength in Little Endian */
   }
 
   pInformation->ControlState = SETTING_UP;