From 8dfc41759e788f19fd79d7513d1fad8af3b7c4ba Mon Sep 17 00:00:00 2001 From: "Pawel Spychalski (DzikuVx)" Date: Tue, 2 Jan 2018 20:14:41 +0100 Subject: [PATCH] Another compiler warning fiuxed --- .vscode/arduino.json | 2 +- crossbow.ino | 4 ++-- qsp.cpp | 2 +- qsp.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.vscode/arduino.json b/.vscode/arduino.json index 488acc1..7b8a141 100644 --- a/.vscode/arduino.json +++ b/.vscode/arduino.json @@ -2,5 +2,5 @@ "board": "bsfrance:avr:lora32u4", "sketch": "crossbow.ino", "port": "COM4", - "output": "./build" + "output": "../build" } \ No newline at end of file diff --git a/crossbow.ino b/crossbow.ino index 1398bd5..0892af9 100644 --- a/crossbow.ino +++ b/crossbow.ino @@ -1,5 +1,5 @@ -#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 diff --git a/qsp.cpp b/qsp.cpp index dbcefe1..b27c8cb 100644 --- a/qsp.cpp +++ b/qsp.cpp @@ -67,7 +67,7 @@ void qspComputeCrc(QspConfiguration_t *qsp, uint8_t dataByte) qsp->crc = crc8_dvb_s2(qsp->crc, dataByte); } -void encodeRxHealthPayload(QspConfiguration_t *qsp, RxDeviceState_t *rxDeviceState, RadioState_t *radioState) { +void encodeRxHealthPayload(QspConfiguration_t *qsp, RxDeviceState_t *rxDeviceState, volatile RadioState_t *radioState) { qsp->payload[0] = radioState->rssi; qsp->payload[1] = radioState->snr; qsp->payload[2] = rxDeviceState->rxVoltage; diff --git a/qsp.h b/qsp.h index 106d98f..061f09a 100644 --- a/qsp.h +++ b/qsp.h @@ -7,7 +7,7 @@ void decodeRxHealthPayload(QspConfiguration_t *qsp, RxDeviceState_t *rxDeviceSta uint8_t get10bitHighShift(uint8_t channel); uint8_t get10bitLowShift(uint8_t channel); void qspComputeCrc(QspConfiguration_t *qsp, uint8_t dataByte); -void encodeRxHealthPayload(QspConfiguration_t *qsp, RxDeviceState_t *rxDeviceState, RadioState_t *radioState); +void encodeRxHealthPayload(QspConfiguration_t *qsp, RxDeviceState_t *rxDeviceState, volatile RadioState_t *radioState); void encodeRcDataPayload(QspConfiguration_t *qsp, PPMReader *ppmSource, uint8_t noOfChannels); void qspDecodeIncomingFrame( QspConfiguration_t *qsp,