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