Subversion Repositories FlightCtrl

Rev

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

Rev 2055 Rev 2058
Line 75... Line 75...
75 
      }
 75 
      }
76 
    }
 76 
    }
77 
  }
 77 
  }
Line 78... Line 78...
78 
 
 78 
 
79 
  // height, in meters (so the division factor is: 100)
 79 
  // height, in meters (so the division factor is: 100)
80 
  // debugOut.analog[31] = (117100 - filteredAirPressure) / 100;
 80 
  debugOut.analog[24] = (117100 - filteredAirPressure) / 100;
81 
  // Calculated 0 alt number: 108205
 81 
  // Calculated 0 alt number: 108205
82 
  // Experimental 0 alt number: 117100
 82 
  // Experimental 0 alt number: 117100
Line 83... Line 83...
83 
}
 83 
}
Line 89... Line 89...
89 
  int16_t throttle = PRTY[CONTROL_THROTTLE];
 89 
  int16_t throttle = PRTY[CONTROL_THROTTLE];
90 
  int32_t height = analog_getHeight();
 90 
  int32_t height = analog_getHeight();
91 
  int32_t heightError = rampedTargetHeight - height;
 91 
  int32_t heightError = rampedTargetHeight - height;
92 
  int16_t dHeight = analog_getDHeight();
 92 
  int16_t dHeight = analog_getDHeight();
Line 93... Line 93...
93 
 
 93 
 
94 
  debugOut.analog[14] = height/100L;
 94 
  debugOut.analog[22] = height/10L;
Line 95... Line 95...
95 
  debugOut.analog[15] = dHeight;
 95 
  debugOut.analog[23] = dHeight;
96 
 
 96 
 
97 
  if (heightError > 0) {
 97 
  if (heightError > 0) {
98 
    debugOut.digital[0] |= DEBUG_HEIGHT_DIFF;
 98 
    debugOut.digital[0] |= DEBUG_HEIGHT_DIFF;