From 85461b5d890a954820571bd3371f2e8a0b438148 Mon Sep 17 00:00:00 2001 From: "Pawel Spychalski (DzikuVx)" Date: Sat, 16 Dec 2017 09:50:02 +0100 Subject: [PATCH 1/3] close #32 --- crossbow.ino | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/crossbow.ino b/crossbow.ino index da81631..c8e3c77 100644 --- a/crossbow.ino +++ b/crossbow.ino @@ -1,8 +1,8 @@ -#define DEVICE_MODE_TX -// #define DEVICE_MODE_RX +// #define DEVICE_MODE_TX +#define DEVICE_MODE_RX // #define FEATURE_TX_OLED -#define FORCE_TX_WITHOUT_INPUT +// #define FORCE_TX_WITHOUT_INPUT #define DEBUG_SERIAL // #define DEBUG_PING_PONG @@ -341,7 +341,7 @@ void loop(void) if (lastRxStateTaskTime + RX_TASK_HEALTH < currentMillis) { lastRxStateTaskTime = currentMillis; updateRxDeviceState(&rxDeviceState); - rxDeviceState.channels[RSSI_CHANNEL - 1] = map(rxDeviceState.rssi, 0, 164, 1000, 2000); + rxDeviceState.channels[RSSI_CHANNEL - 1] = map(radioState.rssi, 0, 164, 1000, 2000); if (qsp.deviceState == DEVICE_STATE_FAILSAFE) { digitalWrite(LED_BUILTIN, HIGH); } else { From 7e9f0fd04ee3cb7007d005b08ace0cfa1eec875b Mon Sep 17 00:00:00 2001 From: "Pawel Spychalski (DzikuVx)" Date: Sat, 16 Dec 2017 10:13:29 +0100 Subject: [PATCH 2/3] close #36 --- crossbow.ino | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/crossbow.ino b/crossbow.ino index c8e3c77..79af241 100644 --- a/crossbow.ino +++ b/crossbow.ino @@ -4,7 +4,7 @@ // #define FEATURE_TX_OLED // #define FORCE_TX_WITHOUT_INPUT -#define DEBUG_SERIAL +// #define DEBUG_SERIAL // #define DEBUG_PING_PONG // #define DEBUG_LED @@ -341,7 +341,10 @@ void loop(void) if (lastRxStateTaskTime + RX_TASK_HEALTH < currentMillis) { lastRxStateTaskTime = currentMillis; updateRxDeviceState(&rxDeviceState); - rxDeviceState.channels[RSSI_CHANNEL - 1] = map(radioState.rssi, 0, 164, 1000, 2000); + + uint8_t output = constrain(radioState.rssi - 40, 0, 100); + + rxDeviceState.channels[RSSI_CHANNEL - 1] = (output * 10) + 1000; if (qsp.deviceState == DEVICE_STATE_FAILSAFE) { digitalWrite(LED_BUILTIN, HIGH); } else { From ac36371cdb018b873be4d5c1ba452d059a12981f Mon Sep 17 00:00:00 2001 From: Pawel Spychalski Date: Mon, 18 Dec 2017 10:18:30 +0100 Subject: [PATCH 3/3] cleanup --- crossbow.ino | 10 ---------- variables.h | 1 - 2 files changed, 11 deletions(-) diff --git a/crossbow.ino b/crossbow.ino index 79af241..052e23b 100644 --- a/crossbow.ino +++ b/crossbow.ino @@ -72,15 +72,6 @@ uint8_t getRadioSnr(void) 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, RadioState_t *radioState) { //If devide received a valid frame, that means it can start to talk qsp->canTransmit = true; @@ -131,7 +122,6 @@ void setup(void) Serial.begin(115200); #endif - qsp.hardwareWriteFunction = writeToRadio; qsp.onSuccessCallback = onQspSuccess; qsp.onFailureCallback = onQspFailure; diff --git a/variables.h b/variables.h index 2202804..9039774 100644 --- a/variables.h +++ b/variables.h @@ -111,7 +111,6 @@ struct QspConfiguration_t { uint32_t lastFrameReceivedAt[QSP_FRAME_COUNT] = {0}; uint32_t anyFrameRecivedAt = 0; uint8_t deviceState = DEVICE_STATE_UNDETERMINED; - void (* hardwareWriteFunction)(uint8_t, QspConfiguration_t*); void (* onSuccessCallback)(QspConfiguration_t*, TxDeviceState_t*, RxDeviceState_t*, RadioState_t*); void (* onFailureCallback)(QspConfiguration_t*, TxDeviceState_t*, RxDeviceState_t*, RadioState_t*); bool canTransmit = false;