Merge remote-tracking branch 'origin/master' into tx-non-blocking

This commit is contained in:
Pawel Spychalski (DzikuVx)
2018-01-02 21:21:36 +01:00
2 changed files with 0 additions and 11 deletions

View File

@@ -72,15 +72,6 @@ uint8_t getRadioSnr(void)
return (uint8_t) constrain(LoRa.packetSnr(), 0, 255); return (uint8_t) constrain(LoRa.packetSnr(), 0, 255);
} }
void writeToRadio(uint8_t dataByte, QspConfiguration_t *qsp)
{
//Compute CRC
qspComputeCrc(qsp, dataByte);
//Write to radio
LoRa.write(dataByte);
}
void onQspSuccess(QspConfiguration_t *qsp, TxDeviceState_t *txDeviceState, RxDeviceState_t *rxDeviceState, volatile RadioState_t *radioState) { void onQspSuccess(QspConfiguration_t *qsp, TxDeviceState_t *txDeviceState, RxDeviceState_t *rxDeviceState, volatile RadioState_t *radioState) {
//If devide received a valid frame, that means it can start to talk //If devide received a valid frame, that means it can start to talk
qsp->canTransmit = true; qsp->canTransmit = true;
@@ -131,7 +122,6 @@ void setup(void)
Serial.begin(115200); Serial.begin(115200);
#endif #endif
qsp.hardwareWriteFunction = writeToRadio;
qsp.onSuccessCallback = onQspSuccess; qsp.onSuccessCallback = onQspSuccess;
qsp.onFailureCallback = onQspFailure; qsp.onFailureCallback = onQspFailure;

View File

@@ -116,7 +116,6 @@ struct QspConfiguration_t {
uint32_t lastFrameReceivedAt[QSP_FRAME_COUNT] = {0}; uint32_t lastFrameReceivedAt[QSP_FRAME_COUNT] = {0};
uint32_t anyFrameRecivedAt = 0; uint32_t anyFrameRecivedAt = 0;
uint8_t deviceState = DEVICE_STATE_UNDETERMINED; uint8_t deviceState = DEVICE_STATE_UNDETERMINED;
void (* hardwareWriteFunction)(uint8_t, QspConfiguration_t*);
void (* onSuccessCallback)(QspConfiguration_t*, TxDeviceState_t*, RxDeviceState_t*, volatile RadioState_t*); void (* onSuccessCallback)(QspConfiguration_t*, TxDeviceState_t*, RxDeviceState_t*, volatile RadioState_t*);
void (* onFailureCallback)(QspConfiguration_t*, TxDeviceState_t*, RxDeviceState_t*, volatile RadioState_t*); void (* onFailureCallback)(QspConfiguration_t*, TxDeviceState_t*, RxDeviceState_t*, volatile RadioState_t*);
bool canTransmit = false; bool canTransmit = false;