Subversion Repositories Projects

Rev

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

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