Subversion Repositories Projects

Rev

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

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