reformat RFM transmission

cornellrocketryteam · Jan 21, 2024 · 1f19e89 · 1f19e89
1 parent 8ee2718
commit 1f19e89
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 21 deletions.
diff --git a/src/rfm/rfm.cpp b/src/rfm/rfm.cpp
@@ -1,9 +1,9 @@
 #include "rfm.hpp"
 
-volatile bool transmitted = false;
+volatile bool awaiting = true;
 
 void RFM::set_flag() {
-    transmitted = true;
+    awaiting = true;
 }
 
 bool RFM::begin() {
@@ -21,41 +21,34 @@ bool RFM::begin() {
     state = radio.begin();
     if (state != RADIOLIB_ERR_NONE) {
 #ifdef VERBOSE
-        printf("RFM: Init failed, code %d\n", state);
+        printf("RFM Error: Init failed, code %d\n", state);
 #endif
         return false;
     }
 
     radio.setPacketSentAction(set_flag);
 
-    state = radio.startTransmit("first");
     return true;
 }
 
 bool RFM::transmit() {
-    if (transmitted) {
-        transmitted = false;
+    if (awaiting) {
+        awaiting = false;
 
         if (state == RADIOLIB_ERR_NONE) {
+#ifdef VERBOSE
             printf("RFM: Transmit success\n");
+#endif
         } else {
-            printf("RFM: Transmit failed, code %d\n", state);
+#ifdef VERBOSE
+            printf("RFM Error: Transmit failed, code %d\n", state);
+            return false;
         }
+#endif
         radio.finishTransmit();
 
         state = radio.startTransmit("test");
+        return true;
     }
-    return true;
-    //state = radio.transmit("test");
-
-//     if (state == RADIOLIB_ERR_NONE) {
-// #ifdef VERBOSE
-//         printf("RFM: Transmit success\n");
-// #endif
-//         return true;
-//     }
-// #ifdef VERBOSE
-//     printf("RFM: Transmit failed, code %d\n", state);
-// #endif
     return false;
 }
diff --git a/src/rfm/rfm.hpp b/src/rfm/rfm.hpp
@@ -21,10 +21,11 @@ struct RFM {
      */
     bool transmit();
 
+    /**
+     * Callback function for when a transmission is finished.
+     */
     static void set_flag();
 
-    int state = RADIOLIB_ERR_NONE;
-
     /**
      * A RadioLib hardware abstraction layer.
      */
@@ -34,6 +35,11 @@ struct RFM {
      * A RadioLib radio object representation.
      */
     SX1276 radio = new Module(hal, RFM_CS, RFM_DIO0, RADIOLIB_NC, RFM_DIO1);
+
+    /**
+     * Radio return state.
+     */
+    int state = RADIOLIB_ERR_NONE;
 };
 
 #endif // RFM_HPP_