Minor bug fixes now that I have a ZET6

While using a different board, I realized that I did not configure the
ADC on all variants and there is a minor bug on the irq_num for
advanced 103 devices.
This commit is contained in:
Bubulindo 2016-09-25 13:14:12 +01:00
parent 5c13d8b0d4
commit 0b34af3b6a
10 changed files with 10 additions and 10 deletions

View File

@ -61,7 +61,7 @@ adc_dev adc3 = {
.regs = ADC3_BASE,
.clk_id = RCC_ADC3,
.handlers = {[3]=0}, //added by bubulindo. EOC, JEOC, AWD
.irq_num = NVIC_ADC_3,//added by bubulindo.
.irq_num = NVIC_ADC3,//added by bubulindo.
};
/** ADC3 device. */
adc_dev *ADC3 = &adc3;

View File

@ -179,7 +179,7 @@ nvic_init((uint32)VECT_TAB_ADDR, 0);
*/
}
static void adc_default_config(const adc_dev *dev) {
static void adc_default_config( adc_dev *dev) {
adc_enable_single_swstart(dev);
adc_set_sample_rate(dev, wirish::priv::w_adc_smp);
}

View File

@ -179,7 +179,7 @@ nvic_init((uint32)VECT_TAB_ADDR, 0);
*/
}
static void adc_default_config(const adc_dev *dev) {
static void adc_default_config(adc_dev *dev) {
adc_enable_single_swstart(dev);
adc_set_sample_rate(dev, wirish::priv::w_adc_smp);
}

View File

@ -179,7 +179,7 @@ nvic_init((uint32)VECT_TAB_ADDR, 0);
*/
}
static void adc_default_config(const adc_dev *dev) {
static void adc_default_config(adc_dev *dev) {
adc_enable_single_swstart(dev);
adc_set_sample_rate(dev, wirish::priv::w_adc_smp);
}

View File

@ -173,7 +173,7 @@ static void setup_nvic(void) {
#endif
}
static void adc_default_config(const adc_dev *dev) {
static void adc_default_config(adc_dev *dev) {
adc_enable_single_swstart(dev);
adc_set_sample_rate(dev, wirish::priv::w_adc_smp);
}

View File

@ -179,7 +179,7 @@ nvic_init((uint32)VECT_TAB_ADDR, 0);
*/
}
static void adc_default_config(const adc_dev *dev) {
static void adc_default_config(adc_dev *dev) {
adc_enable_single_swstart(dev);
adc_set_sample_rate(dev, wirish::priv::w_adc_smp);
}

2
STM32F1/variants/maple/wirish/boards.cpp Normal file → Executable file
View File

@ -179,7 +179,7 @@ nvic_init((uint32)VECT_TAB_ADDR, 0);
*/
}
static void adc_default_config(const adc_dev *dev) {
static void adc_default_config(adc_dev *dev) {
adc_enable_single_swstart(dev);
adc_set_sample_rate(dev, wirish::priv::w_adc_smp);
}

View File

@ -179,7 +179,7 @@ nvic_init((uint32)VECT_TAB_ADDR, 0);
*/
}
static void adc_default_config(const adc_dev *dev) {
static void adc_default_config(adc_dev *dev) {
adc_enable_single_swstart(dev);
adc_set_sample_rate(dev, wirish::priv::w_adc_smp);
}

View File

@ -179,7 +179,7 @@ nvic_init((uint32)VECT_TAB_ADDR, 0);
*/
}
static void adc_default_config(const adc_dev *dev) {
static void adc_default_config(adc_dev *dev) {
adc_enable_single_swstart(dev);
adc_set_sample_rate(dev, wirish::priv::w_adc_smp);
}

View File

@ -179,7 +179,7 @@ nvic_init((uint32)VECT_TAB_ADDR, 0);
*/
}
static void adc_default_config(const adc_dev *dev) {
static void adc_default_config( adc_dev *dev) {
adc_enable_single_swstart(dev);
adc_set_sample_rate(dev, wirish::priv::w_adc_smp);
}