Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 01:35:21 +03:00
Code Issues Wiki Activity

Cosmetics

Browse source
This commit is contained in:
Bertrand Songis 2020-05-15 15:17:41 +02:00
parent 682f0f1b05
commit f7fc15d7b5
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
3 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
radio/src/gui/128x64/model_flightmodes.cpp
View file

@ -87,7 +87,8 @@ void menuModelFlightModeOne(event_t event)
int8_t editMode = s_editMode;
#if defined(GVARS)
if (s_currIdx == 0 && sub>=ITEM_MODEL_FLIGHT_MODE_SWITCH) sub += VERTICAL_SHIFT;
if (s_currIdx == 0 && sub>=ITEM_MODEL_FLIGHT_MODE_SWITCH)
sub += VERTICAL_SHIFT;
for (uint8_t k=0; k<LCD_LINES-1; k++) {
coord_t y = MENU_HEADER_HEIGHT + 1 + k*FH;

17
radio/src/lua/api_general.cpp
View file

@ -1630,7 +1630,7 @@ static int luaSerialWrite(lua_State * L)
Reads characters from the serial port. The string is allowed to contain any character, including 0.
@status current Introduced in TODO
@status current Introduced in 2.3.8
*/
static int luaSerialRead(lua_State * L)
{
@ -1649,13 +1649,18 @@ static int luaSerialRead(lua_State * L)
while (luaRxFifo->pop(*p)) {
p++; // increment only when pop was successful
if (p - str >= LUA_FIFO_SIZE) {
break; // Buffer full
// buffer full
break;
}
if (num == 0 && (*(p - 1) == '\n' || *(p - 1) == '\r')) {
break; // Found newline
if (num == 0) {
if (*(p - 1) == '\n' || *(p - 1) == '\r') {
// found newline
break;
}
if (num > 0 && p - str >= num) {
break; // Requested number of characters reached
}
else if (p - str >= num) {
// requested number of characters reached
break;
}
}
lua_pushlstring(L, (const char*)str, p - str);