From c966f82352064aaaacca92e22324d200faf3df2d Mon Sep 17 00:00:00 2001 From: Silvano Seva Date: Thu, 9 Jun 2022 23:02:00 +0200 Subject: [PATCH] Fixed setting of battery voltage and transmission of PTT press signal from linux emulator shell --- openrtx/src/main.c | 2 -- platform/targets/linux/emulator/sdl_engine.c | 4 +++- platform/targets/linux/platform.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openrtx/src/main.c b/openrtx/src/main.c index 2505a242..4715a2c1 100644 --- a/openrtx/src/main.c +++ b/openrtx/src/main.c @@ -24,8 +24,6 @@ #include #endif -extern void *ui_task(void *arg); - int main(void) { // MD-9600 does not have a proper power on/off mechanism and the MCU is diff --git a/platform/targets/linux/emulator/sdl_engine.c b/platform/targets/linux/emulator/sdl_engine.c index e6bbe6bd..f0805845 100644 --- a/platform/targets/linux/emulator/sdl_engine.c +++ b/platform/targets/linux/emulator/sdl_engine.c @@ -300,7 +300,9 @@ void sdlEngine_init() SCREEN_WIDTH, SCREEN_HEIGHT); SDL_RenderClear(renderer); - SDL_RenderPresent(renderer); + + // Setting brightness also triggers a render + set_brightness(state.settings.brightness); } /* diff --git a/platform/targets/linux/platform.c b/platform/targets/linux/platform.c index e6ab1442..5e032541 100644 --- a/platform/targets/linux/platform.c +++ b/platform/targets/linux/platform.c @@ -77,7 +77,7 @@ uint16_t platform_getVbat() float voltage = emulator_state.vbat; if(voltage < 0.0f) voltage = 0.0f; if(voltage > 65.0f) voltage = 65.0f; - return ((uint16_t) voltage); + return ((uint16_t) (voltage * 1000.0f)); } uint8_t platform_getMicLevel() @@ -108,7 +108,7 @@ bool platform_getPttStatus() // Read P key status from SDL const uint8_t *state = SDL_GetKeyboardState(NULL); - if (state[SDL_SCANCODE_P]) + if ((state[SDL_SCANCODE_P] != 0) || (emulator_state.PTTstatus == true)) return true; else return false;