Subversion Repositories Projects

Rev

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

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