rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix coding style

This commit is contained in:
azolyoung 2018-09-22 10:15:01 +08:00
parent 6bc6c36116
commit 18085eafdd
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/io/rcdevice.c
View File

@ -63,7 +63,7 @@ static uint8_t runcamDeviceGetRespLen(uint8_t command)
return 0; return 0;
} }
static bool rcdeviceRespCtxQueuePushRespCtx(rcdeviceWaitingResponseQueue *queue, rcdeviceResponseParseContext_t *respCtx) static bool rcdeviceRespCtxQueuePush(rcdeviceWaitingResponseQueue *queue, rcdeviceResponseParseContext_t *respCtx)
{ {
if (queue == NULL || (queue->itemCount + 1) > MAX_WAITING_RESPONSES) { if (queue == NULL || (queue->itemCount + 1) > MAX_WAITING_RESPONSES) {
return false; return false;
@ -91,7 +91,7 @@ static rcdeviceResponseParseContext_t* rcdeviceRespCtxQueuePeekFront(rcdeviceWai
return ctx; return ctx;
} }
rcdeviceResponseParseContext_t* rcdeviceRespCtxQueueShift(rcdeviceWaitingResponseQueue *queue) STATIC_UNIT_TESTED rcdeviceResponseParseContext_t* rcdeviceRespCtxQueueShift(rcdeviceWaitingResponseQueue *queue)
{ {
if (queue == NULL || queue->itemCount == 0) { if (queue == NULL || queue->itemCount == 0) {
return NULL; return NULL;
@ -170,7 +170,7 @@ static void runcamDeviceSendRequestAndWaitingResp(runcamDevice_t *device, uint8_
responseCtx.paramDataLen = paramDataLen; responseCtx.paramDataLen = paramDataLen;
} }
responseCtx.userInfo = userInfo; responseCtx.userInfo = userInfo;
rcdeviceRespCtxQueuePushRespCtx(&watingResponseQueue, &responseCtx); rcdeviceRespCtxQueuePush(&watingResponseQueue, &responseCtx);
// send packet // send packet
runcamDeviceSendPacket(device, commandID, paramData, paramDataLen); runcamDeviceSendPacket(device, commandID, paramData, paramDataLen);
@ -188,13 +188,12 @@ static void runcamDeviceParseV1DeviceInfo(rcdeviceResponseParseContext_t *ctx)
device->isReady = true; device->isReady = true;
} }
static uint8_t crc_high_first(uint8_t *ptr, uint8_t len) static uint8_t crc8HighFirst(uint8_t *ptr, uint8_t len)
{ {
uint8_t i; uint8_t crc = 0x00;
uint8_t crc=0x00;
while (len--) { while (len--) {
crc ^= *ptr++; crc ^= *ptr++;
for (i=8; i>0; --i) { for (unsigned i = 8; i > 0; --i) {
if (crc & 0x80) if (crc & 0x80)
crc = (crc << 1) ^ 0x31; crc = (crc << 1) ^ 0x31;
else else
@ -218,7 +217,7 @@ static void runcamSplitSendCommand(runcamDevice_t *device, uint8_t argument)
uart_buffer[1] = RCSPLIT_PACKET_CMD_CTRL; uart_buffer[1] = RCSPLIT_PACKET_CMD_CTRL;
uart_buffer[2] = argument; uart_buffer[2] = argument;
uart_buffer[3] = RCSPLIT_PACKET_TAIL; uart_buffer[3] = RCSPLIT_PACKET_TAIL;
crc = crc_high_first(uart_buffer, 4); crc = crc8HighFirst(uart_buffer, 4);
// build up a full request [header]+[command]+[argument]+[crc]+[tail] // build up a full request [header]+[command]+[argument]+[crc]+[tail]
uart_buffer[3] = crc; uart_buffer[3] = crc;
@ -244,7 +243,7 @@ static void runcamDeviceParseV2DeviceInfo(rcdeviceResponseParseContext_t *ctx)
responseCtx.parserFunc = runcamDeviceParseV1DeviceInfo; responseCtx.parserFunc = runcamDeviceParseV1DeviceInfo;
responseCtx.device = ctx->device; responseCtx.device = ctx->device;
responseCtx.protocolVer = RCDEVICE_PROTOCOL_RCSPLIT_VERSION; responseCtx.protocolVer = RCDEVICE_PROTOCOL_RCSPLIT_VERSION;
rcdeviceRespCtxQueuePushRespCtx(&watingResponseQueue, &responseCtx); rcdeviceRespCtxQueuePush(&watingResponseQueue, &responseCtx);
runcamSplitSendCommand(ctx->device, 0xFF); runcamSplitSendCommand(ctx->device, 0xFF);
return; return;

4
src/main/io/rcdevice.h
View File

@ -160,6 +160,4 @@ bool runcamDeviceSimulateCameraButton(runcamDevice_t *device, uint8_t operation)
void runcamDeviceOpen5KeyOSDCableConnection(runcamDevice_t *device, rcdeviceRespParseFunc parseFunc); void runcamDeviceOpen5KeyOSDCableConnection(runcamDevice_t *device, rcdeviceRespParseFunc parseFunc);
void runcamDeviceClose5KeyOSDCableConnection(runcamDevice_t *device, rcdeviceRespParseFunc parseFunc); void runcamDeviceClose5KeyOSDCableConnection(runcamDevice_t *device, rcdeviceRespParseFunc parseFunc);
void runcamDeviceSimulate5KeyOSDCableButtonPress(runcamDevice_t *device, uint8_t operation, rcdeviceRespParseFunc parseFunc); void runcamDeviceSimulate5KeyOSDCableButtonPress(runcamDevice_t *device, uint8_t operation, rcdeviceRespParseFunc parseFunc);
void runcamDeviceSimulate5KeyOSDCableButtonRelease(runcamDevice_t *device, rcdeviceRespParseFunc parseFunc); void runcamDeviceSimulate5KeyOSDCableButtonRelease(runcamDevice_t *device, rcdeviceRespParseFunc parseFunc);
rcdeviceResponseParseContext_t* rcdeviceRespCtxQueueShift(rcdeviceWaitingResponseQueue *queue);

1
src/test/unit/rcdevice_unittest.cc
View File

@ -76,6 +76,7 @@ extern "C" {
int minTimeout = 180; int minTimeout = 180;
void rcdeviceSend5KeyOSDCableSimualtionEvent(rcdeviceCamSimulationKeyEvent_e key); void rcdeviceSend5KeyOSDCableSimualtionEvent(rcdeviceCamSimulationKeyEvent_e key);
rcdeviceResponseParseContext_t* rcdeviceRespCtxQueueShift(rcdeviceWaitingResponseQueue *queue);
} }
#define MAX_RESPONSES_COUNT 10 #define MAX_RESPONSES_COUNT 10