RX failsafe with pulling PPM output LOW
This commit is contained in:
41
crossbow.ino
41
crossbow.ino
@@ -17,8 +17,8 @@ TODO
|
|||||||
// #define LORA_HARDWARE_SERIAL
|
// #define LORA_HARDWARE_SERIAL
|
||||||
#define LORA_HARDWARE_SPI
|
#define LORA_HARDWARE_SPI
|
||||||
|
|
||||||
#define DEVICE_MODE_TX
|
// #define DEVICE_MODE_TX
|
||||||
// #define DEVICE_MODE_RX
|
#define DEVICE_MODE_RX
|
||||||
|
|
||||||
int ppm[PPM_CHANNEL_COUNT] = {0};
|
int ppm[PPM_CHANNEL_COUNT] = {0};
|
||||||
|
|
||||||
@@ -141,6 +141,12 @@ void setup(void)
|
|||||||
{
|
{
|
||||||
qsp.hardwareWriteFunction = writeToRadio;
|
qsp.hardwareWriteFunction = writeToRadio;
|
||||||
|
|
||||||
|
#ifdef DEVICE_MODE_RX
|
||||||
|
qsp.deviceState = DEVICE_STATE_FAILSAFE;
|
||||||
|
#else
|
||||||
|
qsp.deviceState = DEVICE_STATE_OK;
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef LORA_HARDWARE_SERIAL
|
#ifdef LORA_HARDWARE_SERIAL
|
||||||
Serial.begin(UART_SPEED);
|
Serial.begin(UART_SPEED);
|
||||||
#endif
|
#endif
|
||||||
@@ -192,15 +198,23 @@ void setup(void)
|
|||||||
|
|
||||||
#ifdef DEVICE_MODE_RX
|
#ifdef DEVICE_MODE_RX
|
||||||
|
|
||||||
ISR(TIMER1_COMPA_vect)
|
void writePpmOutput(uint8_t val) {
|
||||||
{ //leave this alone
|
if (qsp.deviceState == DEVICE_STATE_OK) {
|
||||||
|
digitalWrite(PPM_OUTPUT_PIN, val);
|
||||||
|
} else {
|
||||||
|
//This is failsafe state, we pull output low so FC can decide about failsafe
|
||||||
|
digitalWrite(PPM_OUTPUT_PIN, LOW);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ISR(TIMER1_COMPA_vect) { //leave this alone
|
||||||
static boolean state = true;
|
static boolean state = true;
|
||||||
|
|
||||||
TCNT1 = 0;
|
TCNT1 = 0;
|
||||||
|
|
||||||
if (state)
|
if (state)
|
||||||
{ //start pulse
|
{ //start pulse
|
||||||
digitalWrite(PPM_OUTPUT_PIN, PPM_SIGNAL_POSITIVE_STATE);
|
writePpmOutput(PPM_SIGNAL_POSITIVE_STATE);
|
||||||
OCR1A = PPM_PULSE_LENGTH * 2;
|
OCR1A = PPM_PULSE_LENGTH * 2;
|
||||||
state = false;
|
state = false;
|
||||||
}
|
}
|
||||||
@@ -209,7 +223,7 @@ ISR(TIMER1_COMPA_vect)
|
|||||||
static byte cur_chan_numb;
|
static byte cur_chan_numb;
|
||||||
static unsigned int calc_rest;
|
static unsigned int calc_rest;
|
||||||
|
|
||||||
digitalWrite(PPM_OUTPUT_PIN, !PPM_SIGNAL_POSITIVE_STATE);
|
writePpmOutput(!PPM_SIGNAL_POSITIVE_STATE);
|
||||||
state = true;
|
state = true;
|
||||||
|
|
||||||
if (cur_chan_numb >= PPM_CHANNEL_COUNT)
|
if (cur_chan_numb >= PPM_CHANNEL_COUNT)
|
||||||
@@ -232,13 +246,11 @@ ISR(TIMER1_COMPA_vect)
|
|||||||
|
|
||||||
void loop(void)
|
void loop(void)
|
||||||
{
|
{
|
||||||
|
uint32_t currentMillis = millis();
|
||||||
bool transmitPayload = false;
|
bool transmitPayload = false;
|
||||||
|
|
||||||
#ifdef DEVICE_MODE_TX
|
#ifdef DEVICE_MODE_TX
|
||||||
|
|
||||||
uint32_t currentMillis = millis();
|
|
||||||
|
|
||||||
//TODO It should be only possible to transmit when radio is not receiveing
|
//TODO It should be only possible to transmit when radio is not receiveing
|
||||||
/*
|
/*
|
||||||
* RC_DATA QSP frame
|
* RC_DATA QSP frame
|
||||||
@@ -271,6 +283,17 @@ void loop(void)
|
|||||||
qspEncodeFrame(&qsp);
|
qspEncodeFrame(&qsp);
|
||||||
radioPacketEnd();
|
radioPacketEnd();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Here we do state handling and similar operations
|
||||||
|
*/
|
||||||
|
#ifdef DEVICE_MODE_RX
|
||||||
|
if (abs(currentMillis - qsp.lastRcFrameReceived) > RX_FAILSAFE_DELAY) {
|
||||||
|
qsp.deviceState = DEVICE_STATE_FAILSAFE;
|
||||||
|
} else {
|
||||||
|
qsp.deviceState = DEVICE_STATE_OK;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef LORA_HARDWARE_SPI
|
#ifdef LORA_HARDWARE_SPI
|
||||||
|
|||||||
1
qsp.cpp
1
qsp.cpp
@@ -197,6 +197,7 @@ void qspDecodeIncomingFrame(QspConfiguration_t *qsp, uint8_t incomingByte, int p
|
|||||||
switch (frameId)
|
switch (frameId)
|
||||||
{
|
{
|
||||||
case QSP_FRAME_RC_DATA:
|
case QSP_FRAME_RC_DATA:
|
||||||
|
qsp->lastRcFrameReceived = millis();
|
||||||
qspDecodeRcDataFrame(qsp, ppm);
|
qspDecodeRcDataFrame(qsp, ppm);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
#define PPM_CHANNEL_COUNT 10
|
#define PPM_CHANNEL_COUNT 10
|
||||||
|
|
||||||
#define TX_RC_FRAME_RATE 5000 //ms
|
#define TX_RC_FRAME_RATE 5000 //ms
|
||||||
|
#define RX_FAILSAFE_DELAY (TX_RC_FRAME_RATE * 4)
|
||||||
|
|
||||||
#define CHANNEL_ID 0x01
|
#define CHANNEL_ID 0x01
|
||||||
#define QSP_PREAMBLE 0x51
|
#define QSP_PREAMBLE 0x51
|
||||||
@@ -27,6 +28,11 @@ enum dataStates {
|
|||||||
QSP_STATE_CRC_RECEIVED
|
QSP_STATE_CRC_RECEIVED
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enum deviceStates {
|
||||||
|
DEVICE_STATE_OK,
|
||||||
|
DEVICE_STATE_FAILSAFE
|
||||||
|
};
|
||||||
|
|
||||||
#define PPM_INPUT_PIN 2
|
#define PPM_INPUT_PIN 2
|
||||||
#define PPM_INPUT_INTERRUPT 1 //For Pro Micro 1, For Pro Mini 0
|
#define PPM_INPUT_INTERRUPT 1 //For Pro Micro 1, For Pro Mini 0
|
||||||
|
|
||||||
@@ -42,5 +48,7 @@ struct QspConfiguration_t {
|
|||||||
uint8_t payload[QSP_PAYLOAD_LENGTH] = {0};
|
uint8_t payload[QSP_PAYLOAD_LENGTH] = {0};
|
||||||
uint8_t payloadLength = 0;
|
uint8_t payloadLength = 0;
|
||||||
uint8_t frameToSend = 0;
|
uint8_t frameToSend = 0;
|
||||||
|
uint32_t lastRcFrameReceived = 0;
|
||||||
|
uint8_t deviceState = DEVICE_STATE_OK;
|
||||||
void (* hardwareWriteFunction)(uint8_t, QspConfiguration_t*);
|
void (* hardwareWriteFunction)(uint8_t, QspConfiguration_t*);
|
||||||
};
|
};
|
||||||
Reference in New Issue
Block a user