From b262808aa16612869a6703c7d12be7f91b2e2dc7 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 20 Jun 2019 09:27:06 +0200 Subject: [PATCH] Black screen on simu --- radio/src/simu.cpp | 8 ++++---- radio/src/targets/simu/simulcd.h | 2 ++ radio/src/targets/taranis/hal.h | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/radio/src/simu.cpp b/radio/src/simu.cpp index 3583a54a8..df566bbea 100644 --- a/radio/src/simu.cpp +++ b/radio/src/simu.cpp @@ -331,14 +331,14 @@ void OpenTxSim::updateKeysAndSwitches(bool start) SWITCH_KEY(C, 2, 3); SWITCH_KEY(D, 3, 3); - #if defined(PCBX7) || defined(PCBXLITE) - SWITCH_KEY(F, 4, 2); - SWITCH_KEY(H, 5, 2); - #else + #if defined(HARDWARE_SWITCH_G) SWITCH_KEY(E, 4, 3); SWITCH_KEY(F, 5, 2); SWITCH_KEY(G, 6, 3); SWITCH_KEY(H, 7, 2); + #elif defined(HARDWARE_SWITCH_F) && defined(HARDWARE_SWITCH_H) + SWITCH_KEY(F, 4, 2); + SWITCH_KEY(H, 5, 2); #endif #if defined(PCBX9E) diff --git a/radio/src/targets/simu/simulcd.h b/radio/src/targets/simu/simulcd.h index ecfc473fb..c968efc26 100644 --- a/radio/src/targets/simu/simulcd.h +++ b/radio/src/targets/simu/simulcd.h @@ -21,6 +21,8 @@ #ifndef _SIMULCD_H_ #define _SIMULCD_H_ +#include "lcd.h" + extern int g_snapshot_idx; extern bool simuLcdRefresh; extern display_t simuLcdBuf[DISPLAY_BUFFER_SIZE]; diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h index e90a70866..1a7b10bd5 100644 --- a/radio/src/targets/taranis/hal.h +++ b/radio/src/targets/taranis/hal.h @@ -236,7 +236,7 @@ #elif defined(PCBXLITE) || defined(PCBX9LITE) #define STORAGE_SWITCH_A #define HARDWARE_SWITCH_A - #define SWITCHES_GPIO_REG_A_H GPIOE->IDR + #define SWITCHES_GPIO_REG_A_H GPIOE->IDR #define SWITCHES_GPIO_PIN_A_H GPIO_Pin_1 // PE.01 #define SWITCHES_GPIO_REG_A_L GPIOE->IDR #define SWITCHES_GPIO_PIN_A_L GPIO_Pin_0 // PE.00 @@ -245,12 +245,12 @@ #define HARDWARE_SWITCH_A #define SWITCHES_GPIO_REG_A_L GPIOE->IDR #define SWITCHES_GPIO_PIN_A_L GPIO_Pin_7 // PE.07 - #define SWITCHES_GPIO_REG_A_H GPIOE->IDR + #define SWITCHES_GPIO_REG_A_H GPIOE->IDR #define SWITCHES_GPIO_PIN_A_H GPIO_Pin_13 // PE.13 #else #define STORAGE_SWITCH_A #define HARDWARE_SWITCH_A - #define SWITCHES_GPIO_REG_A_H GPIOB->IDR + #define SWITCHES_GPIO_REG_A_H GPIOB->IDR #define SWITCHES_GPIO_PIN_A_H GPIO_Pin_5 // PB.05 #define SWITCHES_GPIO_REG_A_L GPIOE->IDR #define SWITCHES_GPIO_PIN_A_L GPIO_Pin_0 // PE.00