Subversion Repositories Projects

Rev

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

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