This commit is contained in:
Pawel Spychalski (DzikuVx)
2017-10-24 20:09:43 +02:00
parent 2a47aac573
commit b1c3b36b7c
2 changed files with 0 additions and 57 deletions

View File

@@ -1,4 +1,3 @@
// #define LORA_HARDWARE_SERIAL
#define LORA_HARDWARE_SPI #define LORA_HARDWARE_SPI
// #define DEVICE_MODE_TX // #define DEVICE_MODE_TX
@@ -51,47 +50,6 @@ PPMReader ppmReader(PPM_INPUT_PIN, PPM_INPUT_INTERRUPT, true);
QspConfiguration_t qsp = {}; QspConfiguration_t qsp = {};
RxDeviceState_t rxDeviceState = {}; RxDeviceState_t rxDeviceState = {};
/*
* End of QSP protocol implementation
*/
/*
* Serial port used to send data
*/
#ifdef LORA_HARDWARE_SERIAL
unint8_t getRadioRssi(void)
{
return 0;
}
float getRadioSnr(void)
{
return 0;
}
void radioPacketStart(void)
{
}
void radioPacketEnd(void)
{
Serial.end();
delay(E45_TTL_100_UART_DOWNTIME);
Serial.begin(UART_SPEED);
}
void writeToRadio(uint8_t dataByte, QspConfiguration_t *qsp)
{
//Compute CRC
qspComputeCrc(qsp, dataByte);
//Write to radio
Serial.write(dataByte);
}
#endif
#ifdef LORA_HARDWARE_SPI #ifdef LORA_HARDWARE_SPI
uint8_t getRadioRssi(void) uint8_t getRadioRssi(void)
@@ -150,10 +108,6 @@ void setup(void)
qsp.deviceState = DEVICE_STATE_OK; qsp.deviceState = DEVICE_STATE_OK;
#endif #endif
#ifdef LORA_HARDWARE_SERIAL
Serial.begin(UART_SPEED);
#endif
#ifdef LORA_HARDWARE_SPI #ifdef LORA_HARDWARE_SPI
#ifdef WAIT_FOR_SERIAL #ifdef WAIT_FOR_SERIAL
@@ -345,13 +299,6 @@ void loop(void)
#endif #endif
#ifdef LORA_HARDWARE_SERIAL
if (Serial.available())
{
qspDecodeIncomingFrame(&qsp, Serial.read(), ppm);
}
#endif
if (qsp.canTransmit && transmitPayload) if (qsp.canTransmit && transmitPayload)
{ {
radioPacketStart(); radioPacketStart();

View File

@@ -6,10 +6,6 @@
#define RC_CHANNEL_MIN 990 #define RC_CHANNEL_MIN 990
#define RC_CHANNEL_MAX 2010 #define RC_CHANNEL_MAX 2010
//Only for UART connected radio modules
#define UART_SPEED 57600
#define E45_TTL_100_UART_DOWNTIME 30
#define RX_RX_HEALTH_FRAME_RATE 1000 #define RX_RX_HEALTH_FRAME_RATE 1000
#define TX_RC_FRAME_RATE 500 //ms #define TX_RC_FRAME_RATE 500 //ms
#define RX_FAILSAFE_DELAY (TX_RC_FRAME_RATE * 8) #define RX_FAILSAFE_DELAY (TX_RC_FRAME_RATE * 8)