47 replies to this topic

[PT_Dreamer]

Ok, I can reproduce, let me try and figure this out.

[PT_Dreamer]

pushing fix

[Hayvosh]

PT_Dreamer, on 12 May 2012 - 11:54 AM, said:

pushing fix

Excellent, thanks!

[Hayvosh]

Got a new error this time:

12-May-2012 14:01:05 ../../PiOS/STM32F4xx/pios_adc.c:212:6: error: conflicting types for 'PIOS_ADC_Init'
12-May-2012 14:01:05 ../../PiOS/inc/pios_adc_priv.h:46:9: note: previous declaration of 'PIOS_ADC_Init' was here
12-May-2012 14:01:05 make[1]: *** [/usr/local/bamboo-home/xml-data/build-dir/OP-PIPXNXTBL-JOB1/build/bl_revolution/pios_adc.o] Error 1
12-May-2012 14:01:05 make: *** [bl_revolution_bin] Error 2

[PT_Dreamer]

Hayvosh, on 12 May 2012 - 12:10 PM, said:

Got a new error this time:

12-May-2012 14:01:05 ../../PiOS/STM32F4xx/pios_adc.c:212:6: error: conflicting types for 'PIOS_ADC_Init'
12-May-2012 14:01:05 ../../PiOS/inc/pios_adc_priv.h:46:9: note: previous declaration of 'PIOS_ADC_Init' was here
12-May-2012 14:01:05 make[1]: *** [/usr/local/bamboo-home/xml-data/build-dir/OP-PIPXNXTBL-JOB1/build/bl_revolution/pios_adc.o] Error 1
12-May-2012 14:01:05 make: *** [bl_revolution_bin] Error 2

pios_adc.c change:

void PIOS_ADC_Init()
{
#if defined(PIOS_INCLUDE_ADC)
init_pins();
init_dma();
init_timer();
init_adc();
#endif
}

to:

#if defined(PIOS_INCLUDE_ADC)
void PIOS_ADC_Init()
{
init_pins();
init_dma();
init_timer();
init_adc();
}
#endif

I won't push that change since it touches PIOS, also I find it strange that the makefile calls library.mk which in turn compiles all F4 hw files even if most of them aren't needed.

[Hayvosh]

-- edited and moved

[PT_Dreamer]

those are all flight related, we are in a Qt and GCS thread.

[Hayvosh]

Ah ok, I dont know much about coding but I'll move it.