some more work

.vscode/arduino.json

@@ -1,6 +1,6 @@
 {
-    "board": "sparkfun:avr:promicro",
+    "board": "arduino:avr:pro",
-    "configuration": "cpu=16MHzatmega32U4",
+    "configuration": "cpu=16MHzatmega328",
     "sketch": "crossbow.ino",
     "port": "COM23",
     "output": "./build"

.vscode/c_cpp_properties.json

@@ -11,10 +11,25 @@
                 "path": [
                     "C:\\Users\\pspyc\\AppData\\Local\\Arduino15\\packages\\arduino\\hardware\\avr\\1.6.19\\cores\\arduino",
                     "${workspaceRoot}",
-                    "C:\\Users\\pspyc\\Documents\\Arduino\\libraries\\PPMReader"
+                    "C:\\Users\\pspyc\\Documents\\Arduino\\libraries"
                 ]
             },
             "intelliSenseMode": "msvc-x64"
+        },
+        {
+            "name": "Mac",
+            "includePath": [
+                "/Applications/Arduino.app/Contents/Java/hardware/arduino/avr/cores/arduino"
+            ],
+            "browse": {
+                "limitSymbolsToIncludedHeaders": false,
+                "path": [
+                    "/Applications/Arduino.app/Contents/Java/hardware/arduino/avr/cores/arduino",
+                    "${workspaceRoot}",
+                    "~/Documents/Arduino/libraries/"
+                ]
+            },
+            "intelliSenseMode": "clang-x64"
         }
     ],
     "version": 3

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "variables.h": "c"
+    }
+}

crossbow.ino

@@ -1,3 +1,5 @@
+#include "variables.h"
+
 #define DEVICE_MODE_TX
 // #define DEVICE_MODE_RX
 
@@ -12,9 +14,6 @@
 #define PPM_INPUT_INTERRUPT 1 //For Pro Micro 1, For Pro Mini 0
 
 PPMReader ppmReader(PPM_INPUT_PIN, PPM_INPUT_INTERRUPT);
-
-static uint32_t lastRcFrameTransmit = 0;
-
 #endif
 
 /*
@@ -29,21 +28,28 @@ Adafruit_SSD1306 display(OLED_RESET);
 
 #endif
 
+/*
+ * Start of QSP protocol implementation
+ */
 static uint8_t protocolState = IDLE;
 static uint8_t packetId = 0;
 static uint8_t qspCrc = 0;
 static uint8_t qspPayload[QSP_PAYLOAD_LENGTH] = {0};
+static uint8_t qspPayloadLength = 0;
+static uint8_t qspFrameToSend = 0;
 
-void writeToRadio(uint8_t dataByte) {
+uint8_t getPacketId() {
-    //Compute CRC
+    return packetId++;
-    qspCrc ^= dataByte;
+}
 
-    //Write to radio
+void clearQspPayload() {
-    Serial.write(dataByte);
+    for (uint8_t i = 0; i < QSP_PAYLOAD_LENGTH; i++) {
+        qspPayload[i] = 0;
+    }
+    qspPayloadLength = 0;
 }
 
 void decodeIncomingQspFrame(uint8_t incomingByte) {
-
     static uint8_t frameId;
     static uint8_t payloadLength;
     static uint8_t receivedPayload;
@@ -107,18 +113,6 @@ void decodeIncomingQspFrame(uint8_t incomingByte) {
 
 }
 
-/*
-display.clearDisplay();
-display.setCursor(0,0);
-display.print("Lat:");
-display.print(remoteData.latitude);
-display.display();
-*/
-
-uint8_t getPacketId() {
-    return packetId++;
-}
-
 void encodeQspFrame(uint8_t frameId, uint8_t length, uint8_t *payload) {
     //Zero CRC
     qspCrc = 0;
@@ -145,6 +139,36 @@ void encodeQspFrame(uint8_t frameId, uint8_t length, uint8_t *payload) {
     writeToRadio(qspCrc);
 }
 
+/*
+ * End of QSP protocol implementation
+ */
+
+static uint32_t lastRcFrameTransmit = 0;
+
+uint8_t get10bitHighShift(uint8_t channel) {
+    return ((channel % 4) * 2) + 2;
+}
+
+uint8_t get10bitLowShift(uint8_t channel) {
+    return 8 - get10bitHighShift(channel);
+}
+
+void writeToRadio(uint8_t dataByte) {
+    //Compute CRC
+    qspCrc ^= dataByte;
+
+    //Write to radio
+    Serial.write(dataByte);
+}
+
+/*
+display.clearDisplay();
+display.setCursor(0,0);
+display.print("Lat:");
+display.print(remoteData.latitude);
+display.display();
+*/
+
 void setup(void) {
     Serial.begin(UART_SPEED);
 
@@ -165,40 +189,14 @@ void setup(void) {
 
 #ifdef DEVICE_MODE_TX
 
-uint8_t get10bitHighShift(uint8_t channel) {
+/**
-    return ((channel % 4) * 2) + 2;
+ * Encode 10 RC channels 
-}
+ */
-
+void encodeRcDataPayload(PPMReader* ppmSource, uint8_t noOfChannels) {
-uint8_t get10bitLowShift(uint8_t channel) {
+    for (uint8_t i = 0; i < noOfChannels; i++) {
-    return 8 - get10bitHighShift(channel);
+        uint16_t channelValue10 = map(ppmSource->get(i), 1000, 2000, 0, 1000) & 0x03ff;
-}
+        uint8_t channelValue8 = map(ppmSource->get(i), 1000, 2000, 0, 255) & 0xff;
-
+        uint8_t channelValue4 = map(ppmSource->get(i), 1000, 2000, 0, 15) & 0x0f;
-void clearQspPayload() {
-    for (uint8_t i = 0; i < QSP_PAYLOAD_LENGTH; i++) {
-        qspPayload[i] = 0;
-    }
-}
-
-#endif
-
-void loop(void) {
-
-#ifdef DEVICE_MODE_TX
-
-    uint32_t currentMillis = millis();
-
-    if (currentMillis - lastRcFrameTransmit > TX_RC_FRAME_RATE) {
-        lastRcFrameTransmit = currentMillis; 
-
-        uint8_t payloadBit = 0;
-        uint8_t bitsToMove = 0;
-
-        clearQspPayload();
-
-        for (uint8_t i = 0; i < PPM_CHANNEL_COUNT; i++) {
-            uint16_t channelValue10 = map(ppmReader.get(i), 1000, 2000, 0, 1000) & 0x03ff;
-            uint8_t channelValue8 = map(ppmReader.get(i), 1000, 2000, 0, 255) & 0xff;
-            uint8_t channelValue4 = map(ppmReader.get(i), 1000, 2000, 0, 15) & 0x0f;
 
         if (i < 4) {
             /*
@@ -224,22 +222,47 @@ void loop(void) {
         } else if (i == 9) {
             qspPayload[8] |= channelValue4 & B00001111;
         }
+    }
 
-        }
+    qspPayloadLength = 9;
-        //TODO RC_DATA frame length is just now hardcoded
+}
-        encodeQspFrame(QSP_FRAME_RC_DATA, 9, qspPayload);
-        Serial.end();
-        delay(E45_TTL_100_UART_DOWNTIME);
-        Serial.begin(UART_SPEED);
-    }
 
 #endif
 
-#ifdef DEVICE_MODE_RX
+void loop(void) {
+
+    bool transmitPayload = false;
+
+#ifdef DEVICE_MODE_TX
+
+    uint32_t currentMillis = millis();
+
+    /*
+     * RC_DATA QSP frame
+     */
+    if (currentMillis - lastRcFrameTransmit > TX_RC_FRAME_RATE && !transmitPayload) {
+        lastRcFrameTransmit = currentMillis; 
+
+        clearQspPayload();
+        encodeRcDataPayload(&ppmReader, PPM_CHANNEL_COUNT);
+        qspFrameToSend = QSP_FRAME_RC_DATA;
+
+        transmitPayload = true;
+    }
+
+#endif
 
     if (Serial.available()) {
         decodeIncomingQspFrame(Serial.read());
     }
 
-#endif
+    if (transmitPayload) {
+        transmitPayload = false;
+
+        encodeQspFrame(qspFrameToSend, qspPayloadLength, qspPayload);
+        Serial.end();
+        delay(E45_TTL_100_UART_DOWNTIME);
+        Serial.begin(UART_SPEED);
+    }
+
 }

variables.h

@@ -1,3 +1,5 @@
+#pragma once
+
 //Only for UART connected radio modules
 #define UART_SPEED 57600
 #define E45_TTL_100_UART_DOWNTIME 30