From 493b9aaedc72ae540b8769a90c3ebcfb00aaa300 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Fri, 4 Jun 2021 20:42:51 +0200
Subject: [PATCH] Fixes issue with model LUA API strings

---
 radio/src/lua/api_model.cpp | 20 ++++++++++----------
 radio/src/lua/lua_api.h     |  2 --
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/radio/src/lua/api_model.cpp b/radio/src/lua/api_model.cpp
index 9af0f8b5c..feff8e6dd 100644
--- a/radio/src/lua/api_model.cpp
+++ b/radio/src/lua/api_model.cpp
@@ -39,9 +39,9 @@ Get current Model information
 static int luaModelGetInfo(lua_State *L)
 {
   lua_newtable(L);
-  lua_pushtablezstring(L, "name", g_model.header.name);
+  lua_pushtablestring(L, "name", g_model.header.name);
 #if LCD_DEPTH > 1
-  lua_pushtablenzstring(L, "bitmap", g_model.header.bitmap);
+  lua_pushtablestring(L, "bitmap", g_model.header.bitmap);
 #endif
   return 1;
 }
@@ -258,7 +258,7 @@ static int luaModelGetTimer(lua_State *L)
     lua_pushtableinteger(L, "countdownBeep", timer.countdownBeep);
     lua_pushtableboolean(L, "minuteBeep", timer.minuteBeep);
     lua_pushtableinteger(L, "persistent", timer.persistent);
-    lua_pushtablezstring(L, "name", timer.name);
+    lua_pushtablestring(L, "name", timer.name);
   }
   else {
     lua_pushnil(L);
@@ -424,7 +424,7 @@ static int luaModelGetFlightMode(lua_State * L)
   if (idx < MAX_FLIGHT_MODES) {
     FlightModeData * fm = flightModeAddress(idx);
     lua_newtable(L);
-    lua_pushtablezstring(L, "name", fm->name);
+    lua_pushtablestring(L, "name", fm->name);
     lua_pushtableinteger(L, "switch", fm->swtch);
     lua_pushtableinteger(L, "fadeIn", fm->fadeIn);
     lua_pushtableinteger(L, "fadeOut", fm->fadeOut);
@@ -546,8 +546,8 @@ static int luaModelGetInput(lua_State *L)
   if (idx < count) {
     ExpoData * expo = expoAddress(first+idx);
     lua_newtable(L);
-    lua_pushtablezstring(L, "name", expo->name);
-    lua_pushtablezstring(L, "inputName", g_model.inputNames[chn]);
+    lua_pushtablestring(L, "name", expo->name);
+    lua_pushtablestring(L, "inputName", g_model.inputNames[chn]);
     lua_pushtableinteger(L, "source", expo->srcRaw);
     lua_pushtableinteger(L, "weight", expo->weight);
     lua_pushtableinteger(L, "offset", expo->offset);
@@ -773,7 +773,7 @@ static int luaModelGetMix(lua_State *L)
   if (idx < count) {
     MixData * mix = mixAddress(first+idx);
     lua_newtable(L);
-    lua_pushtablezstring(L, "name", mix->name);
+    lua_pushtablestring(L, "name", mix->name);
     lua_pushtableinteger(L, "source", mix->srcRaw);
     lua_pushtableinteger(L, "weight", mix->weight);
     lua_pushtableinteger(L, "offset", mix->offset);
@@ -1043,7 +1043,7 @@ static int luaModelGetCurve(lua_State *L)
   if (idx < MAX_CURVES) {
     CurveHeader & CurveHeader = g_model.curves[idx];
     lua_newtable(L);
-    lua_pushtablezstring(L, "name", CurveHeader.name);
+    lua_pushtablestring(L, "name", CurveHeader.name);
     lua_pushtableinteger(L, "type", CurveHeader.type);
     lua_pushtableboolean(L, "smooth", CurveHeader.smooth);
     lua_pushtableinteger(L, "points", CurveHeader.points + 5);
@@ -1301,7 +1301,7 @@ static int luaModelGetCustomFunction(lua_State *L)
     lua_pushtableinteger(L, "switch", CFN_SWITCH(cfn));
     lua_pushtableinteger(L, "func", CFN_FUNC(cfn));
     if (CFN_FUNC(cfn) == FUNC_PLAY_TRACK || CFN_FUNC(cfn) == FUNC_BACKGND_MUSIC || CFN_FUNC(cfn) == FUNC_PLAY_SCRIPT) {
-      lua_pushtablenzstring(L, "name", cfn->play.name);
+      lua_pushtablestring(L, "name", cfn->play.name);
     }
     else {
       lua_pushtableinteger(L, "value", cfn->all.val);
@@ -1398,7 +1398,7 @@ static int luaModelGetOutput(lua_State *L)
   if (idx < MAX_OUTPUT_CHANNELS) {
     LimitData * limit = limitAddress(idx);
     lua_newtable(L);
-    lua_pushtablezstring(L, "name", limit->name);
+    lua_pushtablestring(L, "name", limit->name);
     lua_pushtableinteger(L, "min", limit->min-1000);
     lua_pushtableinteger(L, "max", limit->max+1000);
     lua_pushtableinteger(L, "offset", limit->offset);
diff --git a/radio/src/lua/lua_api.h b/radio/src/lua/lua_api.h
index 7e0510b3c..f7957e269 100644
--- a/radio/src/lua/lua_api.h
+++ b/radio/src/lua/lua_api.h
@@ -63,8 +63,6 @@ void luaInitThemesAndWidgets();
 #define lua_pushtableinteger(L, k, v)  (lua_pushstring(L, (k)), lua_pushinteger(L, (v)), lua_settable(L, -3))
 #define lua_pushtablenumber(L, k, v)   (lua_pushstring(L, (k)), lua_pushnumber(L, (v)), lua_settable(L, -3))
 #define lua_pushtablestring(L, k, v)   (lua_pushstring(L, (k)), lua_pushstring(L, (v)), lua_settable(L, -3))
-#define lua_pushtablenzstring(L, k, v) { char tmp[sizeof(v)+1]; strncpy(tmp, (v), sizeof(tmp)-1); tmp[sizeof(v)] = '\0'; lua_pushstring(L, (k)); lua_pushstring(L, tmp); lua_settable(L, -3); }
-#define lua_pushtablezstring(L, k, v)  { char tmp[sizeof(v)+1]; zchar2str(tmp, (v), sizeof(tmp)-1); lua_pushstring(L, (k)); lua_pushstring(L, tmp); lua_settable(L, -3); }
 #define lua_registerlib(L, name, tab)  (luaL_newmetatable(L, name), luaL_setfuncs(L, tab, 0), lua_setglobal(L, name))
 
 #define RUN_MIX_SCRIPT        (1 << 0)