@@ -16,23 +16,22 @@ MenuBox = { x=120, y=100, w=200, x_offset=68, h_line=20, h_offset=6 }
16
16
SaveBox = { x = 120 , y = 100 , w = 180 , x_offset = 12 , h = 60 , h_offset = 12 }
17
17
NoTelem = { 192 , LCD_H - 28 , " No Telemetry" , TEXT_COLOR + INVERS + BLINK }
18
18
19
- -- schema of the X9, cause currently no access to horus testing
20
19
ctrlSchema = {
21
20
display = {
22
21
prevPage = {
23
- cond = function (e , evs ) return e == evs .longPress . page end ,
22
+ cond = function (e , evs ) return e == evs .press . pageUp end ,
24
23
func = function () stepPage (- 1 ) end
25
24
},
26
25
nextPage = {
27
- cond = function (e , evs ) return e == evs .release . page end ,
26
+ cond = function (e , evs ) return e == evs .press . pageDown end ,
28
27
func = function () stepPage (1 ) end
29
28
},
30
29
prevLine = {
31
- cond = function (e , evs ) return e == evs .release . plus end ,
30
+ cond = function (e , evs ) return e == evs .dial . left end ,
32
31
func = function () stepLine (- 1 ) end
33
32
},
34
33
nextLine = {
35
- cond = function (e , evs ) return e == evs .release . minus end ,
34
+ cond = function (e , evs ) return e == evs .dial . right end ,
36
35
func = function () stepLine (1 ) end
37
36
},
38
37
edit = {
@@ -43,16 +42,15 @@ ctrlSchema = {
43
42
end
44
43
},
45
44
menu = {
46
- cond = function (e , evs ) return (evs .press .pageDown and e == evs .longPress .enter ) or e == evs . release . menu end ,
45
+ cond = function (e , evs ) return (evs .press .pageDown and e == evs .longPress .enter ) or e == 1542 end , -- 1542 => [SYS]
47
46
func = function ()
48
47
setState (" displayMenu" )
49
- setLock (" displayMenu.cnfrm " )
48
+ setLock (" displayMenu.exit " )
50
49
end
51
50
},
52
51
home = {
53
- cond = function (e , evs ) return e == evs . longPress . menu end ,
52
+ cond = function (e , evs ) return e == 1541 end , -- 1541 => [TELE]
54
53
func = function ()
55
- setLock (" display.menu" )
56
54
gotoPage (1 )
57
55
end
58
56
},
@@ -71,25 +69,25 @@ ctrlSchema = {
71
69
func = function () stepValue (1 ) end
72
70
},
73
71
exit = {
74
- cond = function (e , evs ) return e == evs .release .enter or e == evs . release . menu or e == evs . release . exit end ,
72
+ cond = function (e , evs ) return e == evs .release .enter end ,
75
73
func = function () setState (" display" ) end
76
74
}
77
75
},
78
76
displayMenu = {
79
77
prev = {
80
- cond = function (e , evs ) return e == evs .release . plus end ,
78
+ cond = function (e , evs ) return e == evs .dial . left end ,
81
79
func = function () stepMenu (- 1 ) end
82
80
},
83
81
next = {
84
- cond = function (e , evs ) return e == evs .release . minus end ,
82
+ cond = function (e , evs ) return e == evs .dial . right end ,
85
83
func = function () stepMenu (1 ) end
86
84
},
87
85
cnfrm = {
88
86
cond = function (e , evs ) return e == evs .release .enter end ,
89
87
func = function () execMenu () end
90
88
},
91
89
exit = {
92
- cond = function (e , evs ) return e == evs .release .exit end ,
90
+ cond = function (e , evs ) return e == evs .release .exit or e == 1542 end , -- 1542 => [SYS]
93
91
func = function () setState (" display" ) end
94
92
}
95
93
}
0 commit comments