Remove obsoleted code
This commit is contained in:
committed by
Raphael Coeffic
parent
cee24fe013
commit
6b9abe0670
@@ -1227,6 +1227,7 @@ Run function (key pressed)
|
||||
|
||||
@status current Introduced in 2.2.0
|
||||
*/
|
||||
#if 0
|
||||
static int luaPopupWarning(lua_State * L)
|
||||
{
|
||||
event_t event = luaL_checkinteger(L, 2);
|
||||
@@ -1242,6 +1243,7 @@ static int luaPopupWarning(lua_State * L)
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*luadoc
|
||||
@function popupConfirmation(title, event) deprecated, please replace by
|
||||
@@ -1262,6 +1264,7 @@ Run function (key pressed)
|
||||
|
||||
@status current Introduced in 2.2.0, changed to (title, message, event) in 2.3.8
|
||||
*/
|
||||
#if 0
|
||||
static int luaPopupConfirmation(lua_State * L)
|
||||
{
|
||||
warningType = WARNING_TYPE_CONFIRM;
|
||||
@@ -1288,6 +1291,7 @@ static int luaPopupConfirmation(lua_State * L)
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*luadoc
|
||||
@function defaultStick(channel)
|
||||
@@ -1768,8 +1772,8 @@ const luaL_Reg opentxLib[] = {
|
||||
{ "playTone", luaPlayTone },
|
||||
{ "playHaptic", luaPlayHaptic },
|
||||
// { "popupInput", luaPopupInput },
|
||||
{ "popupWarning", luaPopupWarning },
|
||||
{ "popupConfirmation", luaPopupConfirmation },
|
||||
// { "popupWarning", luaPopupWarning },
|
||||
// { "popupConfirmation", luaPopupConfirmation },
|
||||
{ "defaultStick", luaDefaultStick },
|
||||
{ "defaultChannel", luaDefaultChannel },
|
||||
{ "getRSSI", luaGetRSSI },
|
||||
|
||||
@@ -773,6 +773,7 @@ void displayLuaError(const char * title)
|
||||
}
|
||||
}
|
||||
|
||||
#if !defined(COLORLCD)
|
||||
void displayAcknowledgeLuaError(event_t event)
|
||||
{
|
||||
warningResult = false;
|
||||
@@ -781,6 +782,7 @@ void displayAcknowledgeLuaError(event_t event)
|
||||
warningText = nullptr;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
void luaError(lua_State * L, uint8_t error, bool acknowledge)
|
||||
{
|
||||
@@ -819,9 +821,11 @@ void luaError(lua_State * L, uint8_t error, bool acknowledge)
|
||||
}
|
||||
|
||||
if (acknowledge) {
|
||||
#if !defined(COLORLCD)
|
||||
warningText = errorTitle;
|
||||
warningType = WARNING_TYPE_INFO;
|
||||
popupFunc = displayAcknowledgeLuaError;
|
||||
#endif
|
||||
}
|
||||
else {
|
||||
displayLuaError(errorTitle);
|
||||
|
||||
Reference in New Issue
Block a user