diff --git a/radio/wizard/delta.lua b/radio/wizard/delta.lua index eac325a10..8f25b472f 100644 --- a/radio/wizard/delta.lua +++ b/radio/wizard/delta.lua @@ -128,7 +128,7 @@ local function drawEngineMenu() lcd.drawText(1, 0, "Has your model got an engine?", 0) lcd.drawFilledRectangle(0, 0, LCD_W, 8, GREY_DEFAULT+FILL_WHITE) lcd.drawCombobox(0, 8, LCD_W/2, engineModeItems, engineMode, getFieldFlags(0)) - lcd.drawLine(LCD_W/2-1, 18, LCD_W/2-1, LCD_H, DOTTED, 0) + lcd.drawLine(LCD_W/2-1, 18, LCD_W/2-1, LCD_H-1, DOTTED, 0) if engineMode == 0 then -- No engine lcd.drawPixmap(132, 8, "engine-0.bmp") @@ -165,7 +165,7 @@ local function drawElevonsMenu() lcd.drawText(1, 0, "Select elevon channnels", 0) lcd.drawFilledRectangle(0, 0, LCD_W, 8, GREY_DEFAULT+FILL_WHITE) lcd.drawCombobox(0, 8, LCD_W/2, elevonsModeItems, elevonsMode, 0) - lcd.drawLine(LCD_W/2-1, 18, LCD_W/2-1, LCD_H, DOTTED, 0) + lcd.drawLine(LCD_W/2-1, 18, LCD_W/2-1, LCD_H-1, DOTTED, 0) lcd.drawPixmap(110, 9, "elevons.bmp") lcd.drawText(20, LCD_H-16, "Assign channels", 0); lcd.drawText(LCD_W/2-19, LCD_H-8, ">>>", 0); @@ -197,7 +197,7 @@ local function drawRudderMenu() lcd.drawText(1, 0, "Has your model got a rudder?", 0) lcd.drawFilledRectangle(0, 0, LCD_W, 8, GREY_DEFAULT+FILL_WHITE) lcd.drawCombobox(0, 8, LCD_W/2, rudderModeItems, rudderMode, getFieldFlags(0)) - lcd.drawLine(LCD_W/2-1, 18, LCD_W/2-1, LCD_H, DOTTED, 0) + lcd.drawLine(LCD_W/2-1, 18, LCD_W/2-1, LCD_H-1, DOTTED, 0) if rudderMode == 0 then -- No rudder lcd.drawPixmap(109, 14, "drudder-0.bmp") @@ -233,7 +233,7 @@ local function drawServoMenu(limits) lcd.drawSource(1, 0, MIXSRC_CH1+servoPage, 0) lcd.drawText(25, 0, "servo min/max/center/direction?", 0) lcd.drawFilledRectangle(0, 0, LCD_W, 8, GREY_DEFAULT+FILL_WHITE) - lcd.drawLine(LCD_W/2-1, 8, LCD_W/2-1, LCD_H, DOTTED, 0) + lcd.drawLine(LCD_W/2-1, 8, LCD_W/2-1, LCD_H-1, DOTTED, 0) lcd.drawText(LCD_W/2-19, LCD_H-8, ">>>", 0); lcd.drawPixmap(122, 8, "servo.bmp") lcd.drawNumber(140, 35, limits.min, PREC1+getFieldFlags(0)); diff --git a/radio/wizard/multi.lua b/radio/wizard/multi.lua index 611231036..c4a8848fe 100644 --- a/radio/wizard/multi.lua +++ b/radio/wizard/multi.lua @@ -125,7 +125,7 @@ local function drawThrottleMenu() lcd.drawText(1, 0, "Select multicopter throttle channel", 0) lcd.drawFilledRectangle(0, 0, LCD_W, 8, GREY_DEFAULT+FILL_WHITE) lcd.drawCombobox(0, 8, LCD_W/2, {"..."}, comboBoxMode, getFieldFlags(1)) - lcd.drawLine(LCD_W/2-1, 18, LCD_W/2-1, LCD_H, DOTTED, 0) + lcd.drawLine(LCD_W/2-1, 18, LCD_W/2-1, LCD_H-1, DOTTED, 0) lcd.drawPixmap(120, 8, "multi-thr.bmp") lcd.drawText(20, LCD_H-16, "Assign Throttle", 0); lcd.drawText(20, LCD_H-8, "Channel", 0); @@ -149,7 +149,7 @@ local function drawRollMenu() lcd.drawText(1, 0, "Select multicopter roll channel", 0) lcd.drawFilledRectangle(0, 0, LCD_W, 8, GREY_DEFAULT+FILL_WHITE) lcd.drawCombobox(0, 8, LCD_W/2, {"..."}, comboBoxMode, getFieldFlags(1)) - lcd.drawLine(LCD_W/2-1, 18, LCD_W/2-1, LCD_H, DOTTED, 0) + lcd.drawLine(LCD_W/2-1, 18, LCD_W/2-1, LCD_H-1, DOTTED, 0) lcd.drawPixmap(120, 8, "multi-roll.bmp") lcd.drawText(20, LCD_H-16, "Assign Roll", 0); lcd.drawText(20, LCD_H-8, "Channel", 0); @@ -173,7 +173,7 @@ local function drawPitchMenu() lcd.drawText(1, 0, "Select multicopter pitch channel", 0) lcd.drawFilledRectangle(0, 0, LCD_W, 8, GREY_DEFAULT+FILL_WHITE) lcd.drawCombobox(0, 8, LCD_W/2, {"..."}, comboBoxMode, getFieldFlags(1)) - lcd.drawLine(LCD_W/2-1, 18, LCD_W/2-1, LCD_H, DOTTED, 0) + lcd.drawLine(LCD_W/2-1, 18, LCD_W/2-1, LCD_H-1, DOTTED, 0) lcd.drawPixmap(120, 8, "multi-pitch.bmp") lcd.drawText(20, LCD_H-16, "Assign Pitch", 0); lcd.drawText(20, LCD_H-8, "Channel", 0); @@ -197,7 +197,7 @@ local function drawYawMenu() lcd.drawText(1, 0, "Select multicopter yaw channel", 0) lcd.drawFilledRectangle(0, 0, LCD_W, 8, GREY_DEFAULT+FILL_WHITE) lcd.drawCombobox(0, 8, LCD_W/2, {"..."}, comboBoxMode, getFieldFlags(1)) - lcd.drawLine(LCD_W/2-1, 18, LCD_W/2-1, LCD_H, DOTTED, 0) + lcd.drawLine(LCD_W/2-1, 18, LCD_W/2-1, LCD_H-1, DOTTED, 0) lcd.drawPixmap(120, 8, "multi-yaw.bmp") lcd.drawText(20, LCD_H-16, "Assign Yaw", 0); lcd.drawText(20, LCD_H-8, "Channel", 0); diff --git a/radio/wizard/plane.lua b/radio/wizard/plane.lua index 77c13ea09..1743f070d 100644 --- a/radio/wizard/plane.lua +++ b/radio/wizard/plane.lua @@ -138,7 +138,7 @@ local function drawEngineMenu() lcd.drawText(1, 0, "Has your model got an engine?", 0) lcd.drawFilledRectangle(0, 0, LCD_W, 8, GREY_DEFAULT+FILL_WHITE) lcd.drawCombobox(0, 8, LCD_W/2, engineModeItems, engineMode, getFieldFlags(0)) - lcd.drawLine(LCD_W/2-1, 18, LCD_W/2-1, LCD_H, DOTTED, 0) + lcd.drawLine(LCD_W/2-1, 18, LCD_W/2-1, LCD_H-1, DOTTED, 0) if engineMode == 1 then -- 1 channel lcd.drawPixmap(132, 8, "engine-1.bmp") @@ -175,7 +175,7 @@ local function drawAileronsMenu() lcd.drawText(1, 0, "Has your model got ailerons?", 0) lcd.drawFilledRectangle(0, 0, LCD_W, 8, GREY_DEFAULT+FILL_WHITE) lcd.drawCombobox(0, 8, LCD_W/2, aileronsModeItems, aileronsMode, getFieldFlags(0)) - lcd.drawLine(LCD_W/2-1, 18, LCD_W/2-1, LCD_H, DOTTED, 0) + lcd.drawLine(LCD_W/2-1, 18, LCD_W/2-1, LCD_H-1, DOTTED, 0) if aileronsMode == 2 then -- 2 channels lcd.drawPixmap(112, 8, "ailerons-2.bmp") @@ -222,7 +222,7 @@ local function drawFlapsMenu() lcd.drawText(1, 0, "Has your model got flaps?", 0) lcd.drawFilledRectangle(0, 0, LCD_W, 8, GREY_DEFAULT+FILL_WHITE) 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) + lcd.drawLine(LCD_W/2-1, 18, LCD_W/2-1, LCD_H-1, DOTTED, 0) if flapsMode == 0 then -- no flaps lcd.drawPixmap(112, 8, "ailerons-0.bmp") @@ -269,7 +269,7 @@ local function drawBrakesMenu() lcd.drawText(1, 0, "Has your model got air brakes?", 0) lcd.drawFilledRectangle(0, 0, LCD_W, 8, GREY_DEFAULT+FILL_WHITE) lcd.drawCombobox(0, 8, LCD_W/2, brakesModeItems, brakesMode, getFieldFlags(0)) - lcd.drawLine(LCD_W/2-1, 18, LCD_W/2-1, LCD_H, DOTTED, 0) + lcd.drawLine(LCD_W/2-1, 18, LCD_W/2-1, LCD_H-1, DOTTED, 0) if brakesMode == 0 then -- no brakes lcd.drawPixmap(112, 8, "ailerons-0.bmp") @@ -316,7 +316,7 @@ local function drawTailMenu() lcd.drawText(1, 0, "Which is the tail config on your model?", 0) lcd.drawFilledRectangle(0, 0, LCD_W, 8, GREY_DEFAULT+FILL_WHITE) lcd.drawCombobox(0, 8, LCD_W/2, tailModeItems, tailMode, getFieldFlags(0)) - lcd.drawLine(LCD_W/2-1, 18, LCD_W/2-1, LCD_H, DOTTED, 0) + lcd.drawLine(LCD_W/2-1, 18, LCD_W/2-1, LCD_H-1, DOTTED, 0) lcd.drawText(LCD_W/2-19, LCD_H-8, ">>>", 0); if tailMode == 0 then -- Elevator(1ch), no rudder... @@ -374,7 +374,7 @@ local function drawServoMenu(limits) lcd.drawSource(1, 0, MIXSRC_CH1+servoPage, 0) lcd.drawText(25, 0, "servo min/max/center/direction?", 0) lcd.drawFilledRectangle(0, 0, LCD_W, 8, GREY_DEFAULT+FILL_WHITE) - lcd.drawLine(LCD_W/2-1, 8, LCD_W/2-1, LCD_H, DOTTED, 0) + lcd.drawLine(LCD_W/2-1, 8, LCD_W/2-1, LCD_H-1, DOTTED, 0) lcd.drawText(LCD_W/2-19, LCD_H-8, ">>>", 0); lcd.drawPixmap(122, 8, "servo.bmp") lcd.drawNumber(140, 35, limits.min, PREC1+getFieldFlags(0));