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