Skip to content

Commit

Permalink
Horus version 1.8.1
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
yaapu committed Dec 29, 2019
1 parent 14edbec commit 798f9a1
Show file tree
Hide file tree
Showing 1,092 changed files with 3,012 additions and 740 deletions.
623 changes: 623 additions & 0 deletions HORUS/SD/SCRIPTS/TOOLS/Yaapu Config.lua

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions HORUS/SD/SCRIPTS/YAAPU/CFG/examples/gsuite_sensors.lua
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ local sensors = {
1, -- multiplier if < 1 than divides
"+", -- "+" track max values, "-" track min values with
2, -- font size 1=small, 2=big
nil, -- warning level (nil is do not use feature)
nil, -- critical level (nil is do not use feature)
nil, -- warning level (nil is do not use feature)
nil, -- critical level (nil is do not use feature)
},
-- Sensor 2
[2]= {
Expand Down Expand Up @@ -83,7 +83,7 @@ local sensors = {
0, -- precision: number of decimals 0,1,2
"%", -- label for unit of measure
1, -- multiplier if < 1 than divides
"+", -- "+" track max values, "-" track min values with
"-", -- "+" track max values, "-" track min values with
2, -- font size 1=small, 2=big
nil, -- warning level (nil is do not use feature)
nil, -- critical level (nil is do not use feature)
Expand Down
2 changes: 1 addition & 1 deletion HORUS/SD/SCRIPTS/YAAPU/CFG/yaapudev.cfg
Original file line number Diff line number Diff line change
@@ -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
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
138 changes: 81 additions & 57 deletions HORUS/SD/SCRIPTS/YAAPU/CFG/yaapudev_sensors.lua
Original file line number Diff line number Diff line change
@@ -1,105 +1,129 @@
----------------------------------------
-- custom sensors configuration file
----------------------------------------
--[[
S1:Pump,A4,2,V,1,+,1,
S2:Fuel,Fuel,0,ml,1,+,1,
S3:ENG,RPM,0,krpm,100,+,1,
S4:EGT,Tmp1,0,C,1,+,1,
S5:THRO,Thro,0,%,1,+,1,
S6:Status,Tmp2,0,C,1,-,1
--]]
local sensors = {
-- Sensor 1
[1]= {
"Cel6", -- label
"Cel6", -- OpenTX sensor name
"Pump", -- label
"A4", -- OpenTX sensor name
2, -- precision: number of decimals 0,1,2
"V", -- label for unit of measure
1, -- multiplier if < 1 than divides
"-", -- "+" track max values, "-" track min values with
2, -- font size 1=small, 2=big
3.65, -- warning level (nil is do not use feature)
3.30, -- critical level (nil is do not use feature)
"+", -- "+" track max values, "-" track min values with
1, -- font size 1=small, 2=big
5, -- warning level (nil is do not use feature)
10, -- critical level (nil is do not use feature)
},

-- Sensor 2
[2]= {
"Cel5", -- label
"Cel5", -- OpenTX sensor name
2, -- precision: number of decimals 0,1,2
"V", -- label for unit of measure
1, -- multiplier if < 1 than divides
"-", -- "+" track max values, "-" track min values with
2, -- font size 1=small, 2=big
3.65, -- warning level (nil is do not use feature)
3.30, -- critical level (nil is do not use feature)
"Fuel", -- label
"Fuel", -- OpenTX sensor name
0, -- precision: number of decimals 0,1,2
"mL", -- label for unit of measure
1, -- multiplier if < 1 than divides
"+", -- "+" track max values, "-" track min values
1, -- font size 1=small, 2=big
1000, -- warning level
2000, -- critical level
},

-- Sensor 3
[3]= {
"Cel4", -- label
"Cel4", -- OpenTX sensor name
2, -- precision: number of decimals 0,1,2
"V", -- label for unit of measure
1, -- multiplier if < 1 than divides
"-", -- "+" track max values, "-" track min values with
2, -- font size 1=small, 2=big
3.65, -- warning level (nil is do not use feature)
3.30, -- critical level (nil is do not use feature)
"ENG", -- label
"RPM", -- OpenTX sensor name
1, -- precision: number of decimals 0,1,2
"krpm", -- label for unit of measure
0.001, -- multiplier if < 1 than divides
"+", -- "+" track max values, "-" track min values with
2, -- font size 1=small, 2=big
100000, -- warning level
120000, -- critical value
},

-- Sensor 4
[4]= {
"Cel3", -- label
"Cel3", -- OpenTX sensor name
2, -- precision: number of decimals 0,1,2
"V", -- label for unit of measure
1, -- multiplier if < 1 than divides
"-", -- "+" track max values, "-" track min values with
2, -- font size 1=small, 2=big
3.65, -- warning level (nil is do not use feature)
3.30, -- critical level (nil is do not use feature)
"EGT", -- label
"Tmp1", -- OpenTX sensor name
0, -- precision: number of decimals 0,1,2
"C", -- label for unit of measure
1, -- multiplier if < 1 than divides
"+", -- "+" track max values, "-" track min values with
2, -- font size 1=small, 2=big
100, -- warning level
200, -- critical level
},

-- Sensor 5
[5]= {
"Cel2", -- label
"Cel2", -- OpenTX sensor name
2, -- precision: number of decimals 0,1,2
"V", -- label for unit of measure
1, -- multiplier if < 1 than divides
"-", -- "+" track max values, "-" track min values with
2, -- font size 1=small, 2=big
3.65, -- warning level (nil is do not use feature)
3.30, -- critical level (nil is do not use feature)
"THRO", -- label
"Thro", -- OpenTX sensor name
0, -- precision: number of decimals 0,1,2
"%", -- label for unit of measure
1, -- multiplier if < 1 than divides
"+", -- "+" track max values, "-" track min values with
2, -- font size 1=small, 2=big
90, -- warning level
100, -- critical level
},

-- Sensor 6
[6]= {
"Cell", -- label
"Cel1", -- OpenTX sensor name
2, -- precision: number of decimals 0,1,2
"V", -- label for unit of measure
1, -- multiplier if < 1 than divides
"-", -- "+" track max values, "-" track min values with
2, -- font size 1=small, 2=big
3.65, -- warning level (nil is do not use feature)
3.30, -- critical level (nil is do not use feature)
"Status", -- label
"Tmp2", -- OpenTX sensor name
0, -- precision: number of decimals 0,1,2
"", -- label for unit of measure
1, -- multiplier if < 1 than divides
"+", -- "+" track max values, "-" track min values with
2, -- font size 1=small, 2=big
100, -- warning level
100, -- critical level
},
}
------------------------------------------------------
-- the script can optionally look up values here
-- for each sensor and display the corresponding text instead
-- as an example to associate a lookup table to sensor 3 declare it like
--
--local lookups = {
-- [3] = {
-- [-10] = "ERR",
-- [0] = "OK",
-- [10] = "CRIT",
-- }
-- [-10] = "ERR",
-- [0] = "OK",
-- [10] = "CRIT",
-- }
-- this would display the sensor value except when the value corresponds to one
-- of entered above
--
local lookups = {
-- lookup 2
[6] = {
[-30] = "ERROR",
[-20] = "OFF",
[-10] = "COOL",
[-1] = "LOCK",
[0] = "STOP",
[10] = "RUN",
[20] = "REL",
[25] = "GLOW",
[30] = "SPIN",
[40] = "FIRE",
[45] = "IGNT",
[50] = "HEAT",
[60] = "ACCE",
[65] = "CAL",
[70] = "IDLE",
},
}

collectgarbage()

return {
sensors=sensors,lookups=lookups
}
}
Binary file removed HORUS/SD/SCRIPTS/YAAPU/IMAGES/cell_orange_grey.png
Binary file not shown.
Binary file removed HORUS/SD/SCRIPTS/YAAPU/IMAGES/cell_red_blink.png
Binary file not shown.
Binary file removed HORUS/SD/SCRIPTS/YAAPU/IMAGES/cell_red_grey.png
Binary file not shown.
Binary file removed HORUS/SD/SCRIPTS/YAAPU/IMAGES/gauge_bg_grey.png
Binary file not shown.
Binary file removed HORUS/SD/SCRIPTS/YAAPU/IMAGES/gauge_bg_white.png
Binary file not shown.
Binary file added HORUS/SD/SCRIPTS/YAAPU/IMAGES/homeorange.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed HORUS/SD/SCRIPTS/YAAPU/IMAGES/hud_140x110.png
Binary file not shown.
Binary file removed HORUS/SD/SCRIPTS/YAAPU/IMAGES/hud_140x120.png
Binary file not shown.
Binary file removed HORUS/SD/SCRIPTS/YAAPU/IMAGES/hud_160x90.png
Binary file not shown.
Binary file removed HORUS/SD/SCRIPTS/YAAPU/IMAGES/hud_280x140.png
Binary file not shown.
Binary file added HORUS/SD/SCRIPTS/YAAPU/IMAGES/hud_48x48a.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed HORUS/SD/SCRIPTS/YAAPU/IMAGES/hud_70x70d.png
Binary file not shown.
Binary file removed HORUS/SD/SCRIPTS/YAAPU/IMAGES/hud_80x80a.png
Binary file not shown.
Binary file removed HORUS/SD/SCRIPTS/YAAPU/IMAGES/kmh.png
Binary file not shown.
Binary file removed HORUS/SD/SCRIPTS/YAAPU/IMAGES/kmh_b.png
Binary file not shown.
Binary file removed HORUS/SD/SCRIPTS/YAAPU/IMAGES/left_empty.png
Binary file not shown.
Binary file removed HORUS/SD/SCRIPTS/YAAPU/IMAGES/minihomegreen.png
Binary file not shown.
Binary file removed HORUS/SD/SCRIPTS/YAAPU/IMAGES/minihomeyellow.png
Binary file not shown.
Binary file removed HORUS/SD/SCRIPTS/YAAPU/IMAGES/spd.png
Binary file not shown.
Binary file removed HORUS/SD/SCRIPTS/YAAPU/IMAGES/spd_b.png
Binary file not shown.
Binary file removed HORUS/SD/SCRIPTS/YAAPU/IMAGES/variogauge.png
Binary file not shown.
Binary file removed HORUS/SD/SCRIPTS/YAAPU/IMAGES/variogauge_big.png
Binary file not shown.
Binary file removed HORUS/SD/SCRIPTS/YAAPU/IMAGES/varioline_big.png
Binary file not shown.
Binary file modified HORUS/SD/SCRIPTS/YAAPU/LIB/draw.luac
Binary file not shown.
Binary file modified HORUS/SD/SCRIPTS/YAAPU/LIB/hud_1.luac
Binary file not shown.
Binary file modified HORUS/SD/SCRIPTS/YAAPU/LIB/hud_2.luac
Binary file not shown.
Binary file modified HORUS/SD/SCRIPTS/YAAPU/LIB/hud_russian_2.luac
Binary file not shown.
Binary file modified HORUS/SD/SCRIPTS/YAAPU/LIB/hud_small_2.luac
Binary file not shown.
Binary file modified HORUS/SD/SCRIPTS/YAAPU/LIB/layout_1.luac
Binary file not shown.
Binary file modified HORUS/SD/SCRIPTS/YAAPU/LIB/layout_2.luac
Binary file not shown.
Binary file added HORUS/SD/SCRIPTS/YAAPU/LIB/layout_map.luac
Binary file not shown.
Binary file modified HORUS/SD/SCRIPTS/YAAPU/LIB/left_1.luac
Binary file not shown.
Binary file modified HORUS/SD/SCRIPTS/YAAPU/LIB/left_2.luac
Binary file not shown.
Binary file modified HORUS/SD/SCRIPTS/YAAPU/LIB/left_m2f_1.luac
Binary file not shown.
Binary file modified HORUS/SD/SCRIPTS/YAAPU/LIB/left_m2f_2.luac
Binary file not shown.
Binary file modified HORUS/SD/SCRIPTS/YAAPU/LIB/reset.luac
Binary file not shown.
Binary file modified HORUS/SD/SCRIPTS/YAAPU/LIB/right_1.luac
Binary file not shown.
Binary file modified HORUS/SD/SCRIPTS/YAAPU/LIB/right_2.luac
Binary file not shown.
Binary file modified HORUS/SD/SCRIPTS/YAAPU/LIB/right_custom_2.luac
Binary file not shown.
26 changes: 26 additions & 0 deletions HORUS/SD/SCRIPTS/YAAPU/MAPS/mktiles.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
@echo off
set MAGICK="%ProgramFiles%\ImageMagick-7.0.8-Q16\magick.exe"
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
if not exist %MAGICK% (
echo:
echo ERROR: Cannot find ImageMagick at path: %MAGICK%
goto end
)
set /A COUNTER=0
set /A SCOUNTER=0
for /R %%I in (*.png) do (
echo %%~nxI | findstr /b /r "[0-9]*\.png" >nul 2>&1
if errorlevel 1 (
echo skipping %%I
set /A SCOUNTER=SCOUNTER+1
) else (
echo processing %%I
%MAGICK% convert "%%I" %MAGICK_OPTS% "%%~dI%%~pIs_%%~nxI"
del /q "%%I"
set /A COUNTER=COUNTER+1
)
)
echo:
echo DONE: %COUNTER% images resized, %SCOUNTER% skipped
:end
pause
Binary file added HORUS/SD/SCRIPTS/YAAPU/MAPS/nomap.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 798f9a1

Please sign in to comment.