diff --git a/flight/Modules/RadioComBridge/RadioComBridge.c b/flight/Modules/RadioComBridge/RadioComBridge.c index 3f52d0673..237ea1758 100644 --- a/flight/Modules/RadioComBridge/RadioComBridge.c +++ b/flight/Modules/RadioComBridge/RadioComBridge.c @@ -55,8 +55,8 @@ #define BRIDGE_BUF_LEN 512 #define MAX_RETRIES 2 #define RETRY_TIMEOUT_MS 20 -#define STATS_UPDATE_PERIOD_MS 2000 -#define RADIOSTATS_UPDATE_PERIOD_MS 1000 +#define STATS_UPDATE_PERIOD_MS 500 +#define RADIOSTATS_UPDATE_PERIOD_MS 250 #define MAX_LOST_CONTACT_TIME 4 #define PACKET_QUEUE_SIZE 10 #define MAX_PORT_DELAY 200 @@ -294,7 +294,6 @@ static void comUAVTalkTask(void *parameters) uint8_t rx_byte; if(!BufferedRead(f, &rx_byte, MAX_PORT_DELAY)) continue; - data->txBytes++; // Get a TX packet from the packet handler if required. if (p == NULL) @@ -814,6 +813,7 @@ static int32_t transmitData(uint8_t *buf, int32_t length) */ static int32_t transmitPacket(PHPacketHandle p) { + data->txBytes += PH_PACKET_SIZE(p); return PIOS_COM_SendBuffer(PIOS_COM_RADIO, (uint8_t*)p, PH_PACKET_SIZE(p)); } diff --git a/flight/PiOS/Boards/STM32103CB_CC_Rev1.h b/flight/PiOS/Boards/STM32103CB_CC_Rev1.h index 18d977cf4..10a7a41cd 100644 --- a/flight/PiOS/Boards/STM32103CB_CC_Rev1.h +++ b/flight/PiOS/Boards/STM32103CB_CC_Rev1.h @@ -215,7 +215,7 @@ extern uint32_t pios_com_telem_usb_id; //------------------------ #define PIOS_RCVR_MAX_DEVS 3 #define PIOS_RCVR_MAX_CHANNELS 12 -#define PIOS_GCSRCVR_TIMEOUT_MS 100 +#define PIOS_GCSRCVR_TIMEOUT_MS 100 //------------------------- // Receiver PPM input diff --git a/flight/PiOS/Boards/STM32103CB_PIPXTREME_Rev1.h b/flight/PiOS/Boards/STM32103CB_PIPXTREME_Rev1.h index 5c1e5514a..868bba722 100755 --- a/flight/PiOS/Boards/STM32103CB_PIPXTREME_Rev1.h +++ b/flight/PiOS/Boards/STM32103CB_PIPXTREME_Rev1.h @@ -224,14 +224,14 @@ extern uint32_t pios_ppm_rcvr_id; //------------------------ #define PIOS_RCVR_MAX_DEVS 3 #define PIOS_RCVR_MAX_CHANNELS 12 -#define PIOS_GCSRCVR_TIMEOUT_MS 200 +#define PIOS_GCSRCVR_TIMEOUT_MS 100 //------------------------- // Receiver PPM input //------------------------- #define PIOS_PPM_MAX_DEVS 1 #define PIOS_PPM_NUM_INPUTS 12 -#define PIOS_PPM_PACKET_UPDATE_PERIOD_MS 80 +#define PIOS_PPM_PACKET_UPDATE_PERIOD_MS 25 //------------------------- // Servo outputs diff --git a/flight/board_hw_defs/pipxtreme/board_hw_defs.c b/flight/board_hw_defs/pipxtreme/board_hw_defs.c index bf2e713f6..7df2c8132 100644 --- a/flight/board_hw_defs/pipxtreme/board_hw_defs.c +++ b/flight/board_hw_defs/pipxtreme/board_hw_defs.c @@ -1,4 +1,5 @@ #include +#include #if defined(PIOS_INCLUDE_LED) @@ -51,6 +52,11 @@ static const struct pios_led_cfg pios_led_cfg = { .num_leds = NELEMENTS(pios_leds), }; +const struct pios_led_cfg * PIOS_BOARD_HW_DEFS_GetLedCfg (uint32_t board_revision) +{ + return &pios_led_cfg; +} + #endif /* PIOS_INCLUDE_LED */ #if defined(PIOS_INCLUDE_SPI)