From 435a3eded875b289d4a53333230969be26306c62 Mon Sep 17 00:00:00 2001
From: nrs1g15 <nrs1g15@soton.ac.uk>
Date: Thu, 1 Aug 2019 22:38:55 +0100
Subject: [PATCH] Removed additional pins since shield does not support them
---
sufst-controller/wireless.cpp | 4 +++-
sufst-controller/wireless.h | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/sufst-controller/wireless.cpp b/sufst-controller/wireless.cpp
index 63992c5..12a29f8 100644
--- a/sufst-controller/wireless.cpp
+++ b/sufst-controller/wireless.cpp
@@ -38,7 +38,8 @@ void wirelessWrite(void *data, uint8_t len)
void wirelessProcess()
{
- if (!digitalRead(XBEE_RTS_PIN)) {
+ if (cirBufferAvailable(&wirelessTxCirBuffer) >= WIRELESS_PAYLOAD_LEN) {
+// if (!digitalRead(XBEE_RTS_PIN)) {
if (XBEE_SERIAL.availableForWrite() >= WIRELESS_PAYLOAD_LEN) {
static uint8_t payload[WIRELESS_PAYLOAD_LEN];
@@ -49,5 +50,6 @@ void wirelessProcess()
xbee.send(tx64Request);
}
+// }
}
}
\ No newline at end of file
diff --git a/sufst-controller/wireless.h b/sufst-controller/wireless.h
index 8c260ca..2c0f433 100644
--- a/sufst-controller/wireless.h
+++ b/sufst-controller/wireless.h
@@ -14,7 +14,7 @@
#define XBEE_RTS_PIN 7
#define XBEE_SERIAL_BAUD_RATE 115200
-#define XBEE_SERIAL Serial1
+#define XBEE_SERIAL Serial
#define WIRELESS_TX_BUFFER_LEN 256
#define WIRELESS_PAYLOAD_LEN 32
--
GitLab