WIP: Making RFPowerView class

src/PacketParser.cpp

@@ -8,33 +8,33 @@ PacketParser::~PacketParser()
 {
 }
 
-bool PacketParser::parsePacket(const uint8_t *buffer, Packet& message)
+bool PacketParser::parsePacket(const uint8_t *buffer, Packet& packet)
 {
-    message.source = (uint16_t)(buffer[14] << 8 | buffer[15]);
-    message.destination = (uint16_t)(buffer[12] << 8 | buffer[13]);
+    packet.source = (uint16_t)(buffer[14] << 8 | buffer[15]);
+    packet.destination = (uint16_t)(buffer[12] << 8 | buffer[13]);
 
     if (buffer[16] == 0x52 && buffer[17] == 0x53) {
-        message.type = PacketType::STOP;
-        message.parameters = std::monostate{};
+        packet.type = PacketType::STOP;
+        packet.parameters = std::monostate{};
     } else if (buffer[16] == 0x52 && buffer[17] == 0x44) {
-        message.type = PacketType::CLOSE;
-        message.parameters = std::monostate{};
+        packet.type = PacketType::CLOSE;
+        packet.parameters = std::monostate{};
     } else if (buffer[16] == 0x52 && buffer[17] == 0x55) {
-        message.type = PacketType::OPEN;
-        message.parameters = std::monostate{};
+        packet.type = PacketType::OPEN;
+        packet.parameters = std::monostate{};
     } else if (buffer[16] == 0x21 && buffer[17] == 0x5A) { 
-        message.type = PacketType::FIELDS;
+        packet.type = PacketType::FIELDS;
         std::vector<Field> fields;
         parseFields(buffer, fields);
-        message.parameters = FieldsParameters{fields};
+        packet.parameters = FieldsParameters{fields};
     } else if (buffer[16] == 0x3F && buffer[17] == 0x5A) {
-        message.type = PacketType::FIELD_COMMAND;
+        packet.type = PacketType::FIELD_COMMAND;
         std::vector<Field> fields;
         parseFields(buffer, fields);
-        message.parameters = FieldsParameters{fields};
+        packet.parameters = FieldsParameters{fields};
     } else {
-        message.type = PacketType::UNKNOWN;
-        message.parameters = std::monostate{};
+        packet.type = PacketType::UNKNOWN;
+        packet.parameters = std::monostate{};
         return false;
     }
 

src/PacketReceiver.cpp

@@ -1,6 +1,6 @@
 #include "PacketReceiver.h"
 
-PacketReceiver::PacketReceiver(RF24 *radio) : radio(radio), packetCallback(nullptr), invalidPacketCallback(nullptr) {
+PacketReceiver::PacketReceiver(RF24 *radio) : radio(radio) {
     for (int i = 0; i < TOTAL_BUFFER_COUNT; i++) {
         if (!freeBuffers.isFull()) {
             freeBuffers.push(buffers[i]);
@@ -69,11 +69,11 @@ void PacketReceiver::read() {
   }
 }
 
-void PacketReceiver::setPacketCallback(void (*callback)(const uint8_t *buffer)) {
+void PacketReceiver::setPacketCallback(std::function<void(const uint8_t*)> callback) {
   this->packetCallback = callback;
 }
 
-void PacketReceiver::setInvalidPacketCallback(void (*callback)(const uint8_t *buffer))
+void PacketReceiver::setInvalidPacketCallback(std::function<void(const uint8_t*)> callback)
 {
   this->invalidPacketCallback = callback;
 }

src/RFPowerView.cpp

@@ -0,0 +1,63 @@
+#include "RFPowerView.h"
+#include <FunctionalInterrupt.h>
+
+RFPowerView::RFPowerView(uint8_t cePin, uint8_t csPin, uint8_t irqPin, uint16_t rfID) :
+    radio(cePin, csPin),
+    packetReceiver(&radio),
+    irqPin(irqPin),
+    rfID{static_cast<uint8_t>(rfID & 0xFF), static_cast<uint8_t>(rfID >> 8)} {}
+
+bool RFPowerView::begin() {
+    if (!radio.begin()) {
+        return false;
+    }
+
+    packetReceiver.setPacketCallback([this](const uint8_t* buffer) { this->processPacketBuffer(buffer); });
+    packetReceiver.setInvalidPacketCallback([this](const uint8_t* buffer) { this->processInvalidPacketBuffer(buffer); });
+
+    startListening();
+
+    return true;
+}
+
+void RFPowerView::loop() {
+    packetReceiver.loop();
+}
+
+void RFPowerView::startListening() {
+    radio.setChannel(DEFAULT_RF_CHANNEL);
+    radio.setDataRate(DEFAULT_RF_DATARATE);
+    radio.setAutoAck(false);
+    radio.disableCRC();
+    radio.setPayloadSize(32);
+
+    // TODO: Verify that putting this in begin() instead of startListening() works
+    pinMode(irqPin, INPUT);
+
+    radio.setAddressWidth(2);
+    radio.openReadingPipe(0, rfID);
+
+    radio.startListening();
+    Serial.println("Listening");
+    // TODO: Verify that putting this in being() instead of startListening() works
+    attachInterrupt(digitalPinToInterrupt(irqPin), std::bind(&RFPowerView::interruptHandler, this), FALLING);
+    interrupts();
+}
+
+void RFPowerView::interruptHandler() {
+    packetReceiver.read(); 
+}
+
+void RFPowerView::processPacketBuffer(const uint8_t *buffer) {
+    Packet packet;
+    bool result = packetParser.parsePacket(buffer, packet);
+    if (result) {
+        Serial.print("Parsed packet! ");
+        Serial.print((int)packet.type);
+        Serial.println();
+    }
+}
+
+void RFPowerView::processInvalidPacketBuffer(const uint8_t *buffer) {
+    
+}