Subversion Repositories Projects

Rev

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

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