Skip to content

Commit bcc1f8f

Browse files
lichtlflyduino
lichtl
authored and
flyduino
committed
X-Lite Support (#36)
* adding X-Lite support
1 parent 0dd6c2a commit bcc1f8f

5 files changed

Lines changed: 110 additions & 17 deletions

File tree

‎.gitignore‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
.DS_store
2+
nbproject/
3+
.idea
4+
.project
5+
.settings/
6+
.vscode/
7+
node_modules/
8+
npm-debug.log
9+
build/
10+
cache/
11+
apps/
12+
dist/
13+
debug/
14+
release/
15+
tmp/
16+
117
KissFC.lua
218
KissHorus.lua
319
KissX7.lua
@@ -13,10 +29,11 @@ TmpX7CF.lua
1329
TmpX7SP.lua
1430
TmpX9CF.lua
1531
TmpX9SP.lua
16-
tmp
1732
HorusCF.lua
1833
HorusSP.lua
1934
X7CF.lua
2035
X7SP.lua
2136
X9CF.lua
2237
X9SP.lua
38+
X-LiteCF.lua
39+
X-LiteSP.lua

‎Makefile‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11

2-
VERSION = 0.11
2+
VERSION = 0.12
3+
GIT_HASH = $(shell git log -1 --pretty=format:"%h")
34

45
.PHONY: all
56
all: clean prepare luatmp lua
@@ -8,41 +9,53 @@ all: clean prepare luatmp lua
89
luatmp:
910
cat src/common/KissProtocolSPort.lua src/X9/Kiss.lua src/common/KissUI.lua > X9SP.lua
1011
cat src/common/KissProtocolSPort.lua src/X7/Kiss.lua src/common/KissUI.lua > X7SP.lua
12+
cat src/common/KissProtocolSPort.lua src/X-Lite/Kiss.lua src/common/KissUI.lua > X-LiteSP.lua
1113
cat src/common/KissProtocolSPort.lua src/Horus/Kiss.lua src/common/KissUI.lua > HorusSP.lua
1214
cat src/common/KissProtocolCF.lua src/X9/Kiss.lua src/common/KissUI.lua > X9CF.lua
1315
cat src/common/KissProtocolCF.lua src/X7/Kiss.lua src/common/KissUI.lua > X7CF.lua
16+
cat src/common/KissProtocolCF.lua src/X-Lite/Kiss.lua src/common/KissUI.lua > X-LiteCF.lua
1417
cat src/common/KissProtocolCF.lua src/Horus/Kiss.lua src/common/KissUI.lua > HorusCF.lua
1518

19+
1620
.PHONY: clean
1721
clean:
1822
rm -f *.lua
1923
rm -rf tmp
24+
rm -rf dist
25+
rm -rf release
2026

2127
.PHONY: prepare
2228
prepare:
2329
mkdir -p tmp/X9
2430
mkdir -p tmp/X7
2531
mkdir -p tmp/Horus
32+
mkdir -p tmp/X-Lite
2633

2734
.PHONY: lua
2835
lua:
2936
cp X9SP.lua tmp/X9/KissSP.lua
3037
cp X7SP.lua tmp/X7/KissSP.lua
38+
cp X-LiteSP.lua tmp/X-Lite/KissSP.lua
3139
cp HorusSP.lua tmp/Horus/KissSP.lua
40+
3241
cp X9CF.lua tmp/X9/KissCF.lua
3342
cp X7CF.lua tmp/X7/KissCF.lua
43+
cp X-LiteCF.lua tmp/X-Lite/KissCF.lua
3444
cp HorusCF.lua tmp/Horus/KissCF.lua
45+
3546
cp -R src/X7/KISS tmp/X7/KISS
47+
cp -R src/X7/KISS tmp/X-Lite/KISS
3648
cp -R src/X9/KISS tmp/X9/KISS
3749
cp -R src/Horus/KISS tmp/Horus/KISS
3850
find ./tmp/ -type f -name '*.lua' -exec sh -c './node_modules/luamin/bin/luamin --file {} > {}.tmp' \; -exec sh -c 'mv {}.tmp {} ' \;
3951

4052
.PHONY: zip
4153
zip:
4254
test -d dist || mkdir dist
43-
cd tmp/X9/; zip -r ../../dist/kiss-x9-lua-scripts-${VERSION}.zip *
44-
cd tmp/X7/; zip -r ../../dist/kiss-x7-lua-scripts-${VERSION}.zip *
45-
cd tmp/Horus/; zip -r ../../dist/kiss-horus-lua-scripts-${VERSION}.zip *
55+
cd tmp/X9/; zip -r ../../dist/kiss-x9-lua-scripts-${VERSION}-${GIT_HASH}.zip *
56+
cd tmp/X7/; zip -r ../../dist/kiss-x7-lua-scripts-${VERSION}-${GIT_HASH}.zip *
57+
cd tmp/X-Lite/; zip -r ../../dist/kiss-x_lite-lua-scripts-${VERSION}-${GIT_HASH}.zip *
58+
cd tmp/Horus/; zip -r ../../dist/kiss-horus-lua-scripts-${VERSION}-${GIT_HASH}.zip *
4659

4760
.PHONY: dist
4861
dist: clean prepare luatmp lua zip

‎package-lock.json‎

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/X-Lite/Kiss.lua‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
-- BEGIN X-Lite
2+
3+
local RADIO = "X-Lite"
4+
5+
local drawScreenTitle = function(title, currentPage, totalPages)
6+
lcd.drawScreenTitle('KISS LUA: '..title, currentPage, totalPages)
7+
end
8+
9+
local drawTelemetry = function()
10+
lcd.drawText(35,55,"No telemetry", BLINK)
11+
end
12+
13+
local drawSaving = function()
14+
lcd.drawFilledRectangle(6,12,120,30, ERASE)
15+
lcd.drawRectangle(6,12,120,30, SOLID)
16+
lcd.drawText(34,18,"Saving...", DBLSIZE + BLINK)
17+
end
18+
19+
local function drawMenu(menuList, menuActive)
20+
local x = 6
21+
local y = 12
22+
local w = 120
23+
local h = #(menuList) * 8 + 6
24+
lcd.drawFilledRectangle(x,y,w,h,ERASE)
25+
lcd.drawRectangle(x,y,w-1,h-1,SOLID)
26+
lcd.drawText(x+4,y+3,"Menu:")
27+
28+
for i,e in ipairs(menuList) do
29+
if menuActive == i then
30+
lcd.drawText(x+36,y+(i-1)*8+3,e.t,INVERS)
31+
else
32+
lcd.drawText(x+36,y+(i-1)*8+3,e.t)
33+
end
34+
end
35+
end
36+
37+
local function getDefaultTextOptions()
38+
return 0
39+
end
40+
41+
local EVT_MENU_LONG
42+
43+
-- END X-Lite
44+

‎src/common/KissUI.lua‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -271,11 +271,11 @@ local function run(event)
271271
end
272272

273273
-- navigation
274-
if event == EVT_MENU_LONG then
274+
if event == EVT_MENU_LONG or event == EVT_SHIFT_LONG then
275275
menuActive = 1
276276
gState = MENU_DISP
277277

278-
elseif EVT_PAGEUP_FIRST and (event == EVT_ENTER_LONG) then
278+
elseif EVT_PAGEUP_FIRST and event == EVT_ENTER_LONG then
279279
menuActive = 1
280280
killEnterBreak = 1
281281
gState = MENU_DISP
@@ -284,9 +284,9 @@ local function run(event)
284284
elseif gState == MENU_DISP then
285285
if event == EVT_EXIT_BREAK then
286286
gState = PAGE_DISPLAY
287-
elseif event == EVT_PLUS_BREAK or event == EVT_ROT_LEFT then
287+
elseif event == EVT_PLUS_BREAK or event == EVT_ROT_LEFT or event == EVT_UP_BREAK then
288288
incMenu(-1)
289-
elseif event == EVT_MINUS_BREAK or event == EVT_ROT_RIGHT then
289+
elseif event == EVT_MINUS_BREAK or event == EVT_ROT_RIGHT or event == EVT_DOWN_BREAK then
290290
incMenu(1)
291291
elseif event == EVT_ENTER_BREAK then
292292
if RADIO == "HORUS" then
@@ -303,13 +303,13 @@ local function run(event)
303303
end
304304
-- normal page viewing
305305
elseif gState <= PAGE_DISPLAY then
306-
if event == EVT_PAGEUP_FIRST then
306+
if event == EVT_PAGEUP_FIRST or event == EVT_LEFT_BREAK then
307307
incPage(-1)
308-
elseif event == EVT_MENU_BREAK or event == EVT_PAGEDN_FIRST then
308+
elseif event == EVT_MENU_BREAK or event == EVT_PAGEDN_FIRST or event == EVT_RIGHT_BREAK then
309309
incPage(1)
310-
elseif event == EVT_PLUS_BREAK or event == EVT_ROT_LEFT then
310+
elseif event == EVT_PLUS_BREAK or event == EVT_ROT_LEFT or event == EVT_UP_BREAK then
311311
incLine(-1)
312-
elseif event == EVT_MINUS_BREAK or event == EVT_ROT_RIGHT then
312+
elseif event == EVT_MINUS_BREAK or event == EVT_ROT_RIGHT or event == EVT_DOWN_BREAK then
313313
incLine(1)
314314
elseif event == EVT_ENTER_BREAK then
315315
local field = ActivePage.fields[currentLine]
@@ -322,13 +322,13 @@ local function run(event)
322322
elseif gState == EDITING then
323323
if (event == EVT_EXIT_BREAK) or (event == EVT_ENTER_BREAK) then
324324
gState = PAGE_DISPLAY
325-
elseif event == EVT_PLUS_FIRST or event == EVT_ROT_RIGHT then
325+
elseif event == EVT_PLUS_FIRST or event == EVT_ROT_RIGHT or event == EVT_UP_BREAK then
326326
incValue(1)
327-
elseif event == EVT_PLUS_REPT then
327+
elseif event == EVT_PLUS_REPT or event == EVT_RIGHT_BREAK then
328328
incValue(10)
329-
elseif event == EVT_MINUS_FIRST or event == EVT_ROT_LEFT then
329+
elseif event == EVT_MINUS_FIRST or event == EVT_ROT_LEFT or event == EVT_DOWN_BREAK then
330330
incValue(-1)
331-
elseif event == EVT_MINUS_REPT then
331+
elseif event == EVT_MINUS_REPT or event == EVT_LEFT_BREAK then
332332
incValue(-10)
333333
end
334334
end

0 commit comments

Comments
 (0)