Subversion Repositories Projects

Rev

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

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