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

Fixed failed merge with next.

Browse Source
This commit is contained in:
Brian Webb 2012-05-06 12:38:13 -07:00
parent 3cf4fe6512
commit ef4828032b
6 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
flight/Modules/RadioComBridge/RadioComBridge.c
View File

@ -43,7 +43,7 @@
#include <stdbool.h>
#undef PIOS_INCLUDE_USB
//#undef PIOS_INCLUDE_USB
// ****************
// Private constants
@ -54,8 +54,8 @@
#define BRIDGE_BUF_LEN 512
#define MAX_RETRIES 2
#define REQ_TIMEOUT_MS 10
#define STATS_UPDATE_PERIOD_MS 500
#define RADIOSTATS_UPDATE_PERIOD_MS 500
#define STATS_UPDATE_PERIOD_MS 2000
#define RADIOSTATS_UPDATE_PERIOD_MS 1000
#define MAX_LOST_CONTACT_TIME 10
#define PACKET_QUEUE_SIZE 10
#define MAX_PORT_DELAY 200
@ -131,10 +131,6 @@ static void radioStatusTask(void *parameters);
static int32_t transmitData(uint8_t * data, int32_t length);
static int32_t transmitPacket(PHPacketHandle packet);
static void receiveData(uint8_t *buf, uint8_t len);
/*
static void SendGCSReceiver(void);
static void SendPipXStatus(void);
*/
static void StatusHandler(PHPacketHandle p);
static void PPMHandler(uint16_t *channels);
static BufferedReadHandle BufferedReadInit(uint32_t com_port, uint16_t buffer_length);
@ -385,7 +381,9 @@ static void radioReceiveTask(void *parameters)
if (p == NULL)
p = PHGetRXPacket(pios_packet_handler);
if(p == NULL) {
vTaskDelay(MAX_PORT_DELAY / portTICK_RATE_MS);
DEBUG_PRINTF(2, "RX Packet Unavailable.!\n\r");
// Wait a bit for a packet to come available.
vTaskDelay(5);
continue;
}

2
flight/PipXtreme/System/inc/pios_config.h
View File

@ -59,7 +59,7 @@
#define PIOS_INCLUDE_GPIO
#define PIOS_INCLUDE_EXTI
#define PIOS_INCLUDE_RTC
//#define PIOS_INCLUDE_WDG
#define PIOS_INCLUDE_WDG
#define PIOS_INCLUDE_BL_HELPER
#define PIOS_INCLUDE_FLASH_EEPROM

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

@ -6,11 +6,11 @@
static const struct pios_led pios_leds[] = {
[PIOS_LED_USB] = {
.pin = {
//.gpio = GPIOA,
.gpio = GPIOC,
.gpio = GPIOA,
//.gpio = GPIOC,
.init = {
//.GPIO_Pin = GPIO_Pin_3,
.GPIO_Pin = GPIO_Pin_13,
.GPIO_Pin = GPIO_Pin_3,
//.GPIO_Pin = GPIO_Pin_13,
.GPIO_Mode = GPIO_Mode_Out_PP,
.GPIO_Speed = GPIO_Speed_50MHz,
},

4
ground/openpilotgcs/src/plugins/config/config.pro
View File

@ -77,10 +77,6 @@ FORMS += airframe.ui \
camerastabilization.ui \
outputchannelform.ui \
revosensors.ui \
<<<<<<< HEAD
txpid.ui \
pipxtreme.ui
=======
txpid.ui
>>>>>>> origin/next
RESOURCES += configgadget.qrc

3
ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
View File

@ -36,10 +36,7 @@
#include "configtxpidwidget.h"
#include "config_pro_hw_widget.h"
#include "config_cc_hw_widget.h"
<<<<<<< HEAD
#include "configpipxtremewidget.h"
=======
>>>>>>> origin/next
#include "configrevowidget.h"
#include "defaultattitudewidget.h"
#include "defaulthwsettingswidget.h"

4
ground/openpilotgcs/src/plugins/config/configgadgetwidget.h
View File

@ -50,11 +50,7 @@ class ConfigGadgetWidget: public QWidget
public:
ConfigGadgetWidget(QWidget *parent = 0);
~ConfigGadgetWidget();
<<<<<<< HEAD
enum widgetTabs {hardware=0, aircraft, input, output, sensors, stabilization, camerastabilization, txpid, pipxtreme};
=======
enum widgetTabs {hardware=0, aircraft, input, output, sensors, stabilization, camerastabilization, txpid};
>>>>>>> origin/next
public slots:
void onAutopilotConnect();