piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Streamlines and cleaned up code. Simple compile option TARANIS_STICKS=YES

Browse Source
This commit is contained in:
rob@marotori.com
2013-09-20 15:25:20 +00:00
parent 95a1fd273b
commit 121dad121c
2 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Makefile
+2 -13
View File
@@ -746,21 +746,10 @@ ifeq ($(AUTOSOURCE), YES)
CPPDEFS += -DAUTOSOURCE
endif
ifeq ($(STICK_AIL_REV), YES)
CPPDEFS += -DSTICK_AIL_REV
ifeq ($(TARANIS_STICKS), YES)
CPPDEFS += -DTARANIS_STICKS
endif
ifeq ($(STICK_ELE_REV), YES)
CPPDEFS += -DSTICK_ELE_REV
endif
ifeq ($(STICK_RUD_REV), YES)
CPPDEFS += -DSTICK_RUD_REV
endif
ifeq ($(STICK_THR_REV), YES)
CPPDEFS += -DSTICK_THR_REV
endif
ifeq ($(DBLKEYS), YES)
ifeq ($(PCB), $(filter $(PCB), 9XR 9XR128 9XR2561))
src/targets/sky9x/adc_driver.cpp
+4 -5
View File
@@ -38,10 +38,8 @@
volatile uint16_t Analog_values[NUMBER_ANALOG];
#if defined(STICK_RUD_REV) || defined(STICK_AIL_REV) || defined(STICK_ELE_REV) || defined(STICK_THR_REV)
const char ana_direction[NUMBER_ANALOG] = {STICK_AIL_REV, STICK_RUD_REV, 0, STICK_ELE_REV ,0 , STICK_THR_REV,0, 0, 0};
#else
const char ana_direction[NUMBER_ANALOG] = {0, 0, 0, 0 ,0 ,0 ,0 , 0, 0};
#if defined(TARANIS_STICKS)
const char ana_direction[NUMBER_ANALOG] = {1, 1, 0, 1 ,0 ,1 ,0, 0, 0};
#endif
@@ -120,11 +118,12 @@ void adcRead()
}
// adc direction correct
#if defined(TARANIS_STICKS)
uint32_t i ;
for (i=0; i<NUMBER_ANALOG; i++) {
if (ana_direction[i]) {
Analog_values[i] = 4096-Analog_values[i];
}
}
#endif
}