rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

LP-72 channelgroup dsmrcvrport nano

Browse Source
This commit is contained in:
Cliff Geerdes 2016-03-05 22:56:39 -05:00 committed by Laurent Lalanne
parent 0c76379f0a
commit 5d5968c186
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
flight/modules/Receiver/receiver.c
View File

@ -655,6 +655,9 @@ static bool updateRcvrActivityCompare(uint32_t rcvr_id, struct rcvr_activity_fsm
case MANUALCONTROLSETTINGS_CHANNELGROUPS_DSMFLEXIPORT:
group = RECEIVERACTIVITY_ACTIVEGROUP_DSMFLEXIPORT;
break;
case MANUALCONTROLSETTINGS_CHANNELGROUPS_DSMRCVRPORT:
group = RECEIVERACTIVITY_ACTIVEGROUP_DSMRCVRPORT;
break;
case MANUALCONTROLSETTINGS_CHANNELGROUPS_EXBUS:
group = RECEIVERACTIVITY_ACTIVEGROUP_EXBUS;
break;

7
ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
View File

@ -212,7 +212,7 @@ void VehicleConfigurationHelper::applyHardwareConfiguration()
data.SPK2_RcvrPort = HwSettings::SPK2_RCVRPORT_SBUS;
} else {
data.RM_MainPort = HwSettings::RM_MAINPORT_SBUS;
// We have to set telemetry on flexport since s.bus needs the mainport on all but Revo.
// We have to set telemetry to flexport on all except Revo (and except Sparky2) since s.bus needs the mainport.
if (m_configSource->getControllerType() != VehicleConfigurationSource::CONTROLLER_REVO) {
data.RM_FlexiPort = HwSettings::RM_FLEXIPORT_TELEMETRY;
}
@ -238,10 +238,10 @@ void VehicleConfigurationHelper::applyHardwareConfiguration()
data.OptionalModules[HwSettings::OPTIONALMODULES_GPS] = 1;
data.GPSSpeed = HwSettings::GPSSPEED_57600;
// if using GPS and SBUS on Revo, we must use FlexiPort for GPS
// if using GPS and SBUS on Revo or Nano, we must use FlexiPort for GPS
// since we must use MainPort for SBUS
if (m_configSource->getInputType() == VehicleConfigurationSource::INPUT_SBUS
&& m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_REVO) {
&& m_configSource->getControllerType() != VehicleConfigurationSource::CONTROLLER_SPARKY2) {
data.RM_FlexiPort = HwSettings::RM_FLEXIPORT_GPS;
} else {
data.RM_MainPort = HwSettings::RM_MAINPORT_GPS;
@ -1372,6 +1372,7 @@ void VehicleConfigurationHelper::setupHexaCopter()
channels[0].pitch = 25;
channels[0].yaw = -66;
channels[1].type = MIXER_TYPE_MOTOR;
channels[1].throttle1 = 100;
channels[1].throttle2 = 0;

2
shared/uavobjectdefinition/receiveractivity.xml
View File

@ -2,7 +2,7 @@
<object name="ReceiverActivity" singleinstance="true" settings="false" category="System">
<description>Monitors which receiver channels have been active within the last second.</description>
<field name="ActiveGroup" units="Channel Group" type="enum" elements="1"
options="PWM,PPM,DSM (MainPort),DSM (FlexiPort),S.Bus,EX.Bus,HoTT,SRXL,GCS,OPLink,None"
options="PWM,PPM,DSM (MainPort),DSM (FlexiPort),DSM (RcvrPort),S.Bus,EX.Bus,HoTT,SRXL,GCS,OPLink,None"
defaultvalue="None"/>
<field name="ActiveChannel" units="channel" type="uint8" elements="1"
defaultvalue="255"/>