Rev 631 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 631 | Rev 659 | ||
|---|---|---|---|
| Line 173... | Line 173... | ||
| 173 | OPT = 2 |
173 | OPT = 2 |
| 174 | Index: menu.c |
174 | Index: menu.c |
| 175 | =================================================================== |
175 | =================================================================== |
| 176 | --- menu.c (revision 1255) |
176 | --- menu.c (revision 1255) |
| 177 | +++ menu.c (working copy) |
177 | +++ menu.c (working copy) |
| 178 | @@ -139,7 +139,7 @@ |
178 | @@ -139,9 +139,10 @@ |
| 179 | switch(MenuItem) |
179 | switch(MenuItem) |
| 180 | { |
180 | { |
| 181 | case 0:// Version Info Menu Item |
181 | case 0:// Version Info Menu Item |
| 182 | - LCD_printfxy(0,0,"+ MikroKopter +"); |
182 | - LCD_printfxy(0,0,"+ MikroKopter +"); |
| - | 183 | - LCD_printfxy(0,1,"HW:V%d.%d SW:%d.%d%c",BoardRelease/10,BoardRelease%10,VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH+'a'); |
|
| - | 184 | - LCD_printfxy(0,2,"Setting: %d %s", GetActiveParamSet(), Mixer.Name); |
|
| 183 | + LCD_printfxy(0,0,"MK ==VIBR TEST=="); |
185 | + LCD_printfxy(0,0,"MK ==VIBR TEST=="); |
| - | 186 | + LCD_printfxy(0,1," v0.9 RC4 "); |
|
| 184 | LCD_printfxy(0,1,"HW:V%d.%d SW:%d.%d%c",BoardRelease/10,BoardRelease%10,VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH+'a'); |
187 | + LCD_printfxy(0,2,"HW:V%d.%d SW:%d.%d%c",BoardRelease/10,BoardRelease%10,VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH+'a'); |
| 185 | LCD_printfxy(0,2,"Setting: %d %s", GetActiveParamSet(), Mixer.Name); |
188 | + //LCD_printfxy(0,2,"Setting: %d %s", GetActiveParamSet(), Mixer.Name); |
| 186 | if(I2CTimeout < 6) |
189 | if(I2CTimeout < 6) |
| - | 190 | { |
|
| - | 191 | LCD_printfxy(0,3,"I2C Error!!!"); |
|
| 187 | Index: timer0.c |
192 | Index: timer0.c |
| 188 | =================================================================== |
193 | =================================================================== |
| 189 | --- timer0.c (revision 1255) |
194 | --- timer0.c (revision 1255) |
| 190 | +++ timer0.c (working copy) |
195 | +++ timer0.c (working copy) |
| 191 | @@ -173,18 +173,18 @@ |
196 | @@ -173,18 +173,18 @@ |
| Line 217... | Line 222... | ||
| 217 | +// else PORTC &= ~(1<<PORTC7);// Speaker at PC7 |
222 | +// else PORTC &= ~(1<<PORTC7);// Speaker at PC7 |
| 218 | +// } |
223 | +// } |
| Line 219... | Line 224... | ||
| 219 | 224 | ||
| 220 | #ifndef USE_NAVICTRL |
225 | #ifndef USE_NAVICTRL |
| - | 226 | // update compass value if this option is enabled in the settings |
|
| - | 227 | Index: twimaster.c |
|
| - | 228 | =================================================================== |
|
| - | 229 | --- twimaster.c (revision 1255) |
|
| - | 230 | +++ twimaster.c (working copy) |
|
| - | 231 | @@ -211,7 +211,7 @@ |
|
| - | 232 | // Master Transmit |
|
| - | 233 | case 0: // TWI_STATE_MOTOR_TX |
|
| - | 234 | // skip motor if not used in mixer |
|
| - | 235 | - while((Mixer.Motor[motor_write][MIX_GAS] <= 0) && (motor_write < MAX_MOTORS)) motor_write++; |
|
| - | 236 | + //while((Mixer.Motor[motor_write][MIX_GAS] <= 0) && (motor_write < MAX_MOTORS)) motor_write++; |
|
| - | 237 | if(motor_write >= MAX_MOTORS) // writing finished, read now |
|
| - | 238 | { |
|
| 221 | // update compass value if this option is enabled in the settings |
239 | motor_write = 0; |
| 222 | Index: uart0.c |
240 | Index: uart0.c |
| 223 | =================================================================== |
241 | =================================================================== |
| 224 | --- uart0.c (revision 1255) |
242 | --- uart0.c (revision 1255) |
| 225 | +++ uart0.c (working copy) |
243 | +++ uart0.c (working copy) |
| Line 241... | Line 259... | ||
| 241 | uint16_t Data3D_Interval = 0; // in 1ms |
259 | uint16_t Data3D_Interval = 0; // in 1ms |
| 242 | +int16_t requestedVibData; |
260 | +int16_t requestedVibData; |
| Line 243... | Line 261... | ||
| 243 | 261 | ||
| 244 | #ifdef USE_MK3MAG |
262 | #ifdef USE_MK3MAG |
| - | 263 | int16_t Compass_Timer; |
|
| - | 264 | @@ -491,6 +495,7 @@ |
|
| - | 265 | if(RxDataLen > 20) // |
|
| - | 266 | { |
|
| - | 267 | memcpy(&MotorTest[0], (uint8_t*)pRxData, sizeof(MotorTest)); |
|
| - | 268 | + //MotorTest[0] = MotorTest[4]; |
|
| - | 269 | } |
|
| - | 270 | else |
|
| 245 | int16_t Compass_Timer; |
271 | { |
| 246 | @@ -501,6 +505,28 @@ |
272 | @@ -501,6 +506,28 @@ |
| 247 | PcAccess = 255; |
273 | PcAccess = 255; |
| Line 248... | Line 274... | ||
| 248 | break; |
274 | break; |
| 249 | 275 | ||
| Line 270... | Line 296... | ||
| 270 | + break; |
296 | + break; |
| 271 | + |
297 | + |
| 272 | case 'n':// "Get Mixer Table |
298 | case 'n':// "Get Mixer Table |
| 273 | while(!txd_complete); // wait for previous frame to be sent |
299 | while(!txd_complete); // wait for previous frame to be sent |
| 274 | SendOutData('N', FC_ADDRESS, 1, (uint8_t *) &Mixer, sizeof(Mixer)); |
300 | SendOutData('N', FC_ADDRESS, 1, (uint8_t *) &Mixer, sizeof(Mixer)); |
| 275 | @@ -637,6 +663,7 @@ |
301 | @@ -637,6 +664,7 @@ |
| 276 | loop_until_bit_is_set(UCSR0A, UDRE0); |
302 | loop_until_bit_is_set(UCSR0A, UDRE0); |
| 277 | // send character |
303 | // send character |
| 278 | UDR0 = c; |
304 | UDR0 = c; |
| 279 | + loop_until_bit_is_set(UCSR0A, UDRE0); |
305 | + loop_until_bit_is_set(UCSR0A, UDRE0); |
| 280 | return (0); |
306 | return (0); |
| 281 | } |
307 | } |
| Line 282... | Line 308... | ||
| 282 | 308 | ||
| 283 | @@ -646,6 +673,11 @@ |
309 | @@ -646,6 +674,11 @@ |
| 284 | { |
310 | { |
| Line 285... | Line 311... | ||
| 285 | if(!txd_complete) return; |
311 | if(!txd_complete) return; |
| 286 | 312 | ||