Integrate latest libopencm3

1. use adc_calibrate
2. Change timer_reset to rcc_periph_reset_pulse

Author: howard0su

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "libopencm3"]
+	path = src/libopencm3
+	url = https://github.com/DeviationTx/libopencm3.git

src/libopencm3

@@ -43,7 +43,7 @@ void PWR_Shutdown()
     printf("Shutdown\n");
     BACKLIGHT_Brightness(0);
     rcc_set_sysclk_source(RCC_CFGR_SW_SYSCLKSEL_HSICLK);
-    rcc_wait_for_osc_ready(HSI);
+    rcc_wait_for_osc_ready(RCC_HSI);
     while(1) ;
 }
 

src/target/at9/power.c

@@ -56,7 +56,7 @@ void PWR_Shutdown()
     printf("Shutdown\n");
     BACKLIGHT_Brightness(0);
     rcc_set_sysclk_source(RCC_CFGR_SW_SYSCLKSEL_HSICLK);
-    rcc_wait_for_osc_ready(HSI);
+    rcc_wait_for_osc_ready(RCC_HSI);
     gpio_clear(_PWREN_PORT, _PWREN_PIN);
     while(1) ;
 }

src/target/common/devo/power.c

@@ -57,7 +57,7 @@ void PPMin_TIM_Init()
 
     /* Reset TIM1 peripheral. */
     timer_disable_counter(TIM1);
-    timer_reset(TIM1);
+    rcc_periph_reset_pulse(RST_TIM1);
 
     /* Timer global mode:
      * - No divider

src/target/common/devo/ppmin.c

@@ -48,7 +48,8 @@ void PWM_Initialize()
     // connect timer compare output to pin
     gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_50_MHZ, GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, _PWM_PIN);
 
-    timer_reset(TIM1);
+    rcc_periph_reset_pulse(RST_TIM1);
+
     // Timer global mode: No divider, Alignment edge, Direction up, auto-preload buffered
     timer_set_mode(TIM1, TIM_CR1_CKD_CK_INT, TIM_CR1_CMS_EDGE, TIM_CR1_DIR_UP);
 

src/target/common/devo/protocol/pwm.c

@@ -63,7 +63,7 @@ void SSER_Initialize()
 
     // Configure bit timer
     rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_TIM6EN);
-    timer_reset(TIM6);
+    rcc_periph_reset_pulse(RST_TIM6);
     nvic_set_priority(NVIC_TIM6_IRQ, 8);
     timer_set_prescaler(TIM6, 0);
     timer_enable_irq(TIM6, TIM_DIER_UIE);

src/target/common/devo/soft_serial.c

@@ -29,7 +29,7 @@ void ADC_Init(void)
 {
     rcc_peripheral_enable_clock(&RCC_APB2ENR, _RCC_APB2ENR_ADCEN);
     /* Make sure the ADC doesn't run during config. */
-    adc_off(_ADC);
+    adc_power_off(_ADC);
     rcc_peripheral_reset(&RCC_APB2RSTR, _RCC_APB2RSTR_ADCRST);
     rcc_peripheral_clear_reset(&RCC_APB2RSTR, _RCC_APB2RSTR_ADCRST);
     rcc_set_adcpre(RCC_CFGR_ADCPRE_PCLK2_DIV6);
@@ -41,12 +41,12 @@ void ADC_Init(void)
     adc_set_right_aligned(_ADC);
 
     /* We want to read the temperature sensor, so we have to enable it. */
-    adc_enable_temperature_sensor(_ADC); 
+    adc_enable_temperature_sensor();
     adc_set_sample_time_on_all_channels(_ADC, _ADC_SMPR_SMP_XXDOT5CYC);
 
     adc_power_on(_ADC);
     adc_reset_calibration(_ADC);
-    adc_calibration(_ADC);
+    adc_calibrate(_ADC);
 
     //Build a RNG seed using ADC 14, 16, 17
     for(int i = 0; i < 8; i++) {
@@ -58,7 +58,7 @@ void ADC_Init(void)
     //This is important.  We're using the temp value as a buffer because otherwise the channel data
     //Can bleed into the voltage-sense data.
     //By disabling the temperature, we always read a consistent value
-    adc_disable_temperature_sensor(_ADC);
+    adc_disable_temperature_sensor();
     printf("RNG Seed: %08x\n", (int)rand32());
 
     /* The following is based on code from here: http://code.google.com/p/rayaairbot */

src/target/common/stm32/adc.c

@@ -31,18 +31,10 @@
 #define TIM_CONCAT(x, y, z)  _TIM_CONCAT(x, y, z)
 
 #define TIMx               TIM_CONCAT(TIM,             SYSCLK_TIM,)
+#define RST_TIMx           TIM_CONCAT(RST_TIM,         SYSCLK_TIM,)
 #define NVIC_TIMx_IRQ      TIM_CONCAT(NVIC_TIM,        SYSCLK_TIM, _IRQ)
 #define RCC_APB1ENR_TIMxEN TIM_CONCAT(RCC_APB1ENR_TIM, SYSCLK_TIM, EN)
 #define TIMx_ISR           TIM_CONCAT(tim,             SYSCLK_TIM, _isr)
-//The following is from an unreleased libopencm3
-//We should remove it eventually
-#if 1
-void iwdg_start(void);
-void iwdg_set_period_ms(u32 period);
-bool iwdg_reload_busy(void);
-bool iwdg_prescaler_busy(void);
-void iwdg_reset(void);
-#endif
 
 volatile u32 msecs;
 volatile u32 wdg_time;
@@ -98,7 +90,7 @@ void CLOCK_Init()
 
     timer_disable_counter(TIMx);
     /* Reset TIMx peripheral. */
-    timer_reset(TIMx);
+    rcc_periph_reset_pulse(RST_TIMx);
 
     /* Timer global mode:
      * - No divider
@@ -281,7 +273,7 @@ void sys_tick_handler(void)
 // initialize RTC
 void RTC_Init()
 {
-    rtc_auto_awake(LSE, 32767); // LowSpeed External source, divided by (clock-1)=32767
+    rtc_auto_awake(RCC_LSE, 32767); // LowSpeed External source, divided by (clock-1)=32767
 }
 
 // set date value (deviation epoch = seconds since 1.1.2012, 00:00:00)

src/target/common/stm32/clock.c

@@ -30,7 +30,7 @@ void ADC_Init(void)
 {
     rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_ADC1EN);
     /* Make sure the ADC doesn't run during config. */
-    adc_off(ADC1);
+    adc_power_off(ADC1);
     adc_set_clk_prescale(ADC_CCR_ADCPRE_BY2);
     /* We configure to scan the entire group each time conversion is requested. */
     adc_enable_scan_mode(ADC1);