Subversion Repositories NaviCtrl

Compare Revisions

Ignore whitespace Rev 671 → Rev 672

/trunk/analog.c
68,6 → 68,7
if(ADC_GetFlagStatus(ADC_FLAG_ECV) == SET)
{
ADC_ClearFlag(ADC_FLAG_ECV);
AnalogData.Ch0 = ADC_GetConversionValue(ADC_Channel_0);
AnalogData.Ch1 = ADC_GetConversionValue(ADC_Channel_1);
AnalogData.Ch2 = ADC_GetConversionValue(ADC_Channel_2);
AnalogData.Ch3 = ADC_GetConversionValue(ADC_Channel_3);
75,6 → 76,7
AnalogData.Ch5 = ADC_GetConversionValue(ADC_Channel_5);
AnalogData.Ch6 = ADC_GetConversionValue(ADC_Channel_6);
AnalogData.Ch7 = ADC_GetConversionValue(ADC_Channel_7);
//FC_Temperatur = 250 + (s32)(((s32)AnalogData.Ch0 * 100 - 51200) / 18);
}
IDISABLE;
VIC0->VAR = 0xFF; // write any value to VIC0 Vector address register
91,6 → 93,7
ADC_DeInit(); // reset register to default values
 
// configure port 4 pins as analog inputs
GPIO_ANAPinConfig(GPIO_ANAChannel0, ENABLE);
GPIO_ANAPinConfig(GPIO_ANAChannel1, ENABLE);
GPIO_ANAPinConfig(GPIO_ANAChannel2, ENABLE);
GPIO_ANAPinConfig(GPIO_ANAChannel3, ENABLE);
102,6 → 105,7
ADC_Cmd(ENABLE); // power on the ADC
ADC_StandbyModeCmd(DISABLE); // disable Standby Mode
ADC_StructInit(&ADC_InitStructure);
ADC_InitStructure.ADC_Channel_0_Mode = ADC_NoThreshold_Conversion;
ADC_InitStructure.ADC_Channel_1_Mode = ADC_NoThreshold_Conversion;
ADC_InitStructure.ADC_Channel_2_Mode = ADC_NoThreshold_Conversion;
ADC_InitStructure.ADC_Channel_3_Mode = ADC_NoThreshold_Conversion;
/trunk/analog.h
3,6 → 3,7
 
typedef struct
{
u16 Ch0;
u16 Ch1;
u16 Ch2;
u16 Ch3;