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

Revert "No extra switches on TX16S"

Browse Source 
This reverts commit 68584a7262.
This commit is contained in:
Kilrah
2020-04-20 14:35:13 +02:00
parent 68584a7262
commit c2ab1d96f3
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/targets/horus/hal.h
+2 -5
View File
@@ -131,10 +131,7 @@
#define SWITCHES_GPIO_REG_H GPIOG->IDR
#define SWITCHES_GPIO_PIN_H GPIO_Pin_7 // PG.07
#if defined(RADIO_TX16S)
#define STORAGE_SWITCH_I
#define STORAGE_SWITCH_J
#elif defined(PCBX10)
#if defined(PCBX10)
// Gimbal switch left
#define STORAGE_SWITCH_I
#define HARDWARE_SWITCH_I
@@ -247,7 +244,7 @@
#if defined(RADIO_TX16S)
#define KEYS_GPIOA_PINS (GPIO_Pin_6)
#define KEYS_GPIOC_PINS (GPIO_Pin_4 | GPIO_Pin_13)
#define KEYS_GPIOH_PINS (GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_9 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_12)
#define KEYS_GPIOH_PINS (GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_9 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_12 | GPIO_Pin_14 | GPIO_Pin_15)
#else
#define KEYS_GPIOH_PINS (GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_9 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_12 | GPIO_Pin_14 | GPIO_Pin_15)
#endif
radio/src/targets/horus/keys_driver.cpp
-2
View File
@@ -184,10 +184,8 @@ uint32_t switchState(uint8_t index)
ADD_2POS_CASE(F);
ADD_3POS_CASE(G, 6);
ADD_2POS_CASE(H);
#if !defined(RADIO_TX16S)
ADD_2POS_CASE(I);
ADD_2POS_CASE(J);
#endif
#endif
default:
break;