Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 658 → Rev 659

/VibrationTest/trunk/FlightCtrl/74d_Killagreg_VibrationTest.patch
175,15 → 175,20
===================================================================
--- menu.c (revision 1255)
+++ menu.c (working copy)
@@ -139,7 +139,7 @@
@@ -139,9 +139,10 @@
switch(MenuItem)
{
case 0:// Version Info Menu Item
- LCD_printfxy(0,0,"+ MikroKopter +");
- LCD_printfxy(0,1,"HW:V%d.%d SW:%d.%d%c",BoardRelease/10,BoardRelease%10,VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH+'a');
- LCD_printfxy(0,2,"Setting: %d %s", GetActiveParamSet(), Mixer.Name);
+ LCD_printfxy(0,0,"MK ==VIBR TEST==");
LCD_printfxy(0,1,"HW:V%d.%d SW:%d.%d%c",BoardRelease/10,BoardRelease%10,VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH+'a');
LCD_printfxy(0,2,"Setting: %d %s", GetActiveParamSet(), Mixer.Name);
+ LCD_printfxy(0,1," v0.9 RC4 ");
+ LCD_printfxy(0,2,"HW:V%d.%d SW:%d.%d%c",BoardRelease/10,BoardRelease%10,VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH+'a');
+ //LCD_printfxy(0,2,"Setting: %d %s", GetActiveParamSet(), Mixer.Name);
if(I2CTimeout < 6)
{
LCD_printfxy(0,3,"I2C Error!!!");
Index: timer0.c
===================================================================
--- timer0.c (revision 1255)
219,6 → 224,19
#ifndef USE_NAVICTRL
// update compass value if this option is enabled in the settings
Index: twimaster.c
===================================================================
--- twimaster.c (revision 1255)
+++ twimaster.c (working copy)
@@ -211,7 +211,7 @@
// Master Transmit
case 0: // TWI_STATE_MOTOR_TX
// skip motor if not used in mixer
- while((Mixer.Motor[motor_write][MIX_GAS] <= 0) && (motor_write < MAX_MOTORS)) motor_write++;
+ //while((Mixer.Motor[motor_write][MIX_GAS] <= 0) && (motor_write < MAX_MOTORS)) motor_write++;
if(motor_write >= MAX_MOTORS) // writing finished, read now
{
motor_write = 0;
Index: uart0.c
===================================================================
--- uart0.c (revision 1255)
243,7 → 261,15
#ifdef USE_MK3MAG
int16_t Compass_Timer;
@@ -501,6 +505,28 @@
@@ -491,6 +495,7 @@
if(RxDataLen > 20) //
{
memcpy(&MotorTest[0], (uint8_t*)pRxData, sizeof(MotorTest));
+ //MotorTest[0] = MotorTest[4];
}
else
{
@@ -501,6 +506,28 @@
PcAccess = 255;
break;
272,7 → 298,7
case 'n':// "Get Mixer Table
while(!txd_complete); // wait for previous frame to be sent
SendOutData('N', FC_ADDRESS, 1, (uint8_t *) &Mixer, sizeof(Mixer));
@@ -637,6 +663,7 @@
@@ -637,6 +664,7 @@
loop_until_bit_is_set(UCSR0A, UDRE0);
// send character
UDR0 = c;
280,7 → 306,7
return (0);
}
@@ -646,6 +673,11 @@
@@ -646,6 +674,11 @@
{
if(!txd_complete) return;