Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 16:25:16 +03:00
Code Issues Wiki Activity

Horus drivers fixes

Browse source
This commit is contained in:
Bertrand Songis 2015-10-04 18:48:46 +02:00
parent 78bcc4d582
commit 3d74f2b437
3 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
radio/src/targets/Horus/board_horus.h
View file

@ -203,10 +203,10 @@ uint32_t readKeys(void);
uint32_t readTrims(void); uint32_t readTrims(void);
#define TRIMS_PRESSED() (readTrims()) #define TRIMS_PRESSED() (readTrims())
#define KEYS_PRESSED() (readKeys()) #define KEYS_PRESSED() (readKeys())
#define DBLKEYS_PRESSED_RGT_LFT(i) ((in & ((2<<KEY_PLUS) + (2<<KEY_MINUS))) == ((2<<KEY_PLUS) + (2<<KEY_MINUS))) #define DBLKEYS_PRESSED_RGT_LFT(in) ((in & (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_LEFT)) == (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_LEFT))
#define DBLKEYS_PRESSED_UP_DWN(i) ((in & ((2<<KEY_MENU) + (2<<KEY_PAGE))) == ((2<<KEY_MENU) + (2<<KEY_PAGE))) #define DBLKEYS_PRESSED_UP_DWN(in) ((in & (KEYS_GPIO_PIN_UP + KEYS_GPIO_PIN_DOWN)) == (KEYS_GPIO_PIN_UP + KEYS_GPIO_PIN_DOWN))
#define DBLKEYS_PRESSED_RGT_UP(i) ((in & ((2<<KEY_ENTER) + (2<<KEY_MINUS))) == ((2<<KEY_ENTER) + (2<<KEY_MINUS))) #define DBLKEYS_PRESSED_RGT_UP(in) ((in & (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_UP)) == (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_UP))
#define DBLKEYS_PRESSED_LFT_DWN(i) ((in & ((2<<KEY_PAGE) + (2<<KEY_EXIT))) == ((2<<KEY_PAGE) + (2<<KEY_EXIT))) #define DBLKEYS_PRESSED_LFT_DWN(in) ((in & (KEYS_GPIO_PIN_LEFT + KEYS_GPIO_PIN_DOWN)) == (KEYS_GPIO_PIN_LEFT + KEYS_GPIO_PIN_DOWN))
void checkRotaryEncoder(void); void checkRotaryEncoder(void);
// WDT driver // WDT driver

5
radio/src/targets/Horus/keys_driver.cpp
View file

@ -143,16 +143,15 @@ void readKeysAndTrims()
if (scrollRE) { if (scrollRE) {
rePreviousValue = reNewValue; rePreviousValue = reNewValue;
if (scrollRE < 0) { if (scrollRE < 0) {
putEvent(EVT_KEY_FIRST(KEY_MINUS)); putEvent(EVT_ROTARY_LEFT);
} }
else { else {
putEvent(EVT_KEY_FIRST(KEY_PLUS)); putEvent(EVT_ROTARY_RIGHT);
} }
} }
in = readTrims(); in = readTrims();
for (i = 1; i < 4096; i <<= 1) { for (i = 1; i < 4096; i <<= 1) {
if (in & i) TRACE("trim %d", enuk);
keys[enuk++].input(in & i); keys[enuk++].input(in & i);
} }
} }

4
radio/src/targets/Horus/stm32f4_flash.ld
View file

@ -33,8 +33,8 @@ _main_stack_start = _estack - _Main_Stack_Size;
/* Specify the memory areas */ /* Specify the memory areas */
MEMORY MEMORY
{ {
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 512K FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 2048K
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 128K RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 256K
CCM (xrw) : ORIGIN = 0x10000000, LENGTH = 64K CCM (xrw) : ORIGIN = 0x10000000, LENGTH = 64K
MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K
SDRAM(xrw) : ORIGIN = 0xD0000000, LENGTH = 8192K SDRAM(xrw) : ORIGIN = 0xD0000000, LENGTH = 8192K