Subversion Repositories Projects

Rev

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

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