piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #5443 & Updated French translation (#5444)

Browse Source 
* Initial version

* Updated French Translation.
Fixed and enhanced X7 Wizard.
This commit is contained in:
Sebastien Charpentier
2017-11-30 19:03:03 +01:00
committed by Bertrand Songis
parent afeba0d07e
commit 1d5c06ccd6
5 changed files with 770 additions and 749 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/translations/companion_fr.ts
+701 -681
View File
File diff suppressed because it is too large Load Diff
radio/sdcard/taranis-x7/SCRIPTS/WIZARD/delta.lua
+7 -7
View File
@@ -284,10 +284,10 @@ local function applySettings()
if engineMode == 1 then
addMix(thrCH1, MIXSRC_FIRST_INPUT+defaultChannel(2), "Engine")
end
addMix(elevCH1, MIXSRC_FIRST_INPUT+defaultChannel(1), "Elev1-E", 50)
addMix(elevCH1, MIXSRC_FIRST_INPUT+defaultChannel(3), "Elev1-A", 50, 1)
addMix(elevCH2, MIXSRC_FIRST_INPUT+defaultChannel(1), "Elev2-E", 50)
addMix(elevCH2, MIXSRC_FIRST_INPUT+defaultChannel(3), "Elev2-A", -50, 1)
addMix(elevCH1, MIXSRC_FIRST_INPUT+defaultChannel(1), "D-EleL", 50)
addMix(elevCH1, MIXSRC_FIRST_INPUT+defaultChannel(3), "D-AilL", 50, 1)
addMix(elevCH2, MIXSRC_FIRST_INPUT+defaultChannel(1), "D-EleR", 50)
addMix(elevCH2, MIXSRC_FIRST_INPUT+defaultChannel(3), "D-AilR", -50, 1)
if rudderMode == 1 then
addMix(rudCH1, MIXSRC_FIRST_INPUT+defaultChannel(0), "Rudder")
end
@@ -311,10 +311,10 @@ local function drawConfirmationMenu()
lcd.drawText(48, 1, "Ready to go?", 0);
lcd.drawFilledRectangle(0, 0, LCD_W, 9, 0)
if engineMode == 1 then
x, y = drawNextLine(x, y, "Throttle:", thrCH1)
x, y = drawNextLine(x, y, "Thr:", thrCH1)
end
x, y = drawNextLine(x, y, "Elevons:", elevCH1)
x, y = drawNextLine(x, y, "Elevons:", elevCH2)
x, y = drawNextLine(x, y, "Ele L:", elevCH1)
x, y = drawNextLine(x, y, "Ele R:", elevCH2)
if rudderMode == 1 then
drawNextLine(x, y, "Rudder:", rudCH1)
end
radio/sdcard/taranis-x7/SCRIPTS/WIZARD/multi.lua
+5 -5
View File
@@ -221,10 +221,10 @@ local function drawConfirmationMenu()
lcd.clear()
lcd.drawText(0, 1, "Ready to go?", 0);
lcd.drawFilledRectangle(0, 0, LCD_W, 9, 0)
x, y = drawNextLine(x, y, "Throttle:", thrCH1)
x, y = drawNextLine(x, y, "Roll:", rollCH1)
x, y = drawNextLine(x, y, "Pitch:", pitchCH1)
x, y = drawNextLine(x, y, "Yaw:", yawCH1)
x, y = drawNextLine(x, y, "Throttle", thrCH1)
x, y = drawNextLine(x, y, "Roll", rollCH1)
x, y = drawNextLine(x, y, "Pitch", pitchCH1)
x, y = drawNextLine(x, y, "Yaw", yawCH1)
lcd.drawText(0, LCD_H-8, "[Enter Long] to confirm", 0);
lcd.drawFilledRectangle(0, LCD_H-9, LCD_W, 9, 0)
fieldsMax = 0
@@ -244,7 +244,7 @@ end
local function applySettings()
model.defaultInputs()
model.deleteMixes()
addMix(thrCH1, MIXSRC_FIRST_INPUT+defaultChannel(2), "Throttle")
addMix(thrCH1, MIXSRC_FIRST_INPUT+defaultChannel(2), "Engine")
addMix(rollCH1, MIXSRC_FIRST_INPUT+defaultChannel(3), "Roll")
addMix(yawCH1, MIXSRC_FIRST_INPUT+defaultChannel(0), "Yaw")
addMix(pitchCH1, MIXSRC_FIRST_INPUT+defaultChannel(1), "Pitch")
radio/sdcard/taranis-x7/SCRIPTS/WIZARD/plane.lua
+56 -52
View File
@@ -18,16 +18,16 @@ local engineMode = 1
local thrCH1 = 0
local aileronsMode = 1
local ailCH1 = 0
local ailCH2 = 4
local ailCH2 = 5
local flapsMode = 0
local flapsCH1 = 5
local flapsCH2 = 6
local flapsCH1 = 6
local flapsCH2 = 7
local brakesMode = 0
local brakesCH1 = 8
local brakesCH2 = 9
local tailMode = 1
local eleCH1 = 0
local eleCH2 = 7
local eleCH2 = 4
local rudCH1 = 0
local servoPage = nil
@@ -301,7 +301,7 @@ local function brakesMenu(event)
end
-- Tail Menu
local tailModeItems = {"Ele(1ch), no Ruder", "Ele(1ch) + Ruder", "Ele(2ch) + Ruder", "V-Tail"}
local tailModeItems = {"Ele(1)", "Ele(1) + Ruder(1)", "Ele(2) + Ruder(1)", "V-Tail(2)"}
local function drawTailMenu()
lcd.clear()
if tailMode == 0 then
@@ -322,8 +322,8 @@ local function drawTailMenu()
elseif tailMode == 2 then
-- Elevator(2ch) + rudder...
lcd.drawText(5, 30, "Assign channels", 0);
lcd.drawText(25, 40, "Ele", 0);
lcd.drawText(60, 40, "Ele", 0);
lcd.drawText(25, 40, "EleL", 0);
lcd.drawText(60, 40, "EleR", 0);
lcd.drawText(95, 40, "Rud", 0);
lcd.drawText(5, 50, ">>>", 0);
lcd.drawSource(25, 50, MIXSRC_CH1+eleCH1, getFieldFlags(1))
@@ -333,8 +333,8 @@ local function drawTailMenu()
else
-- V-Tail...
lcd.drawText(5, 30, "Assign channels", 0);
lcd.drawText(25, 40, "Vta", 0);
lcd.drawText(60, 40, "Vta", 0);
lcd.drawText(25, 40, "VtaL", 0);
lcd.drawText(60, 40, "VtaR", 0);
lcd.drawText(5, 50, ">>>", 0);
lcd.drawSource(25, 50, MIXSRC_CH1+eleCH1, getFieldFlags(1))
lcd.drawSource(60, 50, MIXSRC_CH1+eleCH2, getFieldFlags(2))
@@ -429,35 +429,37 @@ local function drawConfirmationMenu()
lcd.drawText(0, 1, "Ready to go?", 0);
lcd.drawFilledRectangle(0, 0, LCD_W, 9, 0)
if engineMode == 1 then
x, y = drawNextLine(x, y, "Thro:", thrCH1)
x, y = drawNextLine(x, y, "Thr", thrCH1)
end
if aileronsMode > 0 then
x, y = drawNextLine(x, y, "Aile:", ailCH1)
if aileronsMode == 2 then
x, y = drawNextLine(x, y, "Aile:", ailCH2)
end
if aileronsMode == 1 then
x, y = drawNextLine(x, y, "Ail", ailCH1)
elseif aileronsMode == 2 then
x, y = drawNextLine(x, y, "AilL", ailCH1)
x, y = drawNextLine(x, y, "AilR", ailCH2)
end
if flapsMode > 0 then
x, y = drawNextLine(x, y, "Flap:", flapsCH1)
if flapsMode == 2 then
x, y = drawNextLine(x, y, "Flap:", flapsCH2)
end
if flapsMode == 1 then
x, y = drawNextLine(x, y, "Flap", flapsCH1)
elseif flapsMode == 2 then
x, y = drawNextLine(x, y, "FlpL", flapsCH1)
x, y = drawNextLine(x, y, "FlpR", flapsCH2)
end
if brakesMode > 0 then
x, y = drawNextLine(x, y, "Brak:", brakesCH1)
if brakesMode == 2 then
x, y = drawNextLine(x, y, "Brak:", brakesCH2)
end
if brakesMode == 1 then
x, y = drawNextLine(x, y, "Brak", brakesCH1)
elseif brakesMode == 2 then
x, y = drawNextLine(x, y, "BrkL", brakesCH1)
x, y = drawNextLine(x, y, "BrkR", brakesCH2)
end
if tailMode == 3 then
x, y = drawNextLine(x, y, "V-Ta:", eleCH1)
x, y = drawNextLine(x, y, "V-Ta:", eleCH2)
x, y = drawNextLine(x, y, "VtaL", eleCH1)
x, y = drawNextLine(x, y, "VtaR", eleCH2)
else
x, y = drawNextLine(x, y, "Elev:", eleCH1)
if tailMode == 2 then
x, y = drawNextLine(x, y, "Elev:", eleCH2)
x, y = drawNextLine(x, y, "Rud", rudCH1)
if tailMode == 1 then
x, y = drawNextLine(x, y, "Elev", eleCH1)
elseif tailMode == 2 then
x, y = drawNextLine(x, y, "EleL", eleCH1)
x, y = drawNextLine(x, y, "EleR", eleCH2)
end
drawNextLine(x, y, "Rudd:", rudCH1)
end
lcd.drawText(0, LCD_H-8, "[Enter Long] to confirm", 0);
lcd.drawFilledRectangle(0, LCD_H-9, LCD_W, 9, 0)
@@ -481,36 +483,38 @@ local function applySettings()
if engineMode > 0 then
addMix(thrCH1, MIXSRC_FIRST_INPUT+defaultChannel(2), "Engine")
end
if aileronsMode > 0 then
addMix(ailCH1, MIXSRC_FIRST_INPUT+defaultChannel(3), "Aileron")
if aileronsMode == 2 then
addMix(ailCH2, MIXSRC_FIRST_INPUT+defaultChannel(3), "Aileron", -100)
end
if aileronsMode == 1 then
addMix(ailCH1, MIXSRC_FIRST_INPUT+defaultChannel(3), "Ail")
elseif aileronsMode == 2 then
addMix(ailCH1, MIXSRC_FIRST_INPUT+defaultChannel(3), "AilL")
addMix(ailCH2, MIXSRC_FIRST_INPUT+defaultChannel(3), "AilR", -100)
end
if flapsMode > 0 then
if flapsMode == 1 then
addMix(flapsCH1, MIXSRC_SA, "Flap")
if flapsMode == 2 then
addMix(flapsCH2, MIXSRC_SA, "Flap")
end
elseif flapsMode == 2 then
addMix(flapsCH1, MIXSRC_SA, "FlapL")
addMix(flapsCH2, MIXSRC_SA, "FlapR")
end
if brakesMode > 0 then
addMix(brakesCH1, MIXSRC_SE, "Brake")
if brakesMode == 2 then
addMix(brakesCH2, MIXSRC_SE, "Brake")
end
if brakesMode == 1 then
addMix(brakesCH1, MIXSRC_SD, "Brake")
elseif brakesMode == 2 then
addMix(brakesCH1, MIXSRC_SD, "BrakeL")
addMix(brakesCH2, MIXSRC_SD, "BrakeR")
end
if tailMode == 3 then
addMix(eleCH1, MIXSRC_FIRST_INPUT+defaultChannel(1), "V-Tail-E", 50)
addMix(eleCH1, MIXSRC_FIRST_INPUT+defaultChannel(0), "V-Tail-R", 50, 1)
addMix(eleCH2, MIXSRC_FIRST_INPUT+defaultChannel(1), "V-Tail-E", 50)
addMix(eleCH2, MIXSRC_FIRST_INPUT+defaultChannel(0), "V-Tail-R", -50, 1)
addMix(eleCH1, MIXSRC_FIRST_INPUT+defaultChannel(1), "V-EleL", 50)
addMix(eleCH1, MIXSRC_FIRST_INPUT+defaultChannel(0), "V-RudL", 50, 1)
addMix(eleCH2, MIXSRC_FIRST_INPUT+defaultChannel(1), "V-EleR", 50)
addMix(eleCH2, MIXSRC_FIRST_INPUT+defaultChannel(0), "V-RudR", -50, 1)
else
addMix(eleCH1, MIXSRC_FIRST_INPUT+defaultChannel(1), "Elevator")
if tailMode > 0 then
addMix(rudCH1, MIXSRC_FIRST_INPUT+defaultChannel(0), "Rudder")
end
if tailMode == 2 then
addMix(eleCH2, MIXSRC_FIRST_INPUT+defaultChannel(1), "Elevator")
if tailMode == 1 then
addMix(eleCH1, MIXSRC_FIRST_INPUT+defaultChannel(1), "Elev")
elseif tailMode == 2 then
addMix(eleCH1, MIXSRC_FIRST_INPUT+defaultChannel(1), "ElevG")
addMix(eleCH2, MIXSRC_FIRST_INPUT+defaultChannel(1), "ElevD")
end
end
end
radio/sdcard/taranis-x7/SCRIPTS/WIZARD/wizard.lua
+1 -4
View File
@@ -4,7 +4,6 @@ local dirty = true
-- Model types
local modelType = 0
local MODELTYPE_PLANE = 0
-- local MODELTYPE_HELI = 1 -- change order for implementing Heli
local MODELTYPE_DELTA = 1
local MODELTYPE_QUAD = 2
@@ -36,7 +35,6 @@ local function drawModelChoiceMenu()
lcd.drawText( 20, 20, "Plane")
lcd.drawText( 78, 20, "Delta")
lcd.drawText( 20, 40, "Multi")
-- lcd.drawText( 78, 40, "Heli")
modelTypeSurround(modelType)
fieldsMax = 0
end
@@ -49,7 +47,6 @@ local function modelTypeMenu(event)
if event == EVT_ENTER_BREAK then
if modelType == MODELTYPE_PLANE then
return "plane.lua"
-- elseif modelType == MODELTYPE_HELI then
elseif modelType == MODELTYPE_DELTA then
return "delta.lua"
elseif modelType == MODELTYPE_QUAD then
@@ -57,7 +54,7 @@ local function modelTypeMenu(event)
end
dirty = true
else
modelType = fieldIncDec(event, modelType, 2) -- 3 for implementing Heli
modelType = fieldIncDec(event, modelType, 2)
end
return 0
end