ADC Voltage displayed in HARDWARE page

This commit is contained in:
Bertrand Songis
2019-03-22 16:45:42 +01:00
parent 92e3b75e2c
commit 617a892c06
9 changed files with 50 additions and 19 deletions
+5 -3
View File
@@ -394,9 +394,10 @@ enum Analogs {
#endif
SLIDER_LAST = SLIDER_FIRST + NUM_SLIDERS - 1,
TX_VOLTAGE,
MOUSE1,
MOUSE1, // TODO why after voltage?
MOUSE2,
NUM_ANALOGS
NUM_ANALOGS,
TX_RTC = NUM_ANALOGS
};
enum CalibratedAnalogs {
@@ -423,9 +424,10 @@ enum CalibratedAnalogs {
#define IS_POT(x) ((x)>=POT_FIRST && (x)<=POT_LAST)
#define IS_SLIDER(x) ((x)>=SLIDER_FIRST && (x)<=SLIDER_LAST)
extern uint16_t adcValues[NUM_ANALOGS];
extern uint16_t adcValues[NUM_ANALOGS + 1/*RTC*/];
void adcInit(void);
void adcRead(void);
uint16_t getRTCBattVoltage();
uint16_t getAnalogValue(uint8_t index);
#define NUM_MOUSE_ANALOGS 2
#if defined(PCBX10)
+1
View File
@@ -234,6 +234,7 @@
#define ADC_CHANNEL_BATT ADC_Channel_5 // ADC3_IN5
#define ADC_CHANNEL_EXT1 ADC_Channel_6 // ADC3_IN6
#define ADC_CHANNEL_EXT2 ADC_Channel_7 // ADC3_IN7
#define ADC_CHANNEL_RTC 0 // TODO later ... ADC1_IN18
#define ADC_MAIN ADC3
#define ADC_SAMPTIME 3
#define ADC_DMA DMA2