Skip to content

Commit c9aeca7

Browse files
yaapuyaapu
committed
Taranis version 1.9.5
- fix terrain error in CRSF RF Mode 1 - fix altitude reporting 0 with unhealthy terrain data - added support for TURTLE flight mode - added support for BLIMP vehicle
1 parent 179e4a3 commit c9aeca7

File tree

329 files changed

+3252
-9447
lines changed

Some content is hidden

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

329 files changed

+3252
-9447
lines changed

‎TARANIS/SD/MODELS/yaapu/cels_example_sensors.lua renamed to ‎TARANIS/SD/MODELS/yaapu/examples/flvss_sensors.lua

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,75 +7,75 @@ local sensors = {
77
"Celm", -- label
88
"Celm", -- OpenTX sensor name
99
2, -- precision: number of decimals 0,1,2
10-
"Vmin", -- label for unit of measure
10+
"V", -- label for unit of measure
1111
1, -- multiplier if < 1 than divides
1212
"-", -- "+" track max values, "-" track min values with
13-
1, -- 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)
13+
2, -- font size 1=small, 2=big
14+
nil, -- warning level (nil is do not use feature)
15+
nil, -- critical level (nil is do not use feature)
1616
},
1717

1818
-- Sensor 2
1919
[2]= {
2020
"Celd", -- label
2121
"Celd", -- OpenTX sensor name
2222
2, -- precision: number of decimals 0,1,2
23-
"Vdelta", -- label for unit of measure
23+
"V", -- label for unit of measure
2424
1, -- multiplier if < 1 than divides
2525
"+", -- "+" track max values, "-" track min values with
26-
1, -- font size 1=small, 2=big
27-
0.2, -- warning level (nil is do not use feature)
28-
0.4, -- critical level (nil is do not use feature)
26+
2, -- font size 1=small, 2=big
27+
nil, -- warning level (nil is do not use feature)
28+
nil, -- critical level (nil is do not use feature)
2929
},
3030

3131
-- Sensor 3
3232
[3]= {
33-
"Cel1", -- label
34-
"Cel1", -- OpenTX sensor name
33+
"Cel4", -- label
34+
"Cel4", -- OpenTX sensor name
3535
2, -- precision: number of decimals 0,1,2
36-
"V1", -- label for unit of measure
36+
"V", -- label for unit of measure
3737
1, -- multiplier if < 1 than divides
3838
"-", -- "+" track max values, "-" track min values with
39-
1, -- font size 1=small, 2=big
39+
2, -- font size 1=small, 2=big
4040
3.65, -- warning level (nil is do not use feature)
4141
3.30, -- critical level (nil is do not use feature)
4242
},
4343

4444
-- Sensor 4
4545
[4]= {
46-
"Cel2", -- label
47-
"Cel2", -- OpenTX sensor name
46+
"Cel3", -- label
47+
"Cel3", -- OpenTX sensor name
4848
2, -- precision: number of decimals 0,1,2
49-
"V2", -- label for unit of measure
49+
"V", -- label for unit of measure
5050
1, -- multiplier if < 1 than divides
5151
"-", -- "+" track max values, "-" track min values with
52-
1, -- font size 1=small, 2=big
52+
2, -- font size 1=small, 2=big
5353
3.65, -- warning level (nil is do not use feature)
5454
3.30, -- critical level (nil is do not use feature)
5555
},
5656

5757
-- Sensor 5
5858
[5]= {
59-
"Cel3", -- label
60-
"Cel3", -- OpenTX sensor name
59+
"Cel2", -- label
60+
"Cel2", -- OpenTX sensor name
6161
2, -- precision: number of decimals 0,1,2
62-
"V3", -- label for unit of measure
62+
"V", -- label for unit of measure
6363
1, -- multiplier if < 1 than divides
6464
"-", -- "+" track max values, "-" track min values with
65-
1, -- font size 1=small, 2=big
65+
2, -- font size 1=small, 2=big
6666
3.65, -- warning level (nil is do not use feature)
6767
3.30, -- critical level (nil is do not use feature)
6868
},
6969

7070
-- Sensor 6
7171
[6]= {
72-
"Cel4", -- label
73-
"Cel4", -- OpenTX sensor name
72+
"Cell", -- label
73+
"Cel1", -- OpenTX sensor name
7474
2, -- precision: number of decimals 0,1,2
75-
"V4", -- label for unit of measure
75+
"V", -- label for unit of measure
7676
1, -- multiplier if < 1 than divides
7777
"-", -- "+" track max values, "-" track min values with
78-
1, -- font size 1=small, 2=big
78+
2, -- font size 1=small, 2=big
7979
3.65, -- warning level (nil is do not use feature)
8080
3.30, -- critical level (nil is do not use feature)
8181
},

‎TARANIS/SD/MODELS/yaapu/examples/gsuite_sensors.lua

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
----------------------------------------
2+
-- custom sensors configuration file
3+
----------------------------------------
4+
--[[
5+
GRPc - residual percent
6+
GFlo - flow mL/min
7+
GMFl - max flow mL/min
8+
GAFl - avg flow mL/min
9+
GTp1 - temp 1 C°
10+
GTp2 - temp 2 C°
11+
GRPM - RPM
12+
13+
--]]
14+
local sensors = {
15+
-- Sensor 1
16+
[1]= {
17+
"Eng", -- label
18+
"GRPM", -- OpenTX sensor name
19+
0, -- precision: number of decimals 0,1,2
20+
"rpm", -- label for unit of measure
21+
1, -- multiplier if < 1 than divides
22+
"+", -- "+" track max values, "-" track min values with
23+
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)
26+
},
27+
-- Sensor 2
28+
[2]= {
29+
"Temp1", -- label
30+
"GTp1", -- OpenTX sensor name
31+
0, -- precision: number of decimals 0,1,2
32+
"C", -- label for unit of measure
33+
1, -- multiplier if < 1 than divides
34+
"+", -- "+" track max values, "-" track min values with
35+
2, -- font size 1=small, 2=big
36+
nil, -- warning level (nil is do not use feature)
37+
nil, -- critical level (nil is do not use feature)
38+
},
39+
40+
-- Sensor 3
41+
[3]= {
42+
"Temp2", -- label
43+
"GTp2", -- OpenTX sensor name
44+
0, -- precision: number of decimals 0,1,2
45+
"C", -- label for unit of measure
46+
1, -- multiplier if < 1 than divides
47+
"+", -- "+" track max values, "-" track min values with
48+
2, -- font size 1=small, 2=big
49+
nil, -- warning level (nil is do not use feature)
50+
nil, -- critical level (nil is do not use feature)
51+
},
52+
53+
-- Sensor 4
54+
[4]= {
55+
"Flow", -- label
56+
"GFlo", -- OpenTX sensor name
57+
0, -- precision: number of decimals 0,1,2
58+
"mL", -- label for unit of measure
59+
1, -- multiplier if < 1 than divides
60+
"+", -- "+" track max values, "-" track min values with
61+
2, -- font size 1=small, 2=big
62+
nil, -- warning level (nil is do not use feature)
63+
nil, -- critical level (nil is do not use feature)
64+
},
65+
66+
-- Sensor 5
67+
[5]= {
68+
"AFlow", -- label
69+
"GAFl", -- OpenTX sensor name
70+
0, -- precision: number of decimals 0,1,2
71+
"mL", -- label for unit of measure
72+
1, -- multiplier if < 1 than divides
73+
"+", -- "+" track max values, "-" track min values with
74+
2, -- font size 1=small, 2=big
75+
nil, -- warning level (nil is do not use feature)
76+
nil, -- critical level (nil is do not use feature)
77+
},
78+
79+
-- Sensor 6
80+
[6]= {
81+
"Fuel", -- label
82+
"GRpc", -- OpenTX sensor name
83+
0, -- precision: number of decimals 0,1,2
84+
"%", -- label for unit of measure
85+
1, -- multiplier if < 1 than divides
86+
"-", -- "+" track max values, "-" track min values with
87+
2, -- font size 1=small, 2=big
88+
nil, -- warning level (nil is do not use feature)
89+
nil, -- critical level (nil is do not use feature)
90+
},
91+
}
92+
------------------------------------------------------
93+
-- the script can optionally look up values here
94+
-- for each sensor and display the corresponding text instead
95+
-- as an example to associate a lookup table to sensor 3 declare it like
96+
--
97+
-- [3] = {
98+
-- [-10] = "ERR",
99+
-- [0] = "OK",
100+
-- [10] = "CRIT",
101+
-- }
102+
-- this would display the sensor value except when the value corresponds to one
103+
-- of entered above
104+
--
105+
local lookups = {
106+
-- lookup 2
107+
--[[
108+
[6] = {
109+
[-30] = "ERROR",
110+
[-20] = "OFF",
111+
[-10] = "COOL",
112+
[-1] = "LOCK",
113+
[0] = "STOP",
114+
[10] = "RUN",
115+
[20] = "REL",
116+
[25] = "GLOW",
117+
[30] = "SPIN",
118+
[40] = "FIRE",
119+
[45] = "IGNT",
120+
[50] = "HEAT",
121+
[60] = "ACCE",
122+
[65] = "CAL",
123+
[70] = "IDLE",
124+
},
125+
--]]
126+
}
127+
128+
collectgarbage()
129+
130+
return {
131+
sensors=sensors,lookups=lookups
132+
}

‎TARANIS/SD/MODELS/yaapu/examples/kerojet_sensors.lua

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
----------------------------------------
2+
-- custom sensors configuration file
3+
----------------------------------------
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+
--]]
12+
local sensors = {
13+
-- Sensor 1
14+
{
15+
"Pump", -- label
16+
"A4", -- OpenTX sensor name
17+
2, -- precision: number of decimals 0,1,2
18+
"V", -- label for unit of measure
19+
1, -- multiplier if < 1 than divides
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)
24+
},
25+
26+
-- Sensor 2
27+
{
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
37+
},
38+
39+
-- Sensor 3
40+
{
41+
"ENG", -- label
42+
"RPM", -- OpenTX sensor name
43+
2, -- 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+
1000, -- warning level
49+
2000, -- critical value
50+
},
51+
52+
-- Sensor 4
53+
{
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
63+
},
64+
65+
-- Sensor 5
66+
{
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
76+
},
77+
78+
-- Sensor 6
79+
{
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
89+
},
90+
}
91+
------------------------------------------------------
92+
-- the script can optionally look up values here
93+
-- for each sensor and display the corresponding text instead
94+
-- as an example to associate a lookup table to sensor 3 declare it like
95+
--
96+
-- [3] = {
97+
-- [-10] = "ERR",
98+
-- [0] = "OK",
99+
-- [10] = "CRIT",
100+
-- }
101+
-- this would display the sensor value except when the value corresponds to one
102+
-- of entered above
103+
--
104+
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+
},
123+
}
124+
125+
collectgarbage()
126+
127+
return {
128+
sensors=sensors,lookups=lookups
129+
}

0 commit comments

Comments
 (0)