Skip to content

Commit 798f9a1

Browse files
committed
Horus version 1.8.1
- added widget page with offline GPS mapping - added support for map zoom toggle via radio channel - added qacro and takeoff flight modes - moved all battery calculations to background - fix for OpenTX 2.3.1 on Horus X10 - fix for reset on model change - fix for broken rangefinder menu option - fix for custom sensor min/max nil support
1 parent 14edbec commit 798f9a1

File tree

1,092 files changed

+3012
-740
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,092 files changed

+3012
-740
lines changed

HORUS/SD/SCRIPTS/TOOLS/Yaapu Config.lua

Lines changed: 623 additions & 0 deletions
Large diffs are not rendered by default.

HORUS/SD/SCRIPTS/YAAPU/CFG/examples/gsuite_sensors.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ local sensors = {
2121
1, -- multiplier if < 1 than divides
2222
"+", -- "+" track max values, "-" track min values with
2323
2, -- font size 1=small, 2=big
24-
nil, -- warning level (nil is do not use feature)
25-
nil, -- critical level (nil is do not use feature)
24+
nil, -- warning level (nil is do not use feature)
25+
nil, -- critical level (nil is do not use feature)
2626
},
2727
-- Sensor 2
2828
[2]= {
@@ -83,7 +83,7 @@ local sensors = {
8383
0, -- precision: number of decimals 0,1,2
8484
"%", -- label for unit of measure
8585
1, -- multiplier if < 1 than divides
86-
"+", -- "+" track max values, "-" track min values with
86+
"-", -- "+" track max values, "-" track min values with
8787
2, -- font size 1=small, 2=big
8888
nil, -- warning level (nil is do not use feature)
8989
nil, -- critical level (nil is do not use feature)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
L1:1,V1:375,V2:350,B1:300,B2:0,S1:1,S2:1,VIBR:1,VS:1,T1:0,A1:0,A2:0,D1:0,T2:10,BC:1,CC:0,CC2:0,RM:0,SVS:1,HSPD:1,VSPD:1,WL:1,CPANE:3,RPANE:1,LPANE:1,PX4:1
1+
L1:1,V1:375,V2:350,B1:300,B2:0,S1:1,S2:1,S3:1,VS:1,T1:0,A1:0,A2:0,D1:0,T2:10,CC:0,RM:0,SVS:1,HSPD:1,VSPD:1,HDOP:20,CPANE:1,RPANE:2,LPANE:2
Lines changed: 81 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,129 @@
11
----------------------------------------
22
-- custom sensors configuration file
33
----------------------------------------
4+
--[[
5+
S1:Pump,A4,2,V,1,+,1,
6+
S2:Fuel,Fuel,0,ml,1,+,1,
7+
S3:ENG,RPM,0,krpm,100,+,1,
8+
S4:EGT,Tmp1,0,C,1,+,1,
9+
S5:THRO,Thro,0,%,1,+,1,
10+
S6:Status,Tmp2,0,C,1,-,1
11+
--]]
412
local sensors = {
513
-- Sensor 1
614
[1]= {
7-
"Cel6", -- label
8-
"Cel6", -- OpenTX sensor name
15+
"Pump", -- label
16+
"A4", -- OpenTX sensor name
917
2, -- precision: number of decimals 0,1,2
1018
"V", -- label for unit of measure
1119
1, -- multiplier if < 1 than divides
12-
"-", -- "+" track max values, "-" track min values with
13-
2, -- font size 1=small, 2=big
14-
3.65, -- warning level (nil is do not use feature)
15-
3.30, -- critical level (nil is do not use feature)
20+
"+", -- "+" track max values, "-" track min values with
21+
1, -- font size 1=small, 2=big
22+
5, -- warning level (nil is do not use feature)
23+
10, -- critical level (nil is do not use feature)
1624
},
1725

1826
-- Sensor 2
1927
[2]= {
20-
"Cel5", -- label
21-
"Cel5", -- OpenTX sensor name
22-
2, -- precision: number of decimals 0,1,2
23-
"V", -- label for unit of measure
24-
1, -- multiplier if < 1 than divides
25-
"-", -- "+" track max values, "-" track min values with
26-
2, -- font size 1=small, 2=big
27-
3.65, -- warning level (nil is do not use feature)
28-
3.30, -- critical level (nil is do not use feature)
28+
"Fuel", -- label
29+
"Fuel", -- OpenTX sensor name
30+
0, -- precision: number of decimals 0,1,2
31+
"mL", -- label for unit of measure
32+
1, -- multiplier if < 1 than divides
33+
"+", -- "+" track max values, "-" track min values
34+
1, -- font size 1=small, 2=big
35+
1000, -- warning level
36+
2000, -- critical level
2937
},
3038

3139
-- Sensor 3
3240
[3]= {
33-
"Cel4", -- label
34-
"Cel4", -- OpenTX sensor name
35-
2, -- precision: number of decimals 0,1,2
36-
"V", -- label for unit of measure
37-
1, -- multiplier if < 1 than divides
38-
"-", -- "+" track max values, "-" track min values with
39-
2, -- font size 1=small, 2=big
40-
3.65, -- warning level (nil is do not use feature)
41-
3.30, -- critical level (nil is do not use feature)
41+
"ENG", -- label
42+
"RPM", -- OpenTX sensor name
43+
1, -- precision: number of decimals 0,1,2
44+
"krpm", -- label for unit of measure
45+
0.001, -- multiplier if < 1 than divides
46+
"+", -- "+" track max values, "-" track min values with
47+
2, -- font size 1=small, 2=big
48+
100000, -- warning level
49+
120000, -- critical value
4250
},
4351

4452
-- Sensor 4
4553
[4]= {
46-
"Cel3", -- label
47-
"Cel3", -- OpenTX sensor name
48-
2, -- precision: number of decimals 0,1,2
49-
"V", -- label for unit of measure
50-
1, -- multiplier if < 1 than divides
51-
"-", -- "+" track max values, "-" track min values with
52-
2, -- font size 1=small, 2=big
53-
3.65, -- warning level (nil is do not use feature)
54-
3.30, -- critical level (nil is do not use feature)
54+
"EGT", -- label
55+
"Tmp1", -- OpenTX sensor name
56+
0, -- precision: number of decimals 0,1,2
57+
"C", -- label for unit of measure
58+
1, -- multiplier if < 1 than divides
59+
"+", -- "+" track max values, "-" track min values with
60+
2, -- font size 1=small, 2=big
61+
100, -- warning level
62+
200, -- critical level
5563
},
5664

5765
-- Sensor 5
5866
[5]= {
59-
"Cel2", -- label
60-
"Cel2", -- OpenTX sensor name
61-
2, -- precision: number of decimals 0,1,2
62-
"V", -- label for unit of measure
63-
1, -- multiplier if < 1 than divides
64-
"-", -- "+" track max values, "-" track min values with
65-
2, -- font size 1=small, 2=big
66-
3.65, -- warning level (nil is do not use feature)
67-
3.30, -- critical level (nil is do not use feature)
67+
"THRO", -- label
68+
"Thro", -- OpenTX sensor name
69+
0, -- precision: number of decimals 0,1,2
70+
"%", -- label for unit of measure
71+
1, -- multiplier if < 1 than divides
72+
"+", -- "+" track max values, "-" track min values with
73+
2, -- font size 1=small, 2=big
74+
90, -- warning level
75+
100, -- critical level
6876
},
6977

7078
-- Sensor 6
7179
[6]= {
72-
"Cell", -- label
73-
"Cel1", -- OpenTX sensor name
74-
2, -- precision: number of decimals 0,1,2
75-
"V", -- label for unit of measure
76-
1, -- multiplier if < 1 than divides
77-
"-", -- "+" track max values, "-" track min values with
78-
2, -- font size 1=small, 2=big
79-
3.65, -- warning level (nil is do not use feature)
80-
3.30, -- critical level (nil is do not use feature)
80+
"Status", -- label
81+
"Tmp2", -- OpenTX sensor name
82+
0, -- precision: number of decimals 0,1,2
83+
"", -- label for unit of measure
84+
1, -- multiplier if < 1 than divides
85+
"+", -- "+" track max values, "-" track min values with
86+
2, -- font size 1=small, 2=big
87+
100, -- warning level
88+
100, -- critical level
8189
},
8290
}
8391
------------------------------------------------------
8492
-- the script can optionally look up values here
8593
-- for each sensor and display the corresponding text instead
8694
-- as an example to associate a lookup table to sensor 3 declare it like
8795
--
88-
--local lookups = {
8996
-- [3] = {
90-
-- [-10] = "ERR",
91-
-- [0] = "OK",
92-
-- [10] = "CRIT",
93-
-- }
97+
-- [-10] = "ERR",
98+
-- [0] = "OK",
99+
-- [10] = "CRIT",
94100
-- }
95101
-- this would display the sensor value except when the value corresponds to one
96102
-- of entered above
97103
--
98104
local lookups = {
105+
-- lookup 2
106+
[6] = {
107+
[-30] = "ERROR",
108+
[-20] = "OFF",
109+
[-10] = "COOL",
110+
[-1] = "LOCK",
111+
[0] = "STOP",
112+
[10] = "RUN",
113+
[20] = "REL",
114+
[25] = "GLOW",
115+
[30] = "SPIN",
116+
[40] = "FIRE",
117+
[45] = "IGNT",
118+
[50] = "HEAT",
119+
[60] = "ACCE",
120+
[65] = "CAL",
121+
[70] = "IDLE",
122+
},
99123
}
100124

101125
collectgarbage()
102126

103127
return {
104128
sensors=sensors,lookups=lookups
105-
}
129+
}
-277 Bytes
Binary file not shown.
-309 Bytes
Binary file not shown.
-325 Bytes
Binary file not shown.
-218 Bytes
Binary file not shown.
-219 Bytes
Binary file not shown.
410 Bytes
-622 Bytes
Binary file not shown.
-523 Bytes
Binary file not shown.
-599 Bytes
Binary file not shown.
-705 Bytes
Binary file not shown.
296 Bytes
-881 Bytes
Binary file not shown.
-958 Bytes
Binary file not shown.

HORUS/SD/SCRIPTS/YAAPU/IMAGES/kmh.png

-436 Bytes
Binary file not shown.
-381 Bytes
Binary file not shown.
-1.26 KB
Binary file not shown.
-237 Bytes
Binary file not shown.
-233 Bytes
Binary file not shown.

HORUS/SD/SCRIPTS/YAAPU/IMAGES/spd.png

-415 Bytes
Binary file not shown.
-315 Bytes
Binary file not shown.
-590 Bytes
Binary file not shown.
-521 Bytes
Binary file not shown.
-176 Bytes
Binary file not shown.

HORUS/SD/SCRIPTS/YAAPU/LIB/draw.luac

0 Bytes
Binary file not shown.

HORUS/SD/SCRIPTS/YAAPU/LIB/hud_1.luac

-30 Bytes
Binary file not shown.

HORUS/SD/SCRIPTS/YAAPU/LIB/hud_2.luac

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
103 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
9.39 KB
Binary file not shown.
72 Bytes
Binary file not shown.
77 Bytes
Binary file not shown.
76 Bytes
Binary file not shown.
77 Bytes
Binary file not shown.

HORUS/SD/SCRIPTS/YAAPU/LIB/reset.luac

0 Bytes
Binary file not shown.
-77 Bytes
Binary file not shown.
-68 Bytes
Binary file not shown.
-77 Bytes
Binary file not shown.
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
@echo off
2+
set MAGICK="%ProgramFiles%\ImageMagick-7.0.8-Q16\magick.exe"
3+
set MAGICK_OPTS=-resize 100x100 -posterize 35 -define png:compression-filter=5 -define png:compression-level=9 -define png:compression-strategy=1 -define png:exclude-chunk=all -interlace none -colorspace sRGB -strip
4+
if not exist %MAGICK% (
5+
echo:
6+
echo ERROR: Cannot find ImageMagick at path: %MAGICK%
7+
goto end
8+
)
9+
set /A COUNTER=0
10+
set /A SCOUNTER=0
11+
for /R %%I in (*.png) do (
12+
echo %%~nxI | findstr /b /r "[0-9]*\.png" >nul 2>&1
13+
if errorlevel 1 (
14+
echo skipping %%I
15+
set /A SCOUNTER=SCOUNTER+1
16+
) else (
17+
echo processing %%I
18+
%MAGICK% convert "%%I" %MAGICK_OPTS% "%%~dI%%~pIs_%%~nxI"
19+
del /q "%%I"
20+
set /A COUNTER=COUNTER+1
21+
)
22+
)
23+
echo:
24+
echo DONE: %COUNTER% images resized, %SCOUNTER% skipped
25+
:end
26+
pause

HORUS/SD/SCRIPTS/YAAPU/MAPS/nomap.png

311 Bytes

0 commit comments

Comments
 (0)