Subversion Repositories Projects

Rev

Rev 833 | Rev 837 | Go to most recent revision | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

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