Merge branch 'master' into lora-aprs-lib_version_prep

src/LoRa_APRS_iGate.cpp

@@ -10,7 +10,6 @@
 #include "LoRa_APRS.h"
 
 #include "pins.h"
-#include "settings.h"
 #include "display.h"
 #include "configuration.h"
 
@@ -60,7 +59,6 @@ void setup()
 	} else {
 		Serial.println("LoRa-APRS / Init / AXP192 Begin FAIL");
 	}
-	Wire.begin(SDA, SCL);
 	powerManagement.activateLoRa();
 	powerManagement.activateOLED();
 	powerManagement.deactivateGPS();

src/configuration.cpp

@@ -1,7 +1,6 @@
 #include "SPIFFS.h"
 
 #include "configuration.h"
-#include "settings.h"
 
 
 ConfigurationManagement::ConfigurationManagement(String FilePath)

src/power_management.cpp

@@ -7,14 +7,14 @@ PowerManagement::PowerManagement()
 }
 
 // cppcheck-suppress unusedFunction
-bool PowerManagement::begin(TwoWire port)
+bool PowerManagement::begin(TwoWire & port)
 {
-    bool result = axp.begin(port, AXP192_SLAVE_ADDRESS);
-    if(!result)
-    {
-	    axp.setDCDC1Voltage(3300);
-    }
-    return result;
+	bool result = axp.begin(port, AXP192_SLAVE_ADDRESS);
+	if(!result)
+	{
+		axp.setDCDC1Voltage(3300);
+	}
+	return result;
 }
 
 // cppcheck-suppress unusedFunction

src/power_management.h

@@ -8,19 +8,19 @@ class PowerManagement
 {
 public:
 	PowerManagement();
-    bool begin(TwoWire port);
+	bool begin(TwoWire & port);
 
-    void activateLoRa();
-    void deactivateLoRa();
+	void activateLoRa();
+	void deactivateLoRa();
 
-    void activateGPS();
-    void deactivateGPS();
+	void activateGPS();
+	void deactivateGPS();
 
-    void activateOLED();
-    void decativateOLED();
+	void activateOLED();
+	void decativateOLED();
 
 private:
-    AXP20X_Class axp;
+	AXP20X_Class axp;
 };
 
 #endif

src/settings.h

@@ -1,35 +0,0 @@
-
-#ifndef SETTINGS_H_
-#define SETTINGS_H_
-
-///////////////////////////////////////////////////
-///////   DON'T CHANGE THIS FILE ANYMORE!   ///////
-///////////////////////////////////////////////////
-///////   Use the json file in the folder   ///////
-///////   'data' to configure your iGate    ///////
-///////   and upload it via 'Upload File    ///////
-///////   System image'! These settings     ///////
-///////   will be removed soon!             ///////
-///////////////////////////////////////////////////
-
-
-
-
-#define WIFI_NAME ""
-#define WIFI_KEY ""
-
-#define USER "NOCALL-10"
-#define PASS ""
-
-#define SERVER "austria.aprs2.net"
-//#define SERVER "euro.aprs2.net"
-#define PORT 14580
-
-#define BEACON_TIMEOUT (15)
-#define BEACON_LAT_POS "4819.82N"
-#define BEACON_LONG_POS "01418.68E"
-#define BEACON_MESSAGE "LoRa IGATE (RX only), Info: github.com/peterus/LoRa_APRS_iGate"
-
-//#define SEND_MESSAGES_FROM_IS_TO_LORA
-
-#endif