From a28aff7971def6953c284ef98e06b3ad9c10ed22 Mon Sep 17 00:00:00 2001
From: jgromes <jan.gromes@gmail.com>
Date: Sun, 13 Nov 2022 11:03:05 +0100
Subject: [PATCH] Moved callback generators to the end of Module declaration
 (#605)

---
 src/Module.h | 46 ++++++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/Module.h b/src/Module.h
index 4a8da75a..b12fe355 100644
--- a/src/Module.h
+++ b/src/Module.h
@@ -400,7 +400,31 @@ class Module {
     */
     void regdump(uint8_t start, uint8_t len);
 
+#if !defined(RADIOLIB_GODMODE)
+  private:
+#endif
+
+    // pins
+    RADIOLIB_PIN_TYPE _cs = RADIOLIB_NC;
+    RADIOLIB_PIN_TYPE _irq = RADIOLIB_NC;
+    RADIOLIB_PIN_TYPE _rst = RADIOLIB_NC;
+    RADIOLIB_PIN_TYPE _gpio = RADIOLIB_NC;
+
+    // SPI interface (Arduino only)
+    #if defined(RADIOLIB_BUILD_ARDUINO)
+    SPIClass* _spi = NULL;
+    SPISettings _spiSettings = RADIOLIB_DEFAULT_SPI_SETTINGS;
+    bool _initInterface = false;
+    #endif
+
+    // RF switch presence and pins
+    bool _useRfSwitch = false;
+    RADIOLIB_PIN_TYPE _rxEn = RADIOLIB_NC;
+    RADIOLIB_PIN_TYPE _txEn = RADIOLIB_NC;
+
     // hardware abstraction layer callbacks
+    // this is placed at the end of Module class because the callback generator macros
+    // screw with the private/public access specifiers
     RADIOLIB_GENERATE_CALLBACK(RADIOLIB_CB_ARGS_PIN_MODE);
     RADIOLIB_GENERATE_CALLBACK(RADIOLIB_CB_ARGS_DIGITAL_WRITE);
     RADIOLIB_GENERATE_CALLBACK(RADIOLIB_CB_ARGS_DIGITAL_READ);
@@ -428,28 +452,6 @@ class Module {
     RADIOLIB_GENERATE_CALLBACK(RADIOLIB_CB_ARGS_SPI_END_TRANSACTION);
     RADIOLIB_GENERATE_CALLBACK(RADIOLIB_CB_ARGS_SPI_END);
     #endif
-
-#if !defined(RADIOLIB_GODMODE)
-  private:
-#endif
-
-    // pins
-    RADIOLIB_PIN_TYPE _cs = RADIOLIB_NC;
-    RADIOLIB_PIN_TYPE _irq = RADIOLIB_NC;
-    RADIOLIB_PIN_TYPE _rst = RADIOLIB_NC;
-    RADIOLIB_PIN_TYPE _gpio = RADIOLIB_NC;
-
-    // SPI interface (Arduino only)
-    #if defined(RADIOLIB_BUILD_ARDUINO)
-    SPIClass* _spi = NULL;
-    SPISettings _spiSettings = RADIOLIB_DEFAULT_SPI_SETTINGS;
-    bool _initInterface = false;
-    #endif
-
-    // RF switch presence and pins
-    bool _useRfSwitch = false;
-    RADIOLIB_PIN_TYPE _rxEn = RADIOLIB_NC;
-    RADIOLIB_PIN_TYPE _txEn = RADIOLIB_NC;
 };
 
 #endif