rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-18 08:54:15 +01:00
Code Issues Releases Activity

OP-1837 Uncrustify

Browse Source
This commit is contained in:
m_thread 2015-04-26 21:08:54 +02:00
parent b0b1a42aec
commit 8d4fe80388
3 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
flight/pios/common/pios_srxl.c
View File

@ -34,7 +34,7 @@
#include "pios_srxl_priv.h" #include "pios_srxl_priv.h"
//#define PIOS_INSTRUMENT_MODULE // #define PIOS_INSTRUMENT_MODULE
#include <pios_instrumentation_helper.h> #include <pios_instrumentation_helper.h>
PERF_DEFINE_COUNTER(crcFailureCount); PERF_DEFINE_COUNTER(crcFailureCount);
@ -77,8 +77,8 @@ struct pios_srxl_state {
}; };
struct pios_srxl_dev { struct pios_srxl_dev {
enum pios_srxl_dev_magic magic; enum pios_srxl_dev_magic magic;
struct pios_srxl_state state; struct pios_srxl_state state;
}; };
/* Allocate S.Bus device descriptor */ /* Allocate S.Bus device descriptor */
@ -130,10 +130,10 @@ static void PIOS_SRXL_ResetChannels(struct pios_srxl_state *state)
/* Reset SRXL receiver state */ /* Reset SRXL receiver state */
static void PIOS_SRXL_ResetState(struct pios_srxl_state *state) static void PIOS_SRXL_ResetState(struct pios_srxl_state *state)
{ {
state->receive_timer = 0; state->receive_timer = 0;
state->failsafe_timer = 0; state->failsafe_timer = 0;
state->frame_found = 0; state->frame_found = 0;
state->data_bytes = 0; state->data_bytes = 0;
PIOS_SRXL_ResetChannels(state); PIOS_SRXL_ResetChannels(state);
} }
@ -204,8 +204,8 @@ static int32_t PIOS_SRXL_Get(uint32_t rcvr_id, uint8_t channel)
static void PIOS_SRXL_UnrollChannels(struct pios_srxl_state *state) static void PIOS_SRXL_UnrollChannels(struct pios_srxl_state *state)
{ {
PERF_TIMED_SECTION_START(messageUnrollTimer); PERF_TIMED_SECTION_START(messageUnrollTimer);
uint8_t *received_data = state->received_data; uint8_t *received_data = state->received_data;
uint8_t channel; uint8_t channel;
uint16_t channel_value; uint16_t channel_value;
for (channel = 0; channel < (state->data_bytes / 2); channel++) { for (channel = 0; channel < (state->data_bytes / 2); channel++) {
@ -213,28 +213,29 @@ static void PIOS_SRXL_UnrollChannels(struct pios_srxl_state *state)
channel_value = channel_value + ((uint16_t)received_data[SRXL_HEADER_LENGTH + (channel * 2) + 1]); channel_value = channel_value + ((uint16_t)received_data[SRXL_HEADER_LENGTH + (channel * 2) + 1]);
state->channel_data[channel] = (800 + ((channel_value * 1400) >> 12)); state->channel_data[channel] = (800 + ((channel_value * 1400) >> 12));
} }
PERF_TIMED_SECTION_END(messageUnrollTimer); PERF_TIMED_SECTION_END(messageUnrollTimer);
} }
static bool PIOS_SRXL_Validate_Checksum(struct pios_srxl_state *state) static bool PIOS_SRXL_Validate_Checksum(struct pios_srxl_state *state)
{ {
// Check the CRC16 checksum. The provided checksum is immediately after the channel data. // Check the CRC16 checksum. The provided checksum is immediately after the channel data.
// All data including start byte and version byte is included in crc calculation. // All data including start byte and version byte is included in crc calculation.
uint8_t i = 0; uint8_t i = 0;
uint16_t crc = 0; uint16_t crc = 0;
for (i = 0; i < SRXL_HEADER_LENGTH + state->data_bytes; i++) {
crc = crc ^ (int16_t)state->received_data[i] << 8; for (i = 0; i < SRXL_HEADER_LENGTH + state->data_bytes; i++) {
uint8_t j = 0; crc = crc ^ (int16_t)state->received_data[i] << 8;
for (j = 0; j < 8; j++) { uint8_t j = 0;
if (crc & 0x8000) { for (j = 0; j < 8; j++) {
crc = crc << 1 ^ 0x1021; if (crc & 0x8000) {
} else { crc = crc << 1 ^ 0x1021;
crc = crc << 1; } else {
} crc = crc << 1;
} }
} }
uint16_t checksum = (((uint16_t)(state->received_data[i] << 8) | }
(uint16_t)state->received_data[i + 1])); uint16_t checksum = (((uint16_t)(state->received_data[i] << 8) |
(uint16_t)state->received_data[i + 1]));
return crc == checksum; return crc == checksum;
} }
@ -248,8 +249,8 @@ static void PIOS_SRXL_UpdateState(struct pios_srxl_state *state, uint8_t b)
if (state->byte_count < (SRXL_HEADER_LENGTH + state->data_bytes + SRXL_CHECKSUM_LENGTH)) { if (state->byte_count < (SRXL_HEADER_LENGTH + state->data_bytes + SRXL_CHECKSUM_LENGTH)) {
if (state->byte_count == 0) { if (state->byte_count == 0) {
// Set up the length of the channel data according to version received // Set up the length of the channel data according to version received
PERF_INCREMENT_VALUE(frameStartCount); PERF_INCREMENT_VALUE(frameStartCount);
if (b == SRXL_V1_HEADER) { if (b == SRXL_V1_HEADER) {
state->data_bytes = SRXL_V1_CHANNEL_DATA_BYTES; state->data_bytes = SRXL_V1_CHANNEL_DATA_BYTES;
} else if (b == SRXL_V2_HEADER) { } else if (b == SRXL_V2_HEADER) {
@ -257,30 +258,29 @@ static void PIOS_SRXL_UpdateState(struct pios_srxl_state *state, uint8_t b)
} else { } else {
/* discard the whole frame if the 1st byte is not correct */ /* discard the whole frame if the 1st byte is not correct */
state->frame_found = 0; state->frame_found = 0;
PERF_INCREMENT_VALUE(frameAbortCount); PERF_INCREMENT_VALUE(frameAbortCount);
return; return;
} }
} }
/* store next byte */ /* store next byte */
state->received_data[state->byte_count] = b; state->received_data[state->byte_count] = b;
state->byte_count++; state->byte_count++;
if (state->byte_count == (SRXL_HEADER_LENGTH + state->data_bytes + SRXL_CHECKSUM_LENGTH)) if (state->byte_count == (SRXL_HEADER_LENGTH + state->data_bytes + SRXL_CHECKSUM_LENGTH)) {
{ PERF_INCREMENT_VALUE(completeMessageCount);
PERF_INCREMENT_VALUE(completeMessageCount); // We have a complete message, lets decode it
// We have a complete message, lets decode it if (PIOS_SRXL_Validate_Checksum(state)) {
if (PIOS_SRXL_Validate_Checksum(state)) { /* data looking good */
/* data looking good */ PIOS_SRXL_UnrollChannels(state);
PIOS_SRXL_UnrollChannels(state); state->failsafe_timer = 0;
state->failsafe_timer = 0; PERF_INCREMENT_VALUE(successfulCount);
PERF_INCREMENT_VALUE(successfulCount); } else {
} else { /* discard whole frame */
/* discard whole frame */ PERF_INCREMENT_VALUE(crcFailureCount);
PERF_INCREMENT_VALUE(crcFailureCount); }
} /* prepare for the next frame */
/* prepare for the next frame */ state->frame_found = 0;
state->frame_found = 0; PERF_MEASURE_PERIOD(messageReceiveRate);
PERF_MEASURE_PERIOD(messageReceiveRate); }
}
} }
} }
@ -353,7 +353,7 @@ static void PIOS_SRXL_Supervisor(uint32_t srxl_id)
if (++state->failsafe_timer > 64) { if (++state->failsafe_timer > 64) {
PIOS_SRXL_ResetChannels(state); PIOS_SRXL_ResetChannels(state);
state->failsafe_timer = 0; state->failsafe_timer = 0;
PERF_INCREMENT_VALUE(failsafeCount); PERF_INCREMENT_VALUE(failsafeCount);
} }
} }

4
flight/pios/inc/pios_instrumentation_helper.h
View File

@ -98,8 +98,8 @@
#define PERF_TIMED_SECTION_END(x) PIOS_Instrumentation_TimeEnd(x) #define PERF_TIMED_SECTION_END(x) PIOS_Instrumentation_TimeEnd(x)
#define PERF_MEASURE_PERIOD(x) PIOS_Instrumentation_TrackPeriod(x) #define PERF_MEASURE_PERIOD(x) PIOS_Instrumentation_TrackPeriod(x)
#define PERF_TRACK_VALUE(x, y) PIOS_Instrumentation_updateCounter(x, y) #define PERF_TRACK_VALUE(x, y) PIOS_Instrumentation_updateCounter(x, y)
#define PERF_INCREMENT_VALUE(x) PIOS_Instrumentation_incrementCounter(x, 1) #define PERF_INCREMENT_VALUE(x) PIOS_Instrumentation_incrementCounter(x, 1)
#define PERF_DECREMENT_VALUE(x) PIOS_Instrumentation_incrementCounter(x, -1) #define PERF_DECREMENT_VALUE(x) PIOS_Instrumentation_incrementCounter(x, -1)
#else #else

4
flight/pios/inc/pios_srxl_priv.h
View File

@ -64,8 +64,8 @@
* } * }
*/ */
#define SRXL_V1_HEADER 0xa1 #define SRXL_V1_HEADER 0xa1
#define SRXL_V2_HEADER 0xa2 #define SRXL_V2_HEADER 0xa2
#define SRXL_HEADER_LENGTH 1 #define SRXL_HEADER_LENGTH 1
#define SRXL_CHECKSUM_LENGTH 2 #define SRXL_CHECKSUM_LENGTH 2