From 9b6217e1c3d0d4dfdd3adbdeebe2da860ac3ea5e Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 19 Sep 2016 20:58:26 +0200 Subject: [PATCH] S6R : Add nice graphics by mhotar (#3831) * Add nice graphics by mhotar * Cosmetics --- .../taranis/S6R_Calibrate/S6R_Calibrate.lua | 9 +++++---- radio/sdcard/taranis/S6R_Calibrate/bmp/done.bmp | Bin 0 -> 1142 bytes 2 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 radio/sdcard/taranis/S6R_Calibrate/bmp/done.bmp diff --git a/radio/sdcard/taranis/S6R_Calibrate/S6R_Calibrate.lua b/radio/sdcard/taranis/S6R_Calibrate/S6R_Calibrate.lua index c7e316abd..9b1599b9f 100644 --- a/radio/sdcard/taranis/S6R_Calibrate/S6R_Calibrate.lua +++ b/radio/sdcard/taranis/S6R_Calibrate/S6R_Calibrate.lua @@ -216,15 +216,16 @@ local function runCalibrationPage(event) lcd.drawText(0, 56, "Press [Enter] when ready", attr) else lcd.drawText(0, 9, "Calibration completed", 0) - lcd.drawText(0, 56, "Press [Enter] when ready", attr) + lcd.drawPixmap(10, 19, "bmp/done.bmp") + lcd.drawText(0, 56, "Press [Exit] when ready", attr) end - if event == EVT_ENTER_BREAK then + if calibrationStep > 6 and (event == EVT_ENTER_BREAK or event == EVT_EXIT_BREAK) then + return 2 + elseif event == EVT_ENTER_BREAK then calibrationState = 1 elseif event == EVT_EXIT_BREAK then if calibrationStep > 0 then calibrationStep = 0 - else - return 2 end end return 0 diff --git a/radio/sdcard/taranis/S6R_Calibrate/bmp/done.bmp b/radio/sdcard/taranis/S6R_Calibrate/bmp/done.bmp new file mode 100644 index 0000000000000000000000000000000000000000..9ac50139804db9e8f54d93f80c363d2a8b9f92dd GIT binary patch literal 1142 zcmZvaPe>a<6vn@G{gWD#YHtPvZ}Ct;3?au#@X!VVHue%ESdf}t1W%HSkV7SU5EO+V zlv3J5a}eq+m-e1Zz}iO5+K0Wgg-}5~3U>Quva2&w2j0xi_xs+PH@llmFLgqWC7wq( zCOC#UEO>yIqfk5gSr@~yER;$m)M_=PQYlm_6|`C{M59sU^La!f5tPeiG@DIivsqND zRk*H;L?VGgp#U;Q=1DSVNXpjv%SU!!DvI~m*aFtb*^@nC{6E8E0Y*347`QeJjs%lF zhMm(52MAsaY(Kr>SkU|P*3RHSo$;e&M%)oA8b3zh<@|j7 zIbPAj2Qck zxb8a%z3EKlO(`xE6~ns985C)U2RYRv*^@u1(2XbRyYz}_ta@fpF>dj1A1{)ip&X!aQIm*@xjriAQ| z9zC6Zu#UGr6Kj{wxg|Y+Nax>xUU@CAhOJ}b`s*Z{Ya3n|ocmiQc`wPsIg`)+W~tw+ fZoVAf?06^q@da}|C~$?qCsS7TyPK~^l`Z`PirX(` literal 0 HcmV?d00001