Rev 800 | Rev 826 | Go to most recent revision | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 800 | Rev 809 | ||
---|---|---|---|
1 | /**************************************************************************** |
1 | /**************************************************************************** |
2 | * Copyright (C) 2009-2010 by Claas Anders "CaScAdE" Rathje * |
2 | * Copyright (C) 2009-2010 by Claas Anders "CaScAdE" Rathje * |
3 | * admiralcascade@gmail.com * |
3 | * admiralcascade@gmail.com * |
4 | * Project-URL: http://www.mylifesucks.de/oss/c-osd/ * |
4 | * Project-URL: http://www.mylifesucks.de/oss/c-osd/ * |
5 | * * |
5 | * * |
6 | * This program is free software; you can redistribute it and/or modify * |
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 * |
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. * |
8 | * the Free Software Foundation; either version 2 of the License. * |
9 | * * |
9 | * * |
10 | * This program is distributed in the hope that it will be useful, * |
10 | * This program is distributed in the hope that it will be useful, * |
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of * |
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of * |
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * |
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * |
13 | * GNU General Public License for more details. * |
13 | * GNU General Public License for more details. * |
14 | * * |
14 | * * |
15 | * You should have received a copy of the GNU General Public License * |
15 | * You should have received a copy of the GNU General Public License * |
16 | * along with this program; if not, write to the * |
16 | * along with this program; if not, write to the * |
17 | * Free Software Foundation, Inc., * |
17 | * Free Software Foundation, Inc., * |
18 | * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * |
18 | * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * |
19 | ****************************************************************************/ |
19 | ****************************************************************************/ |
- | 20 | ||
- | 21 | 20100908-2335 |
|
- | 22 | *fixed height-offset causing different height values in OSD compared to MK-Tool when using baro-height (thx Neo360) |
|
20 | 23 | ||
21 | 20100822-2300 |
24 | 20100822-2300 |
22 | *removed debug-leftover in ppm.c (thx OktoMac) |
25 | *removed debug-leftover in ppm.c (thx OktoMac) |
23 | *made number display-routines more stable when big numbers occur |
26 | *made number display-routines more stable when big numbers occur |
24 | 27 | ||
25 | 20100803-0355 |
28 | 20100803-0355 |
26 | *removed constantly requests for the NC Uart in NC mode which |
29 | *removed constantly requests for the NC Uart in NC mode which |
27 | caused problems when using OSD/MKTool at the same time |
30 | caused problems when using OSD/MKTool at the same time |
28 | 31 | ||
29 | 20100730-1345 |
32 | 20100730-1345 |
30 | *added current setting display |
33 | *added current setting display |
31 | *updated structs for FC 0.80 and NC 0.20 (old version will still work, just cosmetics) |
34 | *updated structs for FC 0.80 and NC 0.20 (old version will still work, just cosmetics) |
32 | *battery warn level now _can_ be taken from the FC-Settings |
35 | *battery warn level now _can_ be taken from the FC-Settings |
33 | *corrected some defines so FC stuff is only in FC Builds and NC stuff only in NC builds |
36 | *corrected some defines so FC stuff is only in FC Builds and NC stuff only in NC builds |
34 | 37 | ||
35 | 20100701-1745 |
38 | 20100701-1745 |
36 | *hopefully fixed altimeter-stats |
39 | *hopefully fixed altimeter-stats |
37 | *some basic antenna tracking insertion for others to test |
40 | *some basic antenna tracking insertion for others to test |
38 | 41 | ||
39 | 20100613-2255 |
42 | 20100613-2255 |
40 | *corrected heigth-division-factor when using baro-height |
43 | *corrected heigth-division-factor when using baro-height |
41 | 44 | ||
42 | 20100531-1530 |
45 | 20100531-1530 |
43 | *fixed bug in stats when max-distance > 999m |
46 | *fixed bug in stats when max-distance > 999m |
44 | 47 | ||
45 | 20100501-1130 |
48 | 20100501-1130 |
46 | *distance to home now 4 digits for long distance flights |
49 | *distance to home now 4 digits for long distance flights |
47 | *max height and speed shown again in stats |
50 | *max height and speed shown again in stats |
48 | *clear full screen before stats shown so the art-horizon does not bug us |
51 | *clear full screen before stats shown so the art-horizon does not bug us |
49 | 52 | ||
50 | 20100419-0020 |
53 | 20100419-0020 |
51 | *fixed bug causing PPM-based display on/off to fail |
54 | *fixed bug causing PPM-based display on/off to fail |
52 | *fixed display of AGRESSiVA-horizion during motor run |
55 | *fixed display of AGRESSiVA-horizion during motor run |
53 | 56 | ||
54 | 20100412-2125 |
57 | 20100412-2125 |
55 | *added mph/ft (two new chars added, reflash characters if you need ft/mph) |
58 | *added mph/ft (two new chars added, reflash characters if you need ft/mph) |
56 | *AGRESSiVA-horizion now switchable via menu |
59 | *AGRESSiVA-horizion now switchable via menu |
57 | *reworked menu a bit |
60 | *reworked menu a bit |
58 | *switched from -O2 to -Os because of the added stuff |
61 | *switched from -O2 to -Os because of the added stuff |
59 | 62 | ||
60 | 20100403-0115 |
63 | 20100403-0115 |
61 | *RC-RSSI now shown if available (RC_Quality is still fallback, still needs FC patch) |
64 | *RC-RSSI now shown if available (RC_Quality is still fallback, still needs FC patch) |
62 | +AGRESSiVA-horizion to main trunk (NEW_ARTHORIZON 1 to test, needs new chars) |
65 | +AGRESSiVA-horizion to main trunk (NEW_ARTHORIZON 1 to test, needs new chars) |
63 | +chars needed for above mod to chars.mcm and chars.c |
66 | +chars needed for above mod to chars.mcm and chars.c |
64 | 67 | ||
65 | 20100218-2330 |
68 | 20100218-2330 |
66 | *hopefully fixed the laggy osd data problem |
69 | *hopefully fixed the laggy osd data problem |
67 | -send_data_mk has been striked out to save space |
70 | -send_data_mk has been striked out to save space |
68 | @nc-mode should be small enough for bootloader again ( Program: 14986 bytes (91.5% Full) ) |
71 | @nc-mode should be small enough for bootloader again ( Program: 14986 bytes (91.5% Full) ) |
69 | 72 | ||
70 | 20100216-1430 |
73 | 20100216-1430 |
71 | *some menu stuff |
74 | *some menu stuff |
72 | *stats in nc_default do not disturb the bigvario anymore |
75 | *stats in nc_default do not disturb the bigvario anymore |
73 | *reduced code size from 16088 bytes (98.2% Full) 15436 bytes (94.2% Full) |
76 | *reduced code size from 16088 bytes (98.2% Full) 15436 bytes (94.2% Full) |
74 | 77 | ||
75 | 20100214-1700 |
78 | 20100214-1700 |
76 | +mah wasted per flight (still counts up after landing, but space gets tight) |
79 | +mah wasted per flight (still counts up after landing, but space gets tight) |
77 | *init phase from 2000ms to 3000ms |
80 | *init phase from 2000ms to 3000ms |
78 | *init only takes place after first "valid" UBat is received (<4V should case the Mega to reset anyways) |
81 | *init only takes place after first "valid" UBat is received (<4V should case the Mega to reset anyways) |
79 | 82 | ||
80 | 20100212-2310 |
83 | 20100212-2310 |
81 | *adapted MK-datastructs to NC 0.18c |
84 | *adapted MK-datastructs to NC 0.18c |
82 | *added choice for current display measured by FC |
85 | *added choice for current display measured by FC |
83 | 86 | ||
84 | 20091109-1100 |
87 | 20091109-1100 |
85 | +fc-only mode by Josef "jopl" Plasil (MK3Mag on FC and no NC) |
88 | +fc-only mode by Josef "jopl" Plasil (MK3Mag on FC and no NC) |
86 | *usart1 routine to filter out unwanted datasets (also big thanks to jopl) |
89 | *usart1 routine to filter out unwanted datasets (also big thanks to jopl) |
87 | 90 | ||
88 | 20091102-2205 |
91 | 20091102-2205 |
89 | +nc/fc software version display in bootup |
92 | +nc/fc software version display in bootup |
90 | *changed checkbytes because of previously removed EEPROM data |
93 | *changed checkbytes because of previously removed EEPROM data |
91 | 94 | ||
92 | 20091030-2222 |
95 | 20091030-2222 |
93 | *synced NaviStruct to NC Code v0.17e |
96 | *synced NaviStruct to NC Code v0.17e |
94 | (since nothing of the new stuff is used right now, older NC version will still work) |
97 | (since nothing of the new stuff is used right now, older NC version will still work) |
95 | 98 | ||
96 | 20090714-2100 |
99 | 20090714-2100 |
97 | *fixed the flags (hopefully) for C-Strom and stuff |
100 | *fixed the flags (hopefully) for C-Strom and stuff |
98 | 101 | ||
99 | 20090706-2000 |
102 | 20090706-2000 |
100 | *hopefully fixed the new 10th number showing functions |
103 | *hopefully fixed the new 10th number showing functions |
101 | +support for GPS height instead of Baro |
104 | +support for GPS height instead of Baro |
102 | 105 | ||
103 | 20090703-0005 |
106 | 20090703-0005 |
104 | *write-number-functions changed, using itoa now, saves space, should be faster |
107 | *write-number-functions changed, using itoa now, saves space, should be faster |
105 | *inline added for basic max7456-spi_send because saves procedure call (^= time) |
108 | *inline added for basic max7456-spi_send because saves procedure call (^= time) |
106 | 109 | ||
107 | 20090627-1415 |
110 | 20090627-1415 |
108 | *ALL characters now in Progmem, from now on there will be only ONE char-file! |
111 | *ALL characters now in Progmem, from now on there will be only ONE char-file! |
109 | 112 | ||
110 | 20090612-2100 |
113 | 20090612-2100 |
111 | *spi transfer now struct driven (needs C-Strom 20090612-2100 now!!!) |
114 | *spi transfer now struct driven (needs C-Strom 20090612-2100 now!!!) |
112 | *lesser spi update rate (caused problems on some strom-slaves) |
115 | *lesser spi update rate (caused problems on some strom-slaves) |
113 | *voltage gets transfered via spi as well |
116 | *voltage gets transfered via spi as well |
114 | *menu to switch display of 2nd voltage measured by C-Strom on and off |
117 | *menu to switch display of 2nd voltage measured by C-Strom on and off |
115 | 118 | ||
116 | 20090604-1350 |
119 | 20090604-1350 |
117 | *bugfix for stats |
120 | *bugfix for stats |
118 | 121 | ||
119 | 20090604-1330 |
122 | 20090604-1330 |
120 | *possible to choose between different osd-layouts (via menu) |
123 | *possible to choose between different osd-layouts (via menu) |
121 | 124 | ||
122 | 20090604-0700 |
125 | 20090604-0700 |
123 | +(shaddi)osd_ncmode_minimal for less symbols during FPV |
126 | +(shaddi)osd_ncmode_minimal for less symbols during FPV |
124 | 127 | ||
125 | 20090601-2233 |
128 | 20090601-2233 |
126 | *(woggle) changed timer init an interupt to be more precise |
129 | *(woggle) changed timer init an interupt to be more precise |
127 | *(woggle) remove all warning during compile |
130 | *(woggle) remove all warning during compile |
128 | *(woggle) simplify draw_big_variometer |
131 | *(woggle) simplify draw_big_variometer |
129 | *(woggle) put compass rose to PROGMEM |
132 | *(woggle) put compass rose to PROGMEM |
130 | *(woggle) put directions array to PROGMEM |
133 | *(woggle) put directions array to PROGMEM |
131 | 134 | ||
132 | 20090525-2305 |
135 | 20090525-2305 |
133 | +HUD on/off via RC (connect to PPM, according to manual) testing stuff |
136 | +HUD on/off via RC (connect to PPM, according to manual) testing stuff |
134 | 137 | ||
135 | 20090523-1150 |
138 | 20090523-1150 |
136 | +pal/ntsc changable in menu (applied immedeately!) |
139 | +pal/ntsc changable in menu (applied immedeately!) |
137 | 140 | ||
138 | 20090519-2245 |
141 | 20090519-2245 |
139 | *mah corrected |
142 | *mah corrected |
140 | +config gets saved now (menu item!) |
143 | +config gets saved now (menu item!) |
141 | *source moved a bit |
144 | *source moved a bit |
142 | 145 | ||
143 | 20090519-0115 |
146 | 20090519-0115 |
144 | +mah currently wasted |
147 | +mah currently wasted |
145 | *some small changes |
148 | *some small changes |
146 | 149 | ||
147 | 20090517-2345 |
150 | 20090517-2345 |
148 | *modded the real alpha stuff i have been talking about below |
151 | *modded the real alpha stuff i have been talking about below |
149 | 152 | ||
150 | 20090516-2345 |
153 | 20090516-2345 |
151 | +some really testing stuff 'bout current measurement, more to come |
154 | +some really testing stuff 'bout current measurement, more to come |
152 | 155 | ||
153 | 20090513-2350 |
156 | 20090513-2350 |
154 | *cellnumber autoconfig modified, offset set to 1,5V |
157 | *cellnumber autoconfig modified, offset set to 1,5V |
155 | *copy paste nick/roll error fixed |
158 | *copy paste nick/roll error fixed |
156 | *clean after build in dist.sh |
159 | *clean after build in dist.sh |
157 | +a little shellscript to auto-build the files (testing) |
160 | +a little shellscript to auto-build the files (testing) |
158 | *osd-layouts in seperate files so including own layouts should get easier |
161 | *osd-layouts in seperate files so including own layouts should get easier |
159 | +build date is displayed during init to know which version you are runing |
162 | +build date is displayed during init to know which version you are runing |
160 | 163 | ||
161 | 20090513-1040 |
164 | 20090513-1040 |
162 | *some code movement |
165 | *some code movement |
163 | +artificial horizon for FC-ONLY mode |
166 | +artificial horizon for FC-ONLY mode |
164 | 167 | ||
165 | 20090512-2100 |
168 | 20090512-2100 |
166 | +some FCONLY basics (set FCONLY to 1 in main.h to use it) |
169 | +some FCONLY basics (set FCONLY to 1 in main.h to use it) |
167 | 170 | ||
168 | 20090511-2345 |
171 | 20090511-2345 |
169 | *battery voltages now calculated according to CELL_VOLT_MIN CELL_VOLT_MAX and CELL_NUM |
172 | *battery voltages now calculated according to CELL_VOLT_MIN CELL_VOLT_MAX and CELL_NUM |
170 | *CELL_NUM -1 causes a rough auto detection of cell number |
173 | *CELL_NUM -1 causes a rough auto detection of cell number |
171 | -UBAT_WRN and UBAT_MAX are now deprecated |
174 | -UBAT_WRN and UBAT_MAX are now deprecated |
172 | 175 | ||
173 | 20090427-2315 |
176 | 20090427-2315 |
174 | +write_gps_pos(...) (needs to be tested) |
177 | +write_gps_pos(...) (needs to be tested) |
175 | +gps position is shown in stats screen for testing purpose |
178 | +gps position is shown in stats screen for testing purpose |
176 | 179 | ||
177 | 20090427-2131 |
180 | 20090427-2131 |
178 | *stats are only collected while engines running (shaddi) |
181 | *stats are only collected while engines running (shaddi) |
179 | 182 | ||
180 | 20090427-2102 |
183 | 20090427-2102 |
181 | *fixed maximum distance in stats (shaddi) |
184 | *fixed maximum distance in stats (shaddi) |
182 | 185 | ||
183 | 20090427-2050 |
186 | 20090427-2050 |
184 | *clear() now faster |
187 | *clear() now faster |
185 | *fixed calculation of max speed in stats (shaddi) |
188 | *fixed calculation of max speed in stats (shaddi) |
186 | *littel typo in artificial horizon (thx joko) |
189 | *littel typo in artificial horizon (thx joko) |
187 | *stats are only shown AFTER flight (more specific, after motors had been on at least once) |
190 | *stats are only shown AFTER flight (more specific, after motors had been on at least once) |
188 | +indication icon for serial link (requires new character 198) |
191 | +indication icon for serial link (requires new character 198) |
189 | +indication icon for manual controll (stick > stick threshold) |
192 | +indication icon for manual controll (stick > stick threshold) |
190 | (Character set 192 needs to be reflashed since new icon is in it) |
193 | (Character set 192 needs to be reflashed since new icon is in it) |
191 | 194 | ||
192 | 20090420-0205 |
195 | 20090420-0205 |
193 | *reset-bug fixed |
196 | *reset-bug fixed |
194 | *moved code a bit |
197 | *moved code a bit |
195 | 198 | ||
196 | 20090419-2145 |
199 | 20090419-2145 |
197 | *reset-bug workaround in usart1.c: usart1_DisableTXD and usart1_EnableTXD |
200 | *reset-bug workaround in usart1.c: usart1_DisableTXD and usart1_EnableTXD |
198 | 201 | ||
199 | 20090419-1900 |
202 | 20090419-1900 |
200 | *fixed bug in heading-fine conv for bearing to home |
203 | *fixed bug in heading-fine conv for bearing to home |
201 | 204 | ||
202 | 20090419-1245 |
205 | 20090419-1245 |
203 | *compass characters bigger |
206 | *compass characters bigger |
204 | *battery position |
207 | *battery position |
205 | +voltage-symbol to battery-voltage |
208 | +voltage-symbol to battery-voltage |
206 | (Character Set 208 needs to be reflashed since compass chars are in it) |
209 | (Character Set 208 needs to be reflashed since compass chars are in it) |
207 | 210 | ||
208 | 20090418-2015 |
211 | 20090418-2015 |
209 | *fixed bug in Character Set 128 (reflash it if you already flashed it!) |
212 | *fixed bug in Character Set 128 (reflash it if you already flashed it!) |
210 | +another set of vario chars |
213 | +another set of vario chars |
211 | *changed vario to use new characters |
214 | *changed vario to use new characters |
212 | *moved vario/home-bearing positions |
215 | *moved vario/home-bearing positions |
213 | *big vario now enabled via menu or BIGVARIO |
216 | *big vario now enabled via menu or BIGVARIO |
214 | (Character Set 112 needs to be flashed) |
217 | (Character Set 112 needs to be flashed) |
215 | 218 | ||
216 | 20090418-1235 |
219 | 20090418-1235 |
217 | +big vario for testing purpose |
220 | +big vario for testing purpose |
218 | (Character Set 192 needs to be flashed) |
221 | (Character Set 192 needs to be flashed) |
219 | 222 | ||
220 | 20090418-0100 |
223 | 20090418-0100 |
221 | *variometer uses more steps (9 instead of 5) |
224 | *variometer uses more steps (9 instead of 5) |
222 | *home-arrow is now home-clock using more steps (22,5� resolution) |
225 | *home-arrow is now home-clock using more steps (22,5� resolution) |
223 | +visual battery-gauge according to difference between UBAT_WRN and UBAT_MAX |
226 | +visual battery-gauge according to difference between UBAT_WRN and UBAT_MAX |
224 | 227 | ||
225 | 20090417-1115 |
228 | 20090417-1115 |
226 | *changed calculation of km/h (thx wowie) |
229 | *changed calculation of km/h (thx wowie) |
227 | *added JochenK_(joko)'s characters |
230 | *added JochenK_(joko)'s characters |
228 | (Character-Sets 128, 136, 144, 152, 160, 168, 176 and 184 need to be flashed!) |
231 | (Character-Sets 128, 136, 144, 152, 160, 168, 176 and 184 need to be flashed!) |
229 | 232 | ||
230 | 20090408-1245 (shaddi) |
233 | 20090408-1245 (shaddi) |
231 | *fixed distance towards home |
234 | *fixed distance towards home |
232 | 235 | ||
233 | 20090408-0035 |
236 | 20090408-0035 |
234 | *rewrote number->display functions |
237 | *rewrote number->display functions |
235 | *fixed height bug (uint vs int) |
238 | *fixed height bug (uint vs int) |
236 | 239 | ||
237 | 20090407-2100 |
240 | 20090407-2100 |
238 | +added request of OSD data, disrequest of debug data and uptime reset to menu |
241 | +added request of OSD data, disrequest of debug data and uptime reset to menu |
239 | -removed the uptime-reset binding from S2 |
242 | -removed the uptime-reset binding from S2 |
240 | +pgm space for some strings to save _normal_ data space |
243 | +pgm space for some strings to save _normal_ data space |
241 | *some code movement |
244 | *some code movement |
242 | 245 | ||
243 | 20090406-0130 |
246 | 20090406-0130 |
244 | *MK-Datastruct updated to work with NaviCtrl 0.15c firmware |
247 | *MK-Datastruct updated to work with NaviCtrl 0.15c firmware |
245 | *changed flags from NO* to invers versions |
248 | *changed flags from NO* to invers versions |
246 | *enhanced the menu a bit |
249 | *enhanced the menu a bit |
247 | -artificial horizon at bootup, the menu is cooler imho |
250 | -artificial horizon at bootup, the menu is cooler imho |
248 | 251 | ||
249 | 20090405-0207 |
252 | 20090405-0207 |
250 | +NOOSD as requested |
253 | +NOOSD as requested |
251 | *height now corrected (thx lephisto) and displayed as .x up to 10m |
254 | *height now corrected (thx lephisto) and displayed as .x up to 10m |
252 | 255 | ||
253 | 20090402-0106 |
256 | 20090402-0106 |
254 | + disabling the txd pin while not using it so it won't interfere with KopterTool usage (thx joko) |
257 | + disabling the txd pin while not using it so it won't interfere with KopterTool usage (thx joko) |
255 | + if no data has been received for over 2sec we re-request it |
258 | + if no data has been received for over 2sec we re-request it |
256 | * tried source organisation a bit |
259 | * tried source organisation a bit |
257 | 260 | ||
258 | 20090401-1741 (shaddi) |
261 | 20090401-1741 (shaddi) |
259 | + More precise Veriometer. Uses more more characters to show the speed of the movement |
262 | + More precise Veriometer. Uses more more characters to show the speed of the movement |
260 | (Character-Set 232 needs to be flashed!) |
263 | (Character-Set 232 needs to be flashed!) |
261 | 264 | ||
262 | 20090331-1549 |
265 | 20090331-1549 |
263 | + simple config menu during runtime, press S1 to jump in, S2 to cyle and S1 to accept choice |
266 | + simple config menu during runtime, press S1 to jump in, S2 to cyle and S1 to accept choice |
264 | - S1 no longer requests the NC data |
267 | - S1 no longer requests the NC data |
265 | 268 | ||
266 | 20090331-1305 |
269 | 20090331-1305 |
267 | + added more statistics |
270 | + added more statistics |
268 | * corrected S1/S2 mapping (d'oh) |
271 | * corrected S1/S2 mapping (d'oh) |
269 | + started simple mode controll, press S2 during bootup toggles artificial horizon |
272 | + started simple mode controll, press S2 during bootup toggles artificial horizon |
270 | 273 | ||
271 | 20090329-1452 |
274 | 20090329-1452 |
272 | * fixed bearing to home |
275 | * fixed bearing to home |
273 | + added flight stats (shown while engines off) |
276 | + added flight stats (shown while engines off) |
274 | + sat icon should indicate PH/CH/Free now |
277 | + sat icon should indicate PH/CH/Free now |
275 | + you need to flash characters 224-231 if you were using previous versions |
278 | + you need to flash characters 224-231 if you were using previous versions |
276 | 279 | ||
277 | 20090327-2140 |
280 | 20090327-2140 |
278 | * fixed km/h (was cm/s) |
281 | * fixed km/h (was cm/s) |
279 | * fixed height m (was dm) |
282 | * fixed height m (was dm) |
280 | * modified incoming data speed to 100ms (was 200ms) |
283 | * modified incoming data speed to 100ms (was 200ms) |
281 | 284 | ||
282 | 20090326-2031 |
285 | 20090326-2031 |
283 | + first binary release |
286 | + first binary release |