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

fix flash overflow problem

This commit is contained in:
azol 2018-06-23 13:15:37 +08:00
parent 53458d4cf1
commit 7fa9399575
3 changed files with 15 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,9 +32,6 @@
#include "rcdevice.h"
#include "fc/config.h"
#include "config/feature.h"
#ifdef USE_RCDEVICE
typedef struct runcamDeviceExpectedResponseLength_s {
@ -50,6 +47,7 @@ static runcamDeviceExpectedResponseLength_t expectedResponsesLength[] = {
};
rcdeviceWaitingResponseQueue watingResponseQueue;
static uint8_t recvBuf[RCDEVICE_PROTOCOL_MAX_PACKET_SIZE]; // all the response contexts using same recv buffer
static uint8_t runcamDeviceGetRespLen(uint8_t command)
{
@ -64,10 +62,10 @@ static uint8_t runcamDeviceGetRespLen(uint8_t command)
static bool rcdeviceRespCtxQueuePushRespCtx(rcdeviceWaitingResponseQueue *queue, rcdeviceResponseParseContext_t *respCtx)
{
if (queue == NULL || (queue->itemCount + 1) > MAX_WAITING_RESPONSES || queue->tailPos >= MAX_WAITING_RESPONSES) {
if (queue == NULL || (queue->itemCount + 1) > MAX_WAITING_RESPONSES) {
return false;
}
queue->buffer[queue->tailPos] = *respCtx;
int newTailPos = queue->tailPos + 1;
@ -82,7 +80,7 @@ static bool rcdeviceRespCtxQueuePushRespCtx(rcdeviceWaitingResponseQueue *queue,
static rcdeviceResponseParseContext_t* rcdeviceRespCtxQueuePeekFront(rcdeviceWaitingResponseQueue *queue)
{
if (queue == NULL || queue->itemCount == 0 || queue->headPos >= MAX_WAITING_RESPONSES) {
if (queue == NULL || queue->itemCount == 0) {
return NULL;
}
@ -92,10 +90,10 @@ static rcdeviceResponseParseContext_t* rcdeviceRespCtxQueuePeekFront(rcdeviceWai
static rcdeviceResponseParseContext_t* rcdeviceRespCtxQueueShift(rcdeviceWaitingResponseQueue *queue)
{
if (queue == NULL || queue->itemCount == 0 || queue->headPos >= MAX_WAITING_RESPONSES) {
if (queue == NULL || queue->itemCount == 0) {
return NULL;
}
rcdeviceResponseParseContext_t *ctx = &queue->buffer[queue->headPos];
int newHeadPos = queue->headPos + 1;
if (newHeadPos >= MAX_WAITING_RESPONSES) {
@ -155,6 +153,7 @@ static void runcamDeviceSendRequestAndWaitingResp(runcamDevice_t *device, uint8_
rcdeviceResponseParseContext_t responseCtx;
memset(&responseCtx, 0, sizeof(rcdeviceResponseParseContext_t));
responseCtx.recvBuf = recvBuf;
responseCtx.command = commandID;
responseCtx.maxRetryTimes = maxRetryTimes;
responseCtx.expectedRespLen = runcamDeviceGetRespLen(commandID);
@ -172,23 +171,6 @@ static void runcamDeviceSendRequestAndWaitingResp(runcamDevice_t *device, uint8_
runcamDeviceSendPacket(device, commandID, paramData, paramDataLen);
}
static uint8_t calcCRCFromData(uint8_t *ptr, uint8_t len)
{
uint8_t i;
uint8_t crc = 0x00;
while (len--) {
crc ^= *ptr++;
for (i = 8; i > 0; --i) {
if (crc & 0x80) {
crc = (crc << 1) ^ 0x31;
} else {
crc = (crc << 1);
}
}
}
return crc;
}
static void runcamDeviceParseV2DeviceInfo(rcdeviceResponseParseContext_t *ctx)
{
if (ctx->result != RCDEVICE_RESP_SUCCESS) {
@ -211,11 +193,6 @@ static void runcamDeviceGetDeviceInfo(runcamDevice_t *device)
runcamDeviceSendRequestAndWaitingResp(device, RCDEVICE_PROTOCOL_COMMAND_GET_DEVICE_INFO, NULL, 0, 5000, 0, NULL, runcamDeviceParseV2DeviceInfo);
}
static void runcamDeviceSend5KeyOSDCableConnectionEvent(runcamDevice_t *device, uint8_t operation, rcdeviceRespParseFunc parseFunc)
{
runcamDeviceSendRequestAndWaitingResp(device, RCDEVICE_PROTOCOL_COMMAND_5KEY_CONNECTION, &operation, sizeof(uint8_t), 200, 1, NULL, parseFunc);
}
// init the runcam device, it'll search the UART port with FUNCTION_RCDEVICE id
// this function will delay 400ms in the first loop to wait the device prepared,
// as we know, there are has some camera need about 200~400ms to initialization,
@ -251,14 +228,16 @@ bool runcamDeviceSimulateCameraButton(runcamDevice_t *device, uint8_t operation)
// camera
void runcamDeviceOpen5KeyOSDCableConnection(runcamDevice_t *device, rcdeviceRespParseFunc parseFunc)
{
runcamDeviceSend5KeyOSDCableConnectionEvent(device, RCDEVICE_PROTOCOL_5KEY_CONNECTION_OPEN, parseFunc);
uint8_t operation = RCDEVICE_PROTOCOL_5KEY_CONNECTION_OPEN;
runcamDeviceSendRequestAndWaitingResp(device, RCDEVICE_PROTOCOL_COMMAND_5KEY_CONNECTION, &operation, sizeof(uint8_t), 200, 1, NULL, parseFunc);
}
// when the control was stop, must call this method to the camera to disconnect
// with camera.
void runcamDeviceClose5KeyOSDCableConnection(runcamDevice_t *device, rcdeviceRespParseFunc parseFunc)
{
runcamDeviceSend5KeyOSDCableConnectionEvent(device, RCDEVICE_PROTOCOL_5KEY_CONNECTION_CLOSE, parseFunc);
uint8_t operation = RCDEVICE_PROTOCOL_5KEY_CONNECTION_CLOSE;
runcamDeviceSendRequestAndWaitingResp(device, RCDEVICE_PROTOCOL_COMMAND_5KEY_CONNECTION, &operation, sizeof(uint8_t), 200, 1, NULL, parseFunc);
}
// simulate button press event of 5 key osd cable with special button
@ -316,13 +295,7 @@ void rcdeviceReceive(timeUs_t currentTimeUs)
// if data received done, trigger callback to parse response data, and update rcdevice state
if (respCtx->recvRespLen == respCtx->expectedRespLen) {
// verify the crc value
if (respCtx->protocolVer == RCDEVICE_PROTOCOL_RCSPLIT_VERSION) {
uint8_t crcFromPacket = respCtx->recvBuf[3];
respCtx->recvBuf[3] = respCtx->recvBuf[4]; // move packet tail field to crc field, and calc crc with first 4 bytes
uint8_t crc = calcCRCFromData(respCtx->recvBuf, 4);
respCtx->result = (crc == crcFromPacket) ? RCDEVICE_RESP_SUCCESS : RCDEVICE_RESP_INCORRECT_CRC;
} else if (respCtx->protocolVer == RCDEVICE_PROTOCOL_VERSION_1_0) {
if (respCtx->protocolVer == RCDEVICE_PROTOCOL_VERSION_1_0) {
uint8_t crc = 0;
for (int i = 0; i < respCtx->recvRespLen; i++) {
crc = crc8_dvb_s2(crc, respCtx->recvBuf[i]);

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

@ -110,7 +110,7 @@ typedef struct runcamDevice_s {
bool isReady;
} runcamDevice_t;
#define MAX_WAITING_RESPONSES 20
#define MAX_WAITING_RESPONSES 5
typedef enum {
RCDEVICE_RESP_SUCCESS = 0,
@ -124,7 +124,7 @@ struct rcdeviceResponseParseContext_s {
uint8_t command;
uint8_t expectedRespLen; // total length of response data
uint8_t recvRespLen; // length of the data received
uint8_t recvBuf[RCDEVICE_PROTOCOL_MAX_PACKET_SIZE]; // response data buffer
uint8_t *recvBuf; // response data buffer
timeUs_t timeout;
timeUs_t timeoutTimestamp; // if zero, it's means keep waiting for the response
rcdeviceRespParseFunc parserFunc;
@ -155,6 +155,4 @@ bool runcamDeviceSimulateCameraButton(runcamDevice_t *device, uint8_t operation)
void runcamDeviceOpen5KeyOSDCableConnection(runcamDevice_t *device, rcdeviceRespParseFunc parseFunc);
void runcamDeviceClose5KeyOSDCableConnection(runcamDevice_t *device, rcdeviceRespParseFunc parseFunc);
void runcamDeviceSimulate5KeyOSDCableButtonPress(runcamDevice_t *device, uint8_t operation, rcdeviceRespParseFunc parseFunc);
void runcamDeviceSimulate5KeyOSDCableButtonRelease(runcamDevice_t *device, rcdeviceRespParseFunc parseFunc);
void rcdeviceReceive(timeUs_t currentTimeUs);
void runcamDeviceSimulate5KeyOSDCableButtonRelease(runcamDevice_t *device, rcdeviceRespParseFunc parseFunc);

4
src/main/io/rcdevice_cam.c
View File

@ -34,14 +34,10 @@
#include "io/beeper.h"
#include "io/serial.h"
#include "io/osd.h"
#include "io/rcdevice_cam.h"
#include "rx/rx.h"
#include "fc/config.h"
#include "config/feature.h"
#ifdef USE_RCDEVICE
#define IS_HI(X) (rcData[X] > FIVE_KEY_CABLE_JOYSTICK_MAX)