move bluetooth OTA back into main tree for now

src/mesh/RadioLibInterface.h

@@ -19,10 +19,6 @@ class RadioLibInterface : public RadioInterface
     volatile PendingISR pending = ISR_NONE;
     volatile bool timerRunning = false;
 
-    /** Our ISR code currently needs this to find our active instance
-     */
-    static RadioLibInterface *instance;
-
     /**
      * Raw ISR handler that just calls our polymorphic method
      */
@@ -57,6 +53,11 @@ class RadioLibInterface : public RadioInterface
     /// are _trying_ to receive a packet currently (note - we might just be waiting for one)
     bool isReceiving;
 
+  public:
+    /** Our ISR code currently needs this to find our active instance
+     */
+    static RadioLibInterface *instance;
+
     /**
      * Glue functions called from ISR land
      */
@@ -80,6 +81,13 @@ class RadioLibInterface : public RadioInterface
      */
     virtual bool canSleep();
 
+    /**
+     * Start waiting to receive a message
+     *
+     * External functions can call this method to wake the device from sleep.
+     */
+    virtual void startReceive() = 0;
+
   private:
     /** start an immediate transmit */
     void startSend(MeshPacket *txp);
@@ -110,11 +118,6 @@ class RadioLibInterface : public RadioInterface
     /** are we actively receiving a packet (only called during receiving state) */
     virtual bool isActivelyReceiving() = 0;
 
-    /**
-     * Start waiting to receive a message
-     */
-    virtual void startReceive() = 0;
-
     /**
      * Raw ISR handler that just calls our polymorphic method
      */