Rev 2225 | Rev 2598 | Go to most recent revision | Details | Compare with Previous | Last modification | View Log | RSS feed
Rev | Author | Line No. | Line |
---|---|---|---|
1468 | - | 1 | /**************************************************************************** |
2225 | - | 2 | * Copyright (C) 2009-2016 by Claas Anders "CaScAdE" Rathje * |
321 | cascade | 3 | * admiralcascade@gmail.com * |
4 | * Project-URL: http://www.mylifesucks.de/oss/c-osd/ * |
||
5 | * * |
||
6 | * This program is free software; you can redistribute it and/or modify * |
||
7 | * it under the terms of the GNU General Public License as published by * |
||
8 | * the Free Software Foundation; either version 2 of the License. * |
||
9 | * * |
||
10 | * This program is distributed in the hope that it will be useful, * |
||
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of * |
||
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * |
||
13 | * GNU General Public License for more details. * |
||
14 | * * |
||
15 | * You should have received a copy of the GNU General Public License * |
||
16 | * along with this program; if not, write to the * |
||
17 | * Free Software Foundation, Inc., * |
||
18 | * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * |
||
19 | ****************************************************************************/ |
||
2041 | - | 20 | |
2569 | - | 21 | 20161212-0845 |
22 | *adapted structs to reflect FC/NC software V2.16a |
||
23 | |||
2225 | - | 24 | 20160302-0700 |
25 | *adapted structs to reflect FC/NC software V2.14a |
||
26 | |||
2217 | - | 27 | 20151026-0630 |
28 | *adapted structs to reflect FC/NC software V2.12a |
||
29 | |||
2099 | - | 30 | 20150427-2145 |
31 | *adapted structs to reflect FC/NC software V2.10a/b |
||
32 | |||
2075 | - | 33 | 20141015-2300 |
34 | *adapted structs to reflect FC/NC software V2.08a |
||
35 | *changed hanging to 2min wait in case of version missmatch |
||
36 | |||
2043 | - | 37 | 20140415-2130 |
38 | *adapted structs to reflect FC/NC software V2.06a |
||
39 | *added version check for FC/NC software |
||
40 | (OSD will hang at init in case version do not match) |
||
41 | |||
2041 | - | 42 | 20140317-1730 |
43 | *fixed battery-voltage >254 crash |
||
44 | |||
2039 | - | 45 | 20140313-2230 |
46 | *adapted structs to reflect FC/NC software V2.04a |
||
497 | cascade | 47 | |
2009 | - | 48 | 20130824-1115 |
49 | *fixed FC-only mode |
||
50 | |||
1992 | - | 51 | 20130622-2030 |
2000 | - | 52 | *adapted settings struct to FC software 0.90L |
53 | |||
54 | 20130622-2030 |
||
1992 | - | 55 | *adapted settings struct to FC software 0.90j |
56 | |||
1951 | - | 57 | 20130401-1216 |
58 | *fixed display of mAh from C-Strom |
||
59 | *fixed ppm crash due do underflow |
||
60 | |||
1866 | - | 61 | 20130218-2030 |
62 | +Source option to set the Aggr.Horizon indicator bars on the same |
||
63 | level as the horizon |
||
64 | |||
1801 | - | 65 | 20121127-2120 |
66 | +No FC communication define in config for usage with NC and no FC |
||
67 | *memcpy stuff instead of inplace buffer to unlock the buffer faster |
||
68 | +prepared the 3D Data stuff |
||
69 | |||
1773 | - | 70 | 20121105-1135 |
71 | *attemp to fix errors when building with GCC 4.7 |
||
72 | |||
1771 | - | 73 | 20121102-1245 |
74 | *small init fix for display modes |
||
75 | *small change in ppm handling |
||
76 | |||
1706 | - | 77 | 20120723-1900 |
78 | *expanded ampere wasted to 5digits in nc_mode_default |
||
79 | |||
1593 | - | 80 | 20120329-1324 |
81 | *corrected bug in stats which caused maximal current to be overwritten |
||
82 | |||
1591 | - | 83 | 20120328-1000 |
84 | *setting struct adapted to V0.88e |
||
85 | @caused wrong setting-name display |
||
86 | |||
1468 | - | 87 | 20120114-2235 |
88 | *setting struct adapted to V0.86d |
||
89 | @caused wrong setting-name display |
||
90 | |||
1281 | - | 91 | 20110921-1425 |
92 | +logo support |
||
93 | @there is a logo in the new character definitions |
||
94 | @to see it you will have to reflash characters |
||
95 | @insert your own logo if you like to, see osd-logo.png as example |
||
96 | @and use http://www.mylifesucks.de/tools/max7456/ |
||
97 | |||
1197 | - | 98 | 20110825-1000 |
99 | *initial testing stuff for -45° rotated flights (X instead of +) |
||
100 | *some minor code changes |
||
101 | |||
955 | - | 102 | 20110605-1045 |
103 | *possible fix of the previous ugly RSSI hack |
||
104 | |||
954 | - | 105 | 20110604-1615 |
106 | +really ugly (untested) hack to get ACT DSL RSSI information in FC-Only mode |
||
107 | |||
952 | - | 108 | 20110523-1635 |
109 | *fixed statistics-accumulation in minimal-screen. |
||
110 | |||
942 | - | 111 | 20110331-1805 |
112 | +added possibility to blank the display with SJ1 (SJ1 closed = no HUD) |
||
113 | |||
941 | - | 114 | 20110331-1200 |
115 | *small adaption to NC 0.24b and FC 0.84a |
||
116 | *added CF-indicator icon |
||
117 | @To see the correct CF-indicator you will have to flash the characters! |
||
118 | |||
932 | - | 119 | 20110307-1845 |
120 | *added debug output option for MAX7456 emulation |
||
121 | *moved horizon one line higher when displaying GPS-Coordinates |
||
122 | *fixed small glitch in menu |
||
123 | |||
902 | - | 124 | 20110202-1323 |
125 | *added big speed indicator (credits to: uwerner) |
||
126 | *added possibility to show GPS-Coordinates during flight |
||
127 | *added more _brackets_ |
||
128 | @To see correct corner-chars when using scope, flash the character-set |
||
129 | included in this release! |
||
130 | |||
837 | - | 131 | 20101218-2030 |
132 | *added _brackets_ to mark a scope when using a second camera |
||
133 | (might help to remember what the second camera is filming) |
||
134 | @To see real corners, flash the new character-set included in this release! |
||
135 | |||
835 | - | 136 | 20101116-2110 |
137 | *increased buffer so the new config struct really fits (fixes garbage after setting name) |
||
138 | *fixed GPS-blink on startup |
||
139 | *re-enable some ascii-char mappings (some people do have underscores in their setting-names) |
||
140 | |||
833 | - | 141 | 20101115-2115 |
142 | *inserted missing new value in config-struct. should fix setting-name. |
||
143 | |||
832 | - | 144 | 20101115-0800 |
145 | *updated structs and flags to fit FC 0.80a && NC 0.20a |
||
146 | *sat-icon will blink when not enough sats are found (nc_mode_default) |
||
826 | - | 147 | |
148 | 20101008-0945 |
||
149 | *fixed EPi-Strom voltage-display when using FC-Ampere |
||
150 | |||
151 | 20101007-1555 |
||
152 | *added passive option: OSD will NOT request data after bootup |
||
153 | |||
809 | - | 154 | 20100908-2335 |
826 | - | 155 | *fixed height-offset causing different height values in OSD compared to MK-Tool when using baro-height (thx Neo360) |
809 | - | 156 | |
800 | - | 157 | 20100822-2300 |
826 | - | 158 | *removed debug-leftover in ppm.c (thx OktoMac) |
159 | *made number display-routines more stable when big numbers occur |
||
800 | - | 160 | |
787 | - | 161 | 20100803-0355 |
826 | - | 162 | *removed constantly requests for the NC Uart in NC mode which |
163 | caused problems when using OSD/MKTool at the same time |
||
787 | - | 164 | |
783 | - | 165 | 20100730-1345 |
826 | - | 166 | *added current setting display |
167 | *updated structs for FC 0.80 and NC 0.20 (old version will still work, just cosmetics) |
||
168 | *battery warn level now _can_ be taken from the FC-Settings |
||
169 | *corrected some defines so FC stuff is only in FC Builds and NC stuff only in NC builds |
||
783 | - | 170 | |
772 | - | 171 | 20100701-1745 |
826 | - | 172 | *hopefully fixed altimeter-stats |
173 | *some basic antenna tracking insertion for others to test |
||
766 | - | 174 | |
767 | - | 175 | 20100613-2255 |
826 | - | 176 | *corrected heigth-division-factor when using baro-height |
766 | - | 177 | |
762 | - | 178 | 20100531-1530 |
826 | - | 179 | *fixed bug in stats when max-distance > 999m |
762 | - | 180 | |
761 | - | 181 | 20100501-1130 |
826 | - | 182 | *distance to home now 4 digits for long distance flights |
183 | *max height and speed shown again in stats |
||
184 | *clear full screen before stats shown so the art-horizon does not bug us |
||
761 | - | 185 | |
758 | cascade | 186 | 20100419-0020 |
826 | - | 187 | *fixed bug causing PPM-based display on/off to fail |
188 | *fixed display of AGRESSiVA-horizion during motor run |
||
758 | cascade | 189 | |
757 | cascade | 190 | 20100412-2125 |
826 | - | 191 | *added mph/ft (two new chars added, reflash characters if you need ft/mph) |
192 | *AGRESSiVA-horizion now switchable via menu |
||
193 | *reworked menu a bit |
||
194 | *switched from -O2 to -Os because of the added stuff |
||
757 | cascade | 195 | |
753 | cascade | 196 | 20100403-0115 |
826 | - | 197 | *RC-RSSI now shown if available (RC_Quality is still fallback, still needs FC patch) |
198 | +AGRESSiVA-horizion to main trunk (NEW_ARTHORIZON 1 to test, needs new chars) |
||
199 | +chars needed for above mod to chars.mcm and chars.c |
||
753 | cascade | 200 | |
738 | cascade | 201 | 20100218-2330 |
826 | - | 202 | *hopefully fixed the laggy osd data problem |
203 | -send_data_mk has been striked out to save space |
||
204 | @nc-mode should be small enough for bootloader again ( Program: 14986 bytes (91.5% Full) ) |
||
738 | cascade | 205 | |
736 | cascade | 206 | 20100216-1430 |
826 | - | 207 | *some menu stuff |
208 | *stats in nc_default do not disturb the bigvario anymore |
||
209 | *reduced code size from 16088 bytes (98.2% Full) 15436 bytes (94.2% Full) |
||
736 | cascade | 210 | |
734 | cascade | 211 | 20100214-1700 |
826 | - | 212 | +mah wasted per flight (still counts up after landing, but space gets tight) |
213 | *init phase from 2000ms to 3000ms |
||
214 | *init only takes place after first "valid" UBat is received (<4V should case the Mega to reset anyways) |
||
734 | cascade | 215 | |
728 | cascade | 216 | 20100212-2310 |
826 | - | 217 | *adapted MK-datastructs to NC 0.18c |
218 | *added choice for current display measured by FC |
||
728 | cascade | 219 | |
685 | cascade | 220 | 20091109-1100 |
826 | - | 221 | +fc-only mode by Josef "jopl" Plasil (MK3Mag on FC and no NC) |
222 | *usart1 routine to filter out unwanted datasets (also big thanks to jopl) |
||
685 | cascade | 223 | |
677 | cascade | 224 | 20091102-2205 |
826 | - | 225 | +nc/fc software version display in bootup |
226 | *changed checkbytes because of previously removed EEPROM data |
||
677 | cascade | 227 | |
228 | 20091030-2222 |
||
229 | *synced NaviStruct to NC Code v0.17e |
||
230 | (since nothing of the new stuff is used right now, older NC version will still work) |
||
231 | |||
528 | cascade | 232 | 20090714-2100 |
233 | *fixed the flags (hopefully) for C-Strom and stuff |
||
234 | |||
523 | cascade | 235 | 20090706-2000 |
826 | - | 236 | *hopefully fixed the new 10th number showing functions |
237 | +support for GPS height instead of Baro |
||
523 | cascade | 238 | |
519 | cascade | 239 | 20090703-0005 |
826 | - | 240 | *write-number-functions changed, using itoa now, saves space, should be faster |
241 | *inline added for basic max7456-spi_send because saves procedure call (^= time) |
||
519 | cascade | 242 | |
514 | cascade | 243 | 20090627-1415 |
244 | *ALL characters now in Progmem, from now on there will be only ONE char-file! |
||
245 | |||
507 | cascade | 246 | 20090612-2100 |
826 | - | 247 | *spi transfer now struct driven (needs C-Strom 20090612-2100 now!!!) |
248 | *lesser spi update rate (caused problems on some strom-slaves) |
||
249 | *voltage gets transfered via spi as well |
||
250 | *menu to switch display of 2nd voltage measured by C-Strom on and off |
||
507 | cascade | 251 | |
499 | cascade | 252 | 20090604-1350 |
253 | *bugfix for stats |
||
507 | cascade | 254 | |
497 | cascade | 255 | 20090604-1330 |
256 | *possible to choose between different osd-layouts (via menu) |
||
499 | cascade | 257 | |
497 | cascade | 258 | 20090604-0700 |
259 | +(shaddi)osd_ncmode_minimal for less symbols during FPV |
||
260 | |||
489 | woggle | 261 | 20090601-2233 |
262 | *(woggle) changed timer init an interupt to be more precise |
||
263 | *(woggle) remove all warning during compile |
||
264 | *(woggle) simplify draw_big_variometer |
||
265 | *(woggle) put compass rose to PROGMEM |
||
266 | *(woggle) put directions array to PROGMEM |
||
389 | cascade | 267 | |
478 | cascade | 268 | 20090525-2305 |
477 | cascade | 269 | +HUD on/off via RC (connect to PPM, according to manual) testing stuff |
270 | |||
474 | cascade | 271 | 20090523-1150 |
272 | +pal/ntsc changable in menu (applied immedeately!) |
||
273 | |||
471 | cascade | 274 | 20090519-2245 |
826 | - | 275 | *mah corrected |
276 | +config gets saved now (menu item!) |
||
277 | *source moved a bit |
||
471 | cascade | 278 | |
468 | cascade | 279 | 20090519-0115 |
826 | - | 280 | +mah currently wasted |
281 | *some small changes |
||
468 | cascade | 282 | |
467 | cascade | 283 | 20090517-2345 |
284 | *modded the real alpha stuff i have been talking about below |
||
468 | cascade | 285 | |
465 | cascade | 286 | 20090516-2345 |
287 | +some really testing stuff 'bout current measurement, more to come |
||
288 | |||
459 | cascade | 289 | 20090513-2350 |
290 | *cellnumber autoconfig modified, offset set to 1,5V |
||
291 | *copy paste nick/roll error fixed |
||
292 | *clean after build in dist.sh |
||
293 | +a little shellscript to auto-build the files (testing) |
||
294 | *osd-layouts in seperate files so including own layouts should get easier |
||
295 | +build date is displayed during init to know which version you are runing |
||
296 | |||
297 | 20090513-1040 |
||
826 | - | 298 | *some code movement |
299 | +artificial horizon for FC-ONLY mode |
||
459 | cascade | 300 | |
454 | cascade | 301 | 20090512-2100 |
826 | - | 302 | +some FCONLY basics (set FCONLY to 1 in main.h to use it) |
459 | cascade | 303 | |
453 | cascade | 304 | 20090511-2345 |
826 | - | 305 | *battery voltages now calculated according to CELL_VOLT_MIN CELL_VOLT_MAX and CELL_NUM |
306 | *CELL_NUM -1 causes a rough auto detection of cell number |
||
307 | -UBAT_WRN and UBAT_MAX are now deprecated |
||
453 | cascade | 308 | |
412 | cascade | 309 | 20090427-2315 |
826 | - | 310 | +write_gps_pos(...) (needs to be tested) |
311 | +gps position is shown in stats screen for testing purpose |
||
412 | cascade | 312 | |
410 | shaddi | 313 | 20090427-2131 |
826 | - | 314 | *stats are only collected while engines running (shaddi) |
410 | shaddi | 315 | |
409 | shaddi | 316 | 20090427-2102 |
826 | - | 317 | *fixed maximum distance in stats (shaddi) |
409 | shaddi | 318 | |
407 | cascade | 319 | 20090427-2050 |
826 | - | 320 | *clear() now faster |
321 | *fixed calculation of max speed in stats (shaddi) |
||
322 | *littel typo in artificial horizon (thx joko) |
||
323 | *stats are only shown AFTER flight (more specific, after motors had been on at least once) |
||
324 | +indication icon for serial link (requires new character 198) |
||
325 | +indication icon for manual controll (stick > stick threshold) |
||
326 | (Character set 192 needs to be reflashed since new icon is in it) |
||
407 | cascade | 327 | |
389 | cascade | 328 | 20090420-0205 |
826 | - | 329 | *reset-bug fixed |
330 | *moved code a bit |
||
407 | cascade | 331 | |
387 | cascade | 332 | 20090419-2145 |
333 | *reset-bug workaround in usart1.c: usart1_DisableTXD and usart1_EnableTXD |
||
379 | cascade | 334 | |
386 | cascade | 335 | 20090419-1900 |
336 | *fixed bug in heading-fine conv for bearing to home |
||
337 | |||
385 | cascade | 338 | 20090419-1245 |
339 | *compass characters bigger |
||
340 | *battery position |
||
341 | +voltage-symbol to battery-voltage |
||
342 | (Character Set 208 needs to be reflashed since compass chars are in it) |
||
343 | |||
383 | cascade | 344 | 20090418-2015 |
345 | *fixed bug in Character Set 128 (reflash it if you already flashed it!) |
||
385 | cascade | 346 | +another set of vario chars |
383 | cascade | 347 | *changed vario to use new characters |
348 | *moved vario/home-bearing positions |
||
385 | cascade | 349 | *big vario now enabled via menu or BIGVARIO |
383 | cascade | 350 | (Character Set 112 needs to be flashed) |
385 | cascade | 351 | |
379 | cascade | 352 | 20090418-1235 |
353 | +big vario for testing purpose |
||
354 | (Character Set 192 needs to be flashed) |
||
383 | cascade | 355 | |
377 | cascade | 356 | 20090418-0100 |
357 | *variometer uses more steps (9 instead of 5) |
||
800 | - | 358 | *home-arrow is now home-clock using more steps (22,5� resolution) |
377 | cascade | 359 | +visual battery-gauge according to difference between UBAT_WRN and UBAT_MAX |
321 | cascade | 360 | |
375 | cascade | 361 | 20090417-1115 |
362 | *changed calculation of km/h (thx wowie) |
||
363 | *added JochenK_(joko)'s characters |
||
364 | (Character-Sets 128, 136, 144, 152, 160, 168, 176 and 184 need to be flashed!) |
||
365 | |||
367 | cascade | 366 | 20090408-1245 (shaddi) |
367 | *fixed distance towards home |
||
368 | |||
349 | cascade | 369 | 20090408-0035 |
370 | *rewrote number->display functions |
||
371 | *fixed height bug (uint vs int) |
||
372 | |||
346 | cascade | 373 | 20090407-2100 |
826 | - | 374 | +added request of OSD data, disrequest of debug data and uptime reset to menu |
375 | -removed the uptime-reset binding from S2 |
||
376 | +pgm space for some strings to save _normal_ data space |
||
377 | *some code movement |
||
346 | cascade | 378 | |
339 | cascade | 379 | 20090406-0130 |
380 | *MK-Datastruct updated to work with NaviCtrl 0.15c firmware |
||
381 | *changed flags from NO* to invers versions |
||
382 | *enhanced the menu a bit |
||
383 | -artificial horizon at bootup, the menu is cooler imho |
||
384 | |||
336 | cascade | 385 | 20090405-0207 |
386 | +NOOSD as requested |
||
387 | *height now corrected (thx lephisto) and displayed as .x up to 10m |
||
388 | |||
331 | cascade | 389 | 20090402-0106 |
390 | + disabling the txd pin while not using it so it won't interfere with KopterTool usage (thx joko) |
||
391 | + if no data has been received for over 2sec we re-request it |
||
392 | * tried source organisation a bit |
||
393 | |||
330 | shaddi | 394 | 20090401-1741 (shaddi) |
395 | + More precise Veriometer. Uses more more characters to show the speed of the movement |
||
826 | - | 396 | (Character-Set 232 needs to be flashed!) |
331 | cascade | 397 | |
326 | cascade | 398 | 20090331-1549 |
399 | + simple config menu during runtime, press S1 to jump in, S2 to cyle and S1 to accept choice |
||
400 | - S1 no longer requests the NC data |
||
331 | cascade | 401 | |
324 | cascade | 402 | 20090331-1305 |
403 | + added more statistics |
||
404 | * corrected S1/S2 mapping (d'oh) |
||
405 | + started simple mode controll, press S2 during bootup toggles artificial horizon |
||
406 | |||
321 | cascade | 407 | 20090329-1452 |
324 | cascade | 408 | * fixed bearing to home |
409 | + added flight stats (shown while engines off) |
||
410 | + sat icon should indicate PH/CH/Free now |
||
411 | + you need to flash characters 224-231 if you were using previous versions |
||
321 | cascade | 412 | |
413 | 20090327-2140 |
||
324 | cascade | 414 | * fixed km/h (was cm/s) |
415 | * fixed height m (was dm) |
||
416 | * modified incoming data speed to 100ms (was 200ms) |
||
321 | cascade | 417 | |
418 | 20090326-2031 |
||
677 | cascade | 419 | + first binary release |