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