Subversion Repositories Projects

Rev

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

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