rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

Added PipX to Windows .inf file and updated ppm port definitions.

Browse Source
This commit is contained in:
Brian Webb 2012-05-21 19:22:46 -07:00
parent e57543ec29
commit 6e359c5933
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
flight/Project/Windows USB/OpenPilot-CDC.inf
View File

@ -10,9 +10,11 @@ DriverVer=10/15/2009,1.0.0.0
[DeviceList.NTx86] [DeviceList.NTx86]
%CopterControl%= DriverInstall,USB\VID_20A0&PID_415b&MI_00 %CopterControl%= DriverInstall,USB\VID_20A0&PID_415b&MI_00
%PipXtreme%= DriverInstall,USB\VID_20A0&PID_415c&MI_00
[DeviceList.NTamd64] [DeviceList.NTamd64]
%CopterControl%= DriverInstall,USB\VID_20A0&PID_415b&MI_00 %CopterControl%= DriverInstall,USB\VID_20A0&PID_415b&MI_00
%PipXtreme%= DriverInstall,USB\VID_20A0&PID_415c&MI_00
[DriverInstall] [DriverInstall]
include=mdmcpq.inf include=mdmcpq.inf
@ -30,3 +32,4 @@ HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
[Strings] [Strings]
ProviderName = "CDC Driver" ProviderName = "CDC Driver"
CopterControl = "OpenPilot CDC Driver" CopterControl = "OpenPilot CDC Driver"
PipXtreme = "OpenPilot CDC Driver"

11
flight/board_hw_defs/pipxtreme/board_hw_defs.c
View File

@ -7,10 +7,8 @@ static const struct pios_led pios_leds[] = {
[PIOS_LED_USB] = { [PIOS_LED_USB] = {
.pin = { .pin = {
.gpio = GPIOA, .gpio = GPIOA,
//.gpio = GPIOC,
.init = { .init = {
.GPIO_Pin = GPIO_Pin_3, .GPIO_Pin = GPIO_Pin_3,
//.GPIO_Pin = GPIO_Pin_13,
.GPIO_Mode = GPIO_Mode_Out_PP, .GPIO_Mode = GPIO_Mode_Out_PP,
.GPIO_Speed = GPIO_Speed_50MHz, .GPIO_Speed = GPIO_Speed_50MHz,
}, },
@ -301,20 +299,17 @@ static const struct pios_tim_clock_cfg tim_4_cfg = {
}; };
static const struct pios_tim_channel pios_tim_ppm_flexi_port = { static const struct pios_tim_channel pios_tim_ppm_flexi_port = {
//.timer = TIM2, .timer = TIM2,
.timer = TIM4,
//.timer_chan = TIM_Channel_4,
.timer_chan = TIM_Channel_4, .timer_chan = TIM_Channel_4,
.pin = { .pin = {
.gpio = GPIOB, .gpio = GPIOB,
.init = { .init = {
//.GPIO_Pin = GPIO_Pin_11, .GPIO_Pin = GPIO_Pin_11,
.GPIO_Pin = GPIO_Pin_9,
.GPIO_Mode = GPIO_Mode_IPD, .GPIO_Mode = GPIO_Mode_IPD,
.GPIO_Speed = GPIO_Speed_2MHz, .GPIO_Speed = GPIO_Speed_2MHz,
}, },
}, },
//.remap = GPIO_PartialRemap_TIM2, .remap = GPIO_PartialRemap2_TIM2,
}; };
#endif /* PIOS_INCLUDE_TIM */ #endif /* PIOS_INCLUDE_TIM */

5
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
View File

@ -959,6 +959,10 @@ QVariant ConfigTaskWidget::getVariantFromWidget(QWidget * widget,double scale)
{ {
return (QString)(cb->isChecked()?"TRUE":"FALSE"); return (QString)(cb->isChecked()?"TRUE":"FALSE");
} }
else if(QLineEdit * cb=qobject_cast<QLineEdit *>(widget))
{
return (QString)cb->displayText();
}
else else
return QVariant(); return QVariant();
} }
@ -1011,6 +1015,7 @@ bool ConfigTaskWidget::setWidgetFromVariant(QWidget *widget, QVariant value, dou
cb->setText(value.toString()); cb->setText(value.toString());
else else
cb->setText(QString::number((value.toDouble()/scale))); cb->setText(QString::number((value.toDouble()/scale)));
return true;
} }
else else
return false; return false;