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