From be5cc66bd3374d7918ccc8ddbd911f21eb56fb37 Mon Sep 17 00:00:00 2001 From: Alessio Morale Date: Sun, 23 Mar 2014 18:45:10 +0100 Subject: [PATCH] OP-1274 fixes for Coptercontrol firmware --- flight/modules/Actuator/actuator.c | 2 +- flight/modules/Attitude/attitude.c | 2 +- flight/modules/ComUsbBridge/ComUsbBridge.c | 4 ++-- flight/modules/GPS/GPS.c | 2 +- flight/modules/Receiver/receiver.c | 2 +- flight/modules/System/systemmod.c | 2 +- flight/modules/Telemetry/telemetry.c | 6 +++--- flight/pios/common/pios_callbackscheduler.c | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/flight/modules/Actuator/actuator.c b/flight/modules/Actuator/actuator.c index d33772606..047dec650 100644 --- a/flight/modules/Actuator/actuator.c +++ b/flight/modules/Actuator/actuator.c @@ -101,7 +101,7 @@ typedef struct { int32_t ActuatorStart() { // Start main task - xTaskCreate(actuatorTask, (signed char *)"Actuator", STACK_SIZE_BYTES / 4, NULL, TASK_PRIORITY, &taskHandle); + xTaskCreate(actuatorTask, (const char *)"Actuator", STACK_SIZE_BYTES / 4, NULL, TASK_PRIORITY, &taskHandle); PIOS_TASK_MONITOR_RegisterTask(TASKINFO_RUNNING_ACTUATOR, taskHandle); #ifdef PIOS_INCLUDE_WDG PIOS_WDG_RegisterFlag(PIOS_WDG_ACTUATOR); diff --git a/flight/modules/Attitude/attitude.c b/flight/modules/Attitude/attitude.c index 83103750e..e48751a28 100644 --- a/flight/modules/Attitude/attitude.c +++ b/flight/modules/Attitude/attitude.c @@ -145,7 +145,7 @@ static const struct pios_board_info *bdinfo = &pios_board_info_blob; int32_t AttitudeStart(void) { // Start main task - xTaskCreate(AttitudeTask, (signed char *)"Attitude", STACK_SIZE_BYTES / 4, NULL, TASK_PRIORITY, &taskHandle); + xTaskCreate(AttitudeTask, (const char *)"Attitude", STACK_SIZE_BYTES / 4, NULL, TASK_PRIORITY, &taskHandle); PIOS_TASK_MONITOR_RegisterTask(TASKINFO_RUNNING_ATTITUDE, taskHandle); PIOS_WDG_RegisterFlag(PIOS_WDG_ATTITUDE); diff --git a/flight/modules/ComUsbBridge/ComUsbBridge.c b/flight/modules/ComUsbBridge/ComUsbBridge.c index 7be0976ce..02ca7fd3f 100644 --- a/flight/modules/ComUsbBridge/ComUsbBridge.c +++ b/flight/modules/ComUsbBridge/ComUsbBridge.c @@ -78,9 +78,9 @@ static int32_t comUsbBridgeStart(void) { if (bridge_enabled) { // Start tasks - xTaskCreate(com2UsbBridgeTask, (signed char *)"Com2UsbBridge", C2U_STACK_SIZE_BYTES / 4, NULL, TASK_PRIORITY, &com2UsbBridgeTaskHandle); + xTaskCreate(com2UsbBridgeTask, (const char *)"Com2UsbBridge", C2U_STACK_SIZE_BYTES / 4, NULL, TASK_PRIORITY, &com2UsbBridgeTaskHandle); PIOS_TASK_MONITOR_RegisterTask(TASKINFO_RUNNING_COM2USBBRIDGE, com2UsbBridgeTaskHandle); - xTaskCreate(usb2ComBridgeTask, (signed char *)"Usb2ComBridge", U2C_STACK_SIZE_BYTES / 4, NULL, TASK_PRIORITY, &usb2ComBridgeTaskHandle); + xTaskCreate(usb2ComBridgeTask, (const char *)"Usb2ComBridge", U2C_STACK_SIZE_BYTES / 4, NULL, TASK_PRIORITY, &usb2ComBridgeTaskHandle); PIOS_TASK_MONITOR_RegisterTask(TASKINFO_RUNNING_USB2COMBRIDGE, usb2ComBridgeTaskHandle); return 0; } diff --git a/flight/modules/GPS/GPS.c b/flight/modules/GPS/GPS.c index bdbad1f69..9a57fcedd 100644 --- a/flight/modules/GPS/GPS.c +++ b/flight/modules/GPS/GPS.c @@ -111,7 +111,7 @@ int32_t GPSStart(void) if (gpsEnabled) { if (gpsPort) { // Start gps task - xTaskCreate(gpsTask, (signed char *)"GPS", STACK_SIZE_BYTES / 4, NULL, TASK_PRIORITY, &gpsTaskHandle); + xTaskCreate(gpsTask, (const char *)"GPS", STACK_SIZE_BYTES / 4, NULL, TASK_PRIORITY, &gpsTaskHandle); PIOS_TASK_MONITOR_RegisterTask(TASKINFO_RUNNING_GPS, gpsTaskHandle); return 0; } diff --git a/flight/modules/Receiver/receiver.c b/flight/modules/Receiver/receiver.c index 579ae0e89..a130c74d7 100644 --- a/flight/modules/Receiver/receiver.c +++ b/flight/modules/Receiver/receiver.c @@ -110,7 +110,7 @@ static bool updateRcvrActivity(struct rcvr_activity_fsm *fsm); int32_t ReceiverStart() { // Start main task - xTaskCreate(receiverTask, (signed char *)"Receiver", STACK_SIZE_BYTES / 4, NULL, TASK_PRIORITY, &taskHandle); + xTaskCreate(receiverTask, (const char *)"Receiver", STACK_SIZE_BYTES / 4, NULL, TASK_PRIORITY, &taskHandle); PIOS_TASK_MONITOR_RegisterTask(TASKINFO_RUNNING_RECEIVER, taskHandle); #ifdef PIOS_INCLUDE_WDG PIOS_WDG_RegisterFlag(PIOS_WDG_MANUAL); diff --git a/flight/modules/System/systemmod.c b/flight/modules/System/systemmod.c index 13bf7b264..eab28eed1 100644 --- a/flight/modules/System/systemmod.c +++ b/flight/modules/System/systemmod.c @@ -120,7 +120,7 @@ int32_t SystemModStart(void) stackOverflow = STACKOVERFLOW_NONE; mallocFailed = false; // Create system task - xTaskCreate(systemTask, (signed char *)"System", STACK_SIZE_BYTES / 4, NULL, TASK_PRIORITY, &systemTaskHandle); + xTaskCreate(systemTask, (const char *)"System", STACK_SIZE_BYTES / 4, NULL, TASK_PRIORITY, &systemTaskHandle); // Register task PIOS_TASK_MONITOR_RegisterTask(TASKINFO_RUNNING_SYSTEM, systemTaskHandle); diff --git a/flight/modules/Telemetry/telemetry.c b/flight/modules/Telemetry/telemetry.c index 3a969635b..6f0c36eec 100644 --- a/flight/modules/Telemetry/telemetry.c +++ b/flight/modules/Telemetry/telemetry.c @@ -124,13 +124,13 @@ int32_t TelemetryStart(void) GCSTelemetryStatsConnectQueue(priorityQueue); // Start telemetry tasks - xTaskCreate(telemetryTxTask, (signed char *)"TelTx", STACK_SIZE_TX_BYTES / 4, NULL, TASK_PRIORITY_TX, &telemetryTxTaskHandle); + xTaskCreate(telemetryTxTask, (const char *)"TelTx", STACK_SIZE_TX_BYTES / 4, NULL, TASK_PRIORITY_TX, &telemetryTxTaskHandle); PIOS_TASK_MONITOR_RegisterTask(TASKINFO_RUNNING_TELEMETRYTX, telemetryTxTaskHandle); - xTaskCreate(telemetryRxTask, (signed char *)"TelRx", STACK_SIZE_RX_BYTES / 4, NULL, TASK_PRIORITY_RX, &telemetryRxTaskHandle); + xTaskCreate(telemetryRxTask, (const char *)"TelRx", STACK_SIZE_RX_BYTES / 4, NULL, TASK_PRIORITY_RX, &telemetryRxTaskHandle); PIOS_TASK_MONITOR_RegisterTask(TASKINFO_RUNNING_TELEMETRYRX, telemetryRxTaskHandle); #ifdef PIOS_INCLUDE_RFM22B - xTaskCreate(radioRxTask, (signed char *)"RadioRx", STACK_SIZE_RADIO_RX_BYTES / 4, NULL, TASK_PRIORITY_RADRX, &radioRxTaskHandle); + xTaskCreate(radioRxTask, (const char *)"RadioRx", STACK_SIZE_RADIO_RX_BYTES / 4, NULL, TASK_PRIORITY_RADRX, &radioRxTaskHandle); PIOS_TASK_MONITOR_RegisterTask(TASKINFO_RUNNING_RADIORX, radioRxTaskHandle); #endif diff --git a/flight/pios/common/pios_callbackscheduler.c b/flight/pios/common/pios_callbackscheduler.c index 25b4b44e8..4f88599b8 100644 --- a/flight/pios/common/pios_callbackscheduler.c +++ b/flight/pios/common/pios_callbackscheduler.c @@ -45,7 +45,7 @@ struct DelayedCallbackTaskStruct { DelayedCallbackInfo *callbackQueue[CALLBACK_PRIORITY_LOW + 1]; DelayedCallbackInfo *queueCursor[CALLBACK_PRIORITY_LOW + 1]; xTaskHandle callbackSchedulerTaskHandle; - signed char name[3]; + char name[3]; uint32_t stackSize; DelayedCallbackPriorityTask priorityTask; xSemaphoreHandle signal;