Skip to content

Commit

Permalink
Rename methods to better distinguish between buffer fill or actual send.
Browse files Browse the repository at this point in the history
  • Loading branch information
@richardclli
richardclli committed May 6, 2023
1 parent a368529 commit 81d08db
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 30 deletions.
38 changes: 19 additions & 19 deletions radio/src/pulses/afhds3.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ void ProtoState::setupFrame()

if (this->state == ModuleState::STATE_NOT_READY) {
TRACE("AFHDS3 [GET MODULE READY]");
trsp.sendFrame(COMMAND::MODULE_READY, FRAME_TYPE::REQUEST_GET_DATA);
trsp.putFrame(COMMAND::MODULE_READY, FRAME_TYPE::REQUEST_GET_DATA);
return;
}

Expand All @@ -426,7 +426,7 @@ void ProtoState::setupFrame()
TRACE("AFHDS3 [BIND]");
applyConfigFromModel();

trsp.sendFrame(COMMAND::MODULE_SET_CONFIG,
trsp.putFrame(COMMAND::MODULE_SET_CONFIG,
FRAME_TYPE::REQUEST_SET_EXPECT_DATA, cfg.buffer,
cfg.version == 0 ? sizeof(cfg.v0) : sizeof(cfg.v1));

Expand All @@ -442,26 +442,26 @@ void ProtoState::setupFrame()

// if module is ready but not started
if (this->state == ModuleState::STATE_READY) {
trsp.sendFrame(MODULE_STATE, FRAME_TYPE::REQUEST_GET_DATA);
trsp.putFrame(MODULE_STATE, FRAME_TYPE::REQUEST_GET_DATA);
return;
}

if (!modelIDSet) {
if (this->state != ModuleState::STATE_STANDBY) {
auto mode = (uint8_t)MODULE_MODE_E::STANDBY;
trsp.sendFrame(COMMAND::MODULE_MODE, FRAME_TYPE::REQUEST_SET_EXPECT_DATA, &mode, 1);
trsp.putFrame(COMMAND::MODULE_MODE, FRAME_TYPE::REQUEST_SET_EXPECT_DATA, &mode, 1);
return;
} else {
modelIDSet = true;
modelID = g_model.header.modelId[module_index];
trsp.sendFrame(COMMAND::MODEL_ID, FRAME_TYPE::REQUEST_SET_EXPECT_DATA,
trsp.putFrame(COMMAND::MODEL_ID, FRAME_TYPE::REQUEST_SET_EXPECT_DATA,
&g_model.header.modelId[module_index], 1);
return;
}
} else if (modelID != g_model.header.modelId[module_index]) {
modelIDSet = false;
auto mode = (uint8_t)MODULE_MODE_E::STANDBY;
trsp.sendFrame(COMMAND::MODULE_MODE, FRAME_TYPE::REQUEST_SET_EXPECT_DATA, &mode, 1);
trsp.putFrame(COMMAND::MODULE_MODE, FRAME_TYPE::REQUEST_SET_EXPECT_DATA, &mode, 1);
return;
}

Expand All @@ -476,7 +476,7 @@ void ProtoState::setupFrame()
TRACE("AFHDS3 [EXIT BIND]");
modelcfgGet = true;
auto mode = (uint8_t)MODULE_MODE_E::RUN;
trsp.sendFrame(COMMAND::MODULE_MODE, FRAME_TYPE::REQUEST_SET_EXPECT_DATA, &mode, 1);
trsp.putFrame(COMMAND::MODULE_MODE, FRAME_TYPE::REQUEST_SET_EXPECT_DATA, &mode, 1);
return;
}
}
Expand All @@ -502,7 +502,7 @@ void ProtoState::setupFrame()
((AFHDS3_MAX_CHANNELS << 8) | CHANNELS_DATA_MODE::FAIL_SAFE), 0};
setFailSafe((int16_t*)(&failSafe[1]), len);
TRACE("AFHDS ONE WAY FAILSAFE");
trsp.sendFrame(COMMAND::CHANNELS_FAILSAFE_DATA,
trsp.putFrame(COMMAND::CHANNELS_FAILSAFE_DATA,
FRAME_TYPE::REQUEST_SET_NO_RESP, (uint8_t*)failSafe,
AFHDS3_MAX_CHANNELS * 2 + 2);
return;
Expand All @@ -512,11 +512,11 @@ void ProtoState::setupFrame()
int16_t failSafe[18];
setFailSafe(&failSafe[0], len);
std::memcpy( &data[3], failSafe, 2*len );
trsp.sendFrame(COMMAND::SEND_COMMAND, FRAME_TYPE::REQUEST_SET_EXPECT_DATA, data, 2*len+3);
trsp.putFrame(COMMAND::SEND_COMMAND, FRAME_TYPE::REQUEST_SET_EXPECT_DATA, data, 2*len+3);
return;
}
} else {
trsp.sendFrame(cmd, FRAME_TYPE::REQUEST_GET_DATA);
trsp.putFrame(cmd, FRAME_TYPE::REQUEST_GET_DATA);
return;
}
}
Expand All @@ -525,7 +525,7 @@ void ProtoState::setupFrame()
sendChannelsData();
} else {
//default frame - request state
trsp.sendFrame(MODULE_STATE, FRAME_TYPE::REQUEST_GET_DATA);
trsp.putFrame(MODULE_STATE, FRAME_TYPE::REQUEST_GET_DATA);
}
}

Expand Down Expand Up @@ -739,7 +739,7 @@ if (this->state != ModuleState::STATE_SYNC_DONE) {
if(this->cmd_flg&0x02)
{
uint8_t data[] = { (uint8_t)(RX_CMD_GET_VERSION&0xFF), (uint8_t)((RX_CMD_GET_VERSION>>8)&0xFF), 0x00 };
trsp.sendFrame(COMMAND::SEND_COMMAND, FRAME_TYPE::REQUEST_SET_EXPECT_DATA, data, sizeof(data));
trsp.putFrame(COMMAND::SEND_COMMAND, FRAME_TYPE::REQUEST_SET_EXPECT_DATA, data, sizeof(data));
return true;
}
auto *cfg = this->getConfig();
Expand All @@ -752,7 +752,7 @@ if (this->state != ModuleState::STATE_SYNC_DONE) {
if(this->cmd_flg&0x08)
{
uint8_t data[] = { (uint8_t)(RX_CMD_BUS_TYPE_V0&0xFF), (uint8_t)((RX_CMD_BUS_TYPE_V0>>8)&0xFF), 0x1, bustype };
trsp.sendFrame(COMMAND::SEND_COMMAND, FRAME_TYPE::REQUEST_SET_EXPECT_DATA, data, sizeof(data));
trsp.putFrame(COMMAND::SEND_COMMAND, FRAME_TYPE::REQUEST_SET_EXPECT_DATA, data, sizeof(data));
if(busdir<2)
this->cmd_flg |= 0x10;
return true;
Expand All @@ -762,7 +762,7 @@ if (this->state != ModuleState::STATE_SYNC_DONE) {
cfg->others.ExternalBusType = IBUS1_OUT;
busdir = IBUS1_OUT;
uint8_t data1[] = { (uint8_t)(RX_CMD_IBUS_DIRECTION&0xFF), (uint8_t)((RX_CMD_IBUS_DIRECTION>>8)&0xFF), 0x1, busdir };
trsp.sendFrame(COMMAND::SEND_COMMAND, FRAME_TYPE::REQUEST_SET_EXPECT_DATA, data1, sizeof(data1));
trsp.putFrame(COMMAND::SEND_COMMAND, FRAME_TYPE::REQUEST_SET_EXPECT_DATA, data1, sizeof(data1));
return true;
}
}
Expand All @@ -771,21 +771,21 @@ if (this->state != ModuleState::STATE_SYNC_DONE) {
if(this->cmd_flg&0x08)
{
uint8_t data[] = { (uint8_t)(RX_CMD_BUS_TYPE_V0&0xFF), (uint8_t)((RX_CMD_BUS_TYPE_V0>>8)&0xFF), 0x1, 0 };
trsp.sendFrame(COMMAND::SEND_COMMAND, FRAME_TYPE::REQUEST_SET_EXPECT_DATA, data, sizeof(data));
trsp.putFrame(COMMAND::SEND_COMMAND, FRAME_TYPE::REQUEST_SET_EXPECT_DATA, data, sizeof(data));
this->cmd_flg |= 0x10;
return true;
}
else if((this->cmd_flg&0x10))
{
if(busdir>=2) busdir = 0; //IBUSOUT
uint8_t data1[] = { (uint8_t)(RX_CMD_IBUS_DIRECTION&0xFF), (uint8_t)((RX_CMD_IBUS_DIRECTION>>8)&0xFF), 0x1, busdir };
trsp.sendFrame(COMMAND::SEND_COMMAND, FRAME_TYPE::REQUEST_SET_EXPECT_DATA, data1, sizeof(data1));
trsp.putFrame(COMMAND::SEND_COMMAND, FRAME_TYPE::REQUEST_SET_EXPECT_DATA, data1, sizeof(data1));
return true;
}
else if((this->cmd_flg&0x20))
{
uint8_t data[] = { (uint8_t)(RX_CMD_BUS_TYPE_V0&0xFF), (uint8_t)((RX_CMD_BUS_TYPE_V0>>8)&0xFF), 0x1, 2 };
trsp.sendFrame(COMMAND::SEND_COMMAND, FRAME_TYPE::REQUEST_SET_EXPECT_DATA, data, sizeof(data));
trsp.putFrame(COMMAND::SEND_COMMAND, FRAME_TYPE::REQUEST_SET_EXPECT_DATA, data, sizeof(data));
return true;
}
}
Expand Down Expand Up @@ -813,15 +813,15 @@ void ProtoState::sendChannelsData()
buffer[index] = channelValue;
}

trsp.sendFrame(COMMAND::CHANNELS_FAILSAFE_DATA, FRAME_TYPE::REQUEST_SET_NO_RESP,
trsp.putFrame(COMMAND::CHANNELS_FAILSAFE_DATA, FRAME_TYPE::REQUEST_SET_NO_RESP,
(uint8_t*)buffer, (channels + 1) * 2);
}

void ProtoState::stop()
{
TRACE("AFHDS3 STOP");
auto mode = (uint8_t)MODULE_MODE_E::STANDBY;
trsp.sendFrame(COMMAND::MODULE_MODE, FRAME_TYPE::REQUEST_SET_EXPECT_DATA, &mode, 1);
trsp.putFrame(COMMAND::MODULE_MODE, FRAME_TYPE::REQUEST_SET_EXPECT_DATA, &mode, 1);
}

void ProtoState::resetConfig(uint8_t version)
Expand Down
18 changes: 9 additions & 9 deletions radio/src/pulses/afhds3_transport.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ void FrameTransport::clear()
esc_state = 0;
}

void FrameTransport::sendByte(uint8_t b)
void FrameTransport::putByte(uint8_t b)
{
*(data_ptr++) = b;
}
Expand All @@ -78,15 +78,15 @@ void FrameTransport::putBytes(uint8_t* data, int length)
uint8_t byte = data[i];
crc += byte;
if (END == byte) {
sendByte(ESC);
sendByte(ESC_END);
putByte(ESC);
putByte(ESC_END);
}
else if (ESC == byte) {
sendByte(ESC);
sendByte(ESC_ESC);
putByte(ESC);
putByte(ESC_ESC);
}
else {
sendByte(byte);
putByte(byte);
}
}
}
Expand All @@ -99,7 +99,7 @@ void FrameTransport::putFrame(COMMAND command, FRAME_TYPE frameType,
data_ptr = trsp_buffer;

crc = 0;
sendByte(START);
putByte(START);

uint8_t buffer[] = {frameAddress, frameIndex, frameType, command};
putBytes(buffer, 4);
Expand All @@ -112,7 +112,7 @@ void FrameTransport::putFrame(COMMAND command, FRAME_TYPE frameType,
// footer
uint8_t crcValue = crc ^ 0xff;
putBytes(&crcValue, 1);
sendByte(END);
putByte(END);
}

uint32_t FrameTransport::getFrameSize()
Expand Down Expand Up @@ -236,7 +236,7 @@ void Transport::clear()
operationState = State::UNKNOWN;
}

void Transport::sendFrame(COMMAND command, FRAME_TYPE frameType, uint8_t* data,
void Transport::putFrame(COMMAND command, FRAME_TYPE frameType, uint8_t* data,
uint8_t dataLength)
{
operationState = State::SENDING_COMMAND;
Expand Down
4 changes: 2 additions & 2 deletions radio/src/pulses/afhds3_transport.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ struct FrameTransport {
void init(void* buffer, uint8_t fAddr);
void clear();

void sendByte(uint8_t b);
void putByte(uint8_t b);
void putBytes(uint8_t* data, int length);

void putFrame(COMMAND command, FRAME_TYPE frameType, uint8_t* data,
Expand Down Expand Up @@ -195,7 +195,7 @@ class Transport

void clear();

void sendFrame(COMMAND command, FRAME_TYPE frameType, uint8_t* data = nullptr,
void putFrame(COMMAND command, FRAME_TYPE frameType, uint8_t* data = nullptr,
uint8_t dataLength = 0);

void enqueue(COMMAND command, FRAME_TYPE frameType, bool useData = false,
Expand Down

0 comments on commit 81d08db

Please sign in to comment.