diff --git a/radio/releasenotes.txt b/radio/releasenotes.txt index 5e9a31238..404a6db18 100644 --- a/radio/releasenotes.txt +++ b/radio/releasenotes.txt @@ -9,6 +9,7 @@
  • Fixed: Playing two background sounds at once causes sound to stop (#2704)
  • Several fixes to the SD card manager menu (#2623)
  • Fixed the difference between top and main LCD TX battery bars on 9Xe (#2671)
  • +
  • Several Lua getValue() fields were not exported correctly (tx-voltage, clock and timers1-3)
  • [Sky9x / 9XR-PRO] diff --git a/radio/src/lua_api.cpp b/radio/src/lua_api.cpp index 4a0e6af38..c06b2ffac 100644 --- a/radio/src/lua_api.cpp +++ b/radio/src/lua_api.cpp @@ -149,6 +149,9 @@ static void luaGetValueAndPush(int src) lua_pushinteger(L, (int)0); } } + else if (src == MIXSRC_TX_VOLTAGE) { + lua_pushnumber(L, float(value)/10.0); + } else { lua_pushinteger(L, value); } diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index e09da2eb4..c06ece881 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -1922,17 +1922,17 @@ enum MixSources { MIXSRC_LAST_GVAR = MIXSRC_FIRST_GVAR+MAX_GVARS-1, #if defined(CPUARM) - MIXSRC_TX_VOLTAGE, LUA_EXPORT_TELEMETRY("tx-voltage", "Transmitter battery voltage [volts]") - MIXSRC_TX_TIME, LUA_EXPORT_TELEMETRY("clock", "RTC clock [minutes from midnight]") + MIXSRC_TX_VOLTAGE, LUA_EXPORT("tx-voltage", "Transmitter battery voltage [volts]") + MIXSRC_TX_TIME, LUA_EXPORT("clock", "RTC clock [minutes from midnight]") MIXSRC_RESERVE1, MIXSRC_RESERVE2, MIXSRC_RESERVE3, MIXSRC_RESERVE4, MIXSRC_RESERVE5, MIXSRC_FIRST_TIMER, - MIXSRC_TIMER1 = MIXSRC_FIRST_TIMER, LUA_EXPORT_TELEMETRY("timer1", "Timer 1 value [seconds]") - MIXSRC_TIMER2, LUA_EXPORT_TELEMETRY("timer2", "Timer 2 value [seconds]") - MIXSRC_TIMER3, LUA_EXPORT_TELEMETRY("timer3", "Timer 3 value [seconds]") + MIXSRC_TIMER1 = MIXSRC_FIRST_TIMER, LUA_EXPORT("timer1", "Timer 1 value [seconds]") + MIXSRC_TIMER2, LUA_EXPORT("timer2", "Timer 2 value [seconds]") + MIXSRC_TIMER3, LUA_EXPORT("timer3", "Timer 3 value [seconds]") MIXSRC_LAST_TIMER = MIXSRC_TIMER3, #endif