Confirmation page added - not as nice as others ;) - Engine settings

applied (others remain to do). Flaps instead of Flaperons

radio/src/lua.cpp

@@ -534,6 +534,18 @@ static int luaModelDeleteInput(lua_State *L)
   return 0;
 }
 
+static int luaModelDeleteInputs(lua_State *L)
+{
+  clearInputs();
+  return 0;
+}
+
+static int luaModelDefaultInputs(lua_State *L)
+{
+  defaultInputs();
+  return 0;
+}
+
 static int getFirstMix(int chn)
 {
   for (int i=0; i<MAX_MIXERS; i++) {
@@ -562,6 +574,9 @@ static int getMixesCountFromFirst(int chn, int first)
 static int getMixesCount(int chn)
 {
   int first = getFirstMix(chn);
+  if (first < 0) {
+    return 0;
+  }
   return getMixesCountFromFirst(chn, first);
 }
 
@@ -604,7 +619,8 @@ static int luaModelInsertMix(lua_State *L)
   int count = getMixesCountFromFirst(chn, first);
 
   if (chn<NUM_CHNOUT && getExpoMixCount(0)<MAX_MIXERS && idx<=count) {
-    idx = first+idx;
+    if (first > 0)
+      idx += first;
     s_currCh = chn+1;
     insertExpoMix(0, idx);
     MixData *mix = mixAddress(idx);
@@ -652,6 +668,12 @@ static int luaModelDeleteMix(lua_State *L)
   return 0;
 }
 
+static int luaModelDeleteMixes(lua_State *L)
+{
+  memset(g_model.mixData, 0, sizeof(g_model.mixData));
+  return 0;
+}
+
 static int luaModelGetLogicalSwitch(lua_State *L)
 {
   int idx = luaL_checkunsigned(L, 1);
@@ -955,10 +977,13 @@ static const luaL_Reg modelLib[] = {
   { "getInput", luaModelGetInput },
   { "insertInput", luaModelInsertInput },
   { "deleteInput", luaModelDeleteInput },
+  { "deleteInputs", luaModelDeleteInputs },
+  { "defaultInputs", luaModelDefaultInputs },
   { "getMixesCount", luaModelGetMixesCount },
   { "getMix", luaModelGetMix },
   { "insertMix", luaModelInsertMix },
   { "deleteMix", luaModelDeleteMix },
+  { "deleteMixes", luaModelDeleteMixes },
   { "getLogicalSwitch", luaModelGetLogicalSwitch },
   { "setLogicalSwitch", luaModelSetLogicalSwitch },
   { "getCustomFunction", luaModelGetCustomFunction },
@@ -1033,6 +1058,7 @@ void luaInit()
   lua_registerint(L, "EVT_PAGE_BREAK", EVT_KEY_BREAK(KEY_PAGE));
   lua_registerint(L, "EVT_PAGE_LONG", EVT_KEY_LONG(KEY_PAGE));
   lua_registerint(L, "EVT_ENTER_BREAK", EVT_KEY_BREAK(KEY_ENTER));
+  lua_registerint(L, "EVT_ENTER_LONG", EVT_KEY_LONG(KEY_ENTER));
   lua_registerint(L, "EVT_EXIT_BREAK", EVT_KEY_BREAK(KEY_EXIT));
   lua_registerint(L, "EVT_PLUS_BREAK", EVT_KEY_BREAK(KEY_PLUS));
   lua_registerint(L, "EVT_MINUS_BREAK", EVT_KEY_BREAK(KEY_MINUS));

radio/src/opentx.cpp

@@ -333,6 +333,32 @@ uint16_t evalChkSum()
   return sum;
 }
 
+#if defined(PCBTARANIS)
+void clearInputs()
+{
+  memset(g_model.expoData, 0, sizeof(g_model.expoData)); // clear all expos
+}
+
+void defaultInputs()
+{
+  clearInputs();
+
+  for (int i=0; i<NUM_STICKS; i++) {
+    uint8_t stick_index = channel_order(i+1);
+    ExpoData *expo = expoAddress(i);
+    expo->srcRaw = MIXSRC_Rud - 1 + stick_index;
+    expo->curve.type = CURVE_REF_EXPO;
+    expo->chn = i;
+    expo->weight = 100;
+    expo->mode = 3; // TODO constant
+    for (int c=0; c<4; c++) {
+      g_model.inputNames[i][c] = char2idx(STR_VSRCRAW[1+STR_VSRCRAW[0]*stick_index+c]);
+    }
+  }
+  eeDirty(EE_MODEL);
+}
+#endif
+
 #if defined(TEMPLATES)
 inline void applyDefaultTemplate()
 {

radio/src/opentx.h

@@ -1091,6 +1091,11 @@ int expo(int x, int k);
   #define APPLY_EXPOS_EXTRA_PARAMS
 #endif
 
+#if defined(PCBTARANIS)
+void clearInputs();
+void defaultInputs();
+#endif
+
 void applyExpos(int16_t *anas, uint8_t mode APPLY_EXPOS_EXTRA_PARAMS_INC);
 int16_t applyLimits(uint8_t channel, int32_t value);
 

radio/src/templates.cpp

@@ -101,34 +101,11 @@ void mixSetWeight(MixData* md, int8_t weight)
 }
 
 #if defined(PCBTARANIS)
-void clearInputs()
+  #define TMPL_INPUT(x) (MIXSRC_FIRST_INPUT+channel_order(x)-1)
-{
-  memset(g_model.expoData, 0, sizeof(g_model.expoData)); // clear all expos
-}
-
-void defaultInputs()
-{
-  clearInputs();
-
-  for (int i=0; i<NUM_STICKS; i++) {
-    uint8_t stick_index = channel_order(i+1);
-    ExpoData *expo = expoAddress(i);
-    expo->srcRaw = MIXSRC_Rud - 1 + stick_index;
-    expo->curve.type = CURVE_REF_EXPO;
-    expo->chn = i;
-    expo->weight = 100;
-    expo->mode = 3; // TODO constant
-    for (int c=0; c<4; c++) {
-      g_model.inputNames[i][c] = char2idx(STR_VSRCRAW[1+STR_VSRCRAW[0]*stick_index+c]);
-    }
-  }
-  eeDirty(EE_MODEL);
-}
-#define TMPL_INPUT(x) (MIXSRC_FIRST_INPUT+channel_order(x)-1)
 #else
-#define clearInputs()
+  #define clearInputs()
-#define defaultInputs()
+  #define defaultInputs()
-#define TMPL_INPUT(x) (MIXSRC_Rud+x-1)
+  #define TMPL_INPUT(x) (MIXSRC_Rud+x-1)
 #endif
 
 void clearMixes()

radio/wizard/wizard.lua

@@ -1,10 +1,10 @@
-
 -- Wizard pages
 local MODELTYPE_MENU = 0
 local PLANE_MENU    = MODELTYPE_MENU+1
 local HELI_MENU     = PLANE_MENU+10
 local DELTA_MENU    = HELI_MENU+10
 local QUADRI_MENU   = DELTA_MENU+10
+local CONFIRMATION_MENU = 100
 
 local ENGINE_MENU = PLANE_MENU
 local AILERONS_MENU = PLANE_MENU+1
@@ -12,21 +12,23 @@ local FLAPERONS_MENU = PLANE_MENU+2
 local BRAKES_MENU = PLANE_MENU+3
 local TAIL_MENU = PLANE_MENU+4
 
+-- Navigation variables
 local page = MODELTYPE_MENU
 local dirty = true
-local choice = 0
-
 local edit = false
 local field = 0
 local fieldsMax = 0
+
+-- Model settings
+local modelType = 0
 local engineMode = 0
 local engineCH1 = 0
 local aileronsMode = 0
 local aileronsCH1 = 0
 local aileronsCH2 = 4
-local flaperonsMode = 0
+local flapsMode = 0
-local flaperonsCH1 = 5
+local flapsCH1 = 5
-local flaperonsCH2 = 6
+local flapsCH2 = 6
 local brakesMode = 0
 local brakesCH1 = 8
 local brakesCH2 = 9
@@ -146,7 +148,7 @@ end
 
 -- Model Type Menu
 
-local function choiceSurround(index)
+local function modelTypeSurround(index)
   lcd.drawRectangle(12+47*index, 13, 48, 48)
   lcd.drawPixmap(17+47*index, 8, "/TEMPLATES/mark.bmp")
 end
@@ -159,7 +161,7 @@ local function drawModelChoiceMenu()
   lcd.drawPixmap( 63, 17, "/TEMPLATES/heli.bmp")
   lcd.drawPixmap(110, 17, "/TEMPLATES/delta.bmp")
   lcd.drawPixmap(157, 17, "/TEMPLATES/quadri.bmp")
-  choiceSurround(choice)
+  modelTypeSurround(modelType)
 end
 
 local function modelTypeMenu(event)
@@ -168,10 +170,10 @@ local function modelTypeMenu(event)
     dirty = false
   end
   if event == EVT_ENTER_BREAK then
-    page = PLANE_MENU+(10*choice)
+    page = PLANE_MENU+(10*modelType)
     dirty = true
   else
-    choice = fieldIncDec(event, choice, 3)
+    modelType = fieldIncDec(event, modelType, 3)
   end
 end
 
@@ -214,6 +216,13 @@ local function engineMenu(event)
   end
 end
 
+local function applyEngineSettings()
+  if engineMode == 0 then
+    mix = {source=channelOrder(2)}
+    model.insertMix(engineCH1, 0, mix)
+  end
+end
+
 -- Ailerons Menu
 
 local aileronsModeItems = {"Yes...", "No", "Yes, 2 channels..."}
@@ -263,52 +272,52 @@ local function aileronsMenu(event)
   end
 end
 
--- Flaperons Menu
+-- Flaps Menu
 
-local flaperonsModeItems = {"No", "Yes...", "Yes, 2 channels..."}
+local flapsModeItems = {"No", "Yes...", "Yes, 2 channels..."}
 
-local function drawFlaperonsMenu()
+local function drawFlapsMenu()
   lcd.clear()
-  lcd.drawText(1, 0, "Has your model got flaperons?", 0)
+  lcd.drawText(1, 0, "Has your model got flaps?", 0)
   lcd.drawRect(0, 0, LCD_W, 8, GREY_DEFAULT+FILL_WHITE)
-  lcd.drawCombobox(0, 8, LCD_W/2, flaperonsModeItems, flaperonsMode, getFieldFlags(0)) 
+  lcd.drawCombobox(0, 8, LCD_W/2, flapsModeItems, flapsMode, getFieldFlags(0)) 
   lcd.drawLine(LCD_W/2-1, 18, LCD_W/2-1, LCD_H, DOTTED, 0)
-  if flaperonsMode == 0 then
+  if flapsMode == 0 then
-    -- no flaperons
+    -- no flaps
     -- lcd.drawPixmap(112, 8, "/TEMPLATES/ailerons-0.bmp")
     fieldsMax = 0
-  elseif flaperonsMode == 1 then
+  elseif flapsMode == 1 then
     -- 1 channel
     lcd.drawPixmap(112, 8, "/TEMPLATES/flaps-1.bmp")
     lcd.drawText(25, LCD_H-16, "Assign channel", 0);
     lcd.drawText(LCD_W/2-19, LCD_H-8, ">>>", 0);
-    lcd.drawSource(151, LCD_H-8, SOURCE_FIRST_CH+flaperonsCH1, getFieldFlags(1))
+    lcd.drawSource(151, LCD_H-8, SOURCE_FIRST_CH+flapsCH1, getFieldFlags(1))
     fieldsMax = 1
-  elseif flaperonsMode == 2 then
+  elseif flapsMode == 2 then
     -- 2 channels
     lcd.drawPixmap(112, 8, "/TEMPLATES/flaps-2.bmp")
     lcd.drawText(20, LCD_H-16, "Assign channels", 0);
     lcd.drawText(LCD_W/2-19, LCD_H-8, ">>>", 0);
-    lcd.drawSource(116, LCD_H-8, SOURCE_FIRST_CH+flaperonsCH1, getFieldFlags(1))
+    lcd.drawSource(116, LCD_H-8, SOURCE_FIRST_CH+flapsCH1, getFieldFlags(1))
-    lcd.drawSource(175, LCD_H-8, SOURCE_FIRST_CH+flaperonsCH2, getFieldFlags(2))
+    lcd.drawSource(175, LCD_H-8, SOURCE_FIRST_CH+flapsCH2, getFieldFlags(2))
     fieldsMax = 2
   end
 end
 
-local function flaperonsMenu(event)
+local function flapsMenu(event)
   if dirty then
     dirty = false
-    drawFlaperonsMenu()
+    drawFlapsMenu()
   end
 
   navigate(event, fieldsMax, page-1, page+1)
 
   if field==0 then
-    flaperonsMode = fieldIncDec(event, flaperonsMode, 2)
+    flapsMode = fieldIncDec(event, flapsMode, 2)
   elseif field==1 then
-    flaperonsCH1 = channelIncDec(event, flaperonsCH1)
+    flapsCH1 = channelIncDec(event, flapsCH1)
   elseif field==2 then
-    flaperonsCH2 = channelIncDec(event, flaperonsCH2)
+    flapsCH2 = channelIncDec(event, flapsCH2)
   end
 end
 
@@ -409,7 +418,7 @@ local function tailMenu(event)
     drawTailMenu()
   end
 
-  navigate(event, fieldsMax, page-1, page+1)
+  navigate(event, fieldsMax, page-1, CONFIRMATION_MENU)
 
   if field==0 then
     tailMode = fieldIncDec(event, tailMode, 3)
@@ -470,6 +479,41 @@ local function servoMenu(event)
   end
 end
 
+-- Confirmation Menu
+
+local function applySettings()
+  model.defaultInputs()
+  model.deleteMixes()      
+  applyEngineSettings()
+end
+
+local function drawConfirmationMenu()
+  lcd.clear()
+  lcd.drawText(2, 10, "Throttle:", 0);
+  lcd.drawSource(52, 10, SOURCE_FIRST_CH+engineCH1, 0)
+  lcd.drawText(50, LCD_H-10, "[Enter Long] to confirm", INVERS);
+  fieldsMax = 0
+end
+
+local function confirmationMenu(event)
+  if dirty then
+    dirty = false
+    drawConfirmationMenu()
+  end
+
+  navigate(event, fieldsMax, TAIL_MENU, page)
+
+  if event == EVT_EXIT_BREAK then
+    return 2
+  elseif event == EVT_ENTER_LONG then
+    killEvents(event)
+    applySettings()
+    return 2
+  else
+    return 0
+  end
+end
+
 -- Main
 
 local function run(event)
@@ -483,11 +527,13 @@ local function run(event)
   elseif page == AILERONS_MENU then
     aileronsMenu(event)
   elseif page == FLAPERONS_MENU then
-    flaperonsMenu(event)
+    flapsMenu(event)
   elseif page == BRAKES_MENU then
     brakesMenu(event)
   elseif page == TAIL_MENU then
     tailMenu(event)
+  elseif page == CONFIRMATION_MENU then
+    return confirmationMenu(event)
   end
   return 0
 end