Subversion Repositories FlightCtrl

Rev

Rev 935 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 935 Rev 936
Line 119... Line 119...
119
           }
119
           }
Line 120... Line 120...
120
 
120
 
121
           break;
121
           break;
122
    case 2:// Attitude Menu Item
122
    case 2:// Attitude Menu Item
123
           LCD_printfxy(0,0,"Attitude");
123
           LCD_printfxy(0,0,"Attitude");
124
           LCD_printfxy(0,1,"Nick:     %5i",IntegralNick/1024);
124
           LCD_printfxy(0,1,"Nick:      %5i",IntegralNick/1024);
125
           LCD_printfxy(0,2,"Roll:      %5i",IntegralRoll/1024);
125
           LCD_printfxy(0,2,"Roll:      %5i",IntegralRoll/1024);
126
           LCD_printfxy(0,3,"Heading:   %5i",CompassHeading);
126
           LCD_printfxy(0,3,"Heading:   %5i",CompassHeading);
127
           break;
127
           break;
128
    case 3:// Remote Control Channel Menu Item
128
    case 3:// Remote Control Channel Menu Item
Line 137... Line 137...
137
           LCD_printfxy(0,2,"P1:%4i  P2:%4i ",PPM_in[ParamSet.ChannelAssignment[CH_POTI1]],PPM_in[ParamSet.ChannelAssignment[CH_POTI2]]);
137
           LCD_printfxy(0,2,"P1:%4i  P2:%4i ",PPM_in[ParamSet.ChannelAssignment[CH_POTI1]],PPM_in[ParamSet.ChannelAssignment[CH_POTI2]]);
138
           LCD_printfxy(0,3,"P3:%4i  P4:%4i ",PPM_in[ParamSet.ChannelAssignment[CH_POTI3]],PPM_in[ParamSet.ChannelAssignment[CH_POTI4]]);
138
           LCD_printfxy(0,3,"P3:%4i  P4:%4i ",PPM_in[ParamSet.ChannelAssignment[CH_POTI3]],PPM_in[ParamSet.ChannelAssignment[CH_POTI4]]);
139
           break;
139
           break;
140
    case 5:// Gyro Sensor Menu Item
140
    case 5:// Gyro Sensor Menu Item
141
           LCD_printfxy(0,0,"Gyro - Sensor");
141
           LCD_printfxy(0,0,"Gyro - Sensor");
142
          if(BoardRelease == 10)
142
           switch(BoardRelease)
143
          {
143
           {
-
 
144
                        case 10:
144
           LCD_printfxy(0,1,"Nick %4i (%3i)",AdValueGyrNick - AdNeutralNick, AdNeutralNick);
145
                           LCD_printfxy(0,1,"Nick %4i (%3i)",AdValueGyrNick - AdNeutralNick, AdNeutralNick);
145
           LCD_printfxy(0,2,"Roll  %4i (%3i)",AdValueGyrRoll - AdNeutralRoll, AdNeutralRoll);
146
                           LCD_printfxy(0,2,"Roll %4i (%3i)",AdValueGyrRoll - AdNeutralRoll, AdNeutralRoll);
146
           LCD_printfxy(0,3,"Yaw   %4i (%3i)",Reading_GyroYaw, AdNeutralYaw);
147
                           LCD_printfxy(0,3,"Yaw  %4i (%3i)",AdNeutralYaw  - AdValueGyrYaw , AdNeutralYaw);
147
          }
148
                           break;
-
 
149
 
-
 
150
                        case 11:
-
 
151
                           LCD_printfxy(0,1,"Nick %4i (%3i)",AdValueGyrNick - AdNeutralNick, AdNeutralNick/2);
-
 
152
                           LCD_printfxy(0,2,"Roll %4i (%3i)",AdValueGyrRoll - AdNeutralRoll, AdNeutralRoll/2);
-
 
153
                           LCD_printfxy(0,3,"Yaw  %4i (%3i)",AdNeutralYaw  - AdValueGyrYaw , AdNeutralYaw/2);
148
          else
154
                           break;
-
 
155
 
149
          {
156
                        case 12:
-
 
157
                        default:
150
           LCD_printfxy(0,1,"Nick %4i (%3i)",AdValueGyrNick - AdNeutralNick, AdNeutralNick/2);
158
                           LCD_printfxy(0,1,"Nick %4i (%3i)(%3i)",AdValueGyrNick - AdNeutralNick, AdNeutralNick/2, AnalogOffsetNick);
151
           LCD_printfxy(0,2,"Roll  %4i (%3i)",AdValueGyrRoll - AdNeutralRoll, AdNeutralRoll/2);
159
                           LCD_printfxy(0,2,"Roll %4i (%3i)(%3i)",AdValueGyrRoll - AdNeutralRoll, AdNeutralRoll/2, AnalogOffsetRoll);
152
           LCD_printfxy(0,3,"Yaw   %4i (%3i)",Reading_GyroYaw, AdNeutralYaw/2);
160
                           LCD_printfxy(0,3,"Yaw  %4i (%3i)(%3i)",AdNeutralYaw  - AdValueGyrYaw , AdNeutralYaw/2 , AnalogOffsetYaw );
-
 
161
                           break;
153
          }
162
          }
154
           break;
163
          break;
155
    case 6:// Acceleration Sensor Menu Item
164
    case 6:// Acceleration Sensor Menu Item
156
           LCD_printfxy(0,0,"ACC - Sensor");
165
           LCD_printfxy(0,0,"ACC - Sensor");
157
           LCD_printfxy(0,1,"Nick  %4i (%3i)",AdValueAccNick, NeutralAccX);
166
           LCD_printfxy(0,1,"Nick   %4i (%3i)",AdValueAccNick, NeutralAccX);
158
           LCD_printfxy(0,2,"Roll   %4i (%3i)",AdValueAccRoll, NeutralAccY);
167
           LCD_printfxy(0,2,"Roll   %4i (%3i)",AdValueAccRoll, NeutralAccY);
159
           LCD_printfxy(0,3,"Height %4i (%3i)",Mean_AccTop, (int)NeutralAccZ);
168
           LCD_printfxy(0,3,"Height %4i (%3i)",Mean_AccTop, (int)NeutralAccZ);
160
           break;
169
           break;
161
    case 7:// Accumulator Voltage / Remote Control Level
170
    case 7:// Accumulator Voltage / Remote Control Level
162
           LCD_printfxy(0,1,"Voltage:  %5i",UBat);
171
           LCD_printfxy(0,1,"Voltage:  %5i",UBat);