Added RS485 RX/TX pins to Settings

GoodWeCommunicator.cpp

@@ -1,17 +1,18 @@
 #include "GoodWeCommunicator.h"
 
 
-GoodWeCommunicator::GoodWeCommunicator(int receivePin, int transmitPin, bool inDebug)
+GoodWeCommunicator::GoodWeCommunicator(SettingsManager * settingsManager, bool inDebug)
 {
+	auto settings = settingsManager->GetSettings();
 	//create the software serial on the custom pins so we can use the hardware serial for debug comms.
-	goodweSerial = new SoftwareSerial(receivePin, transmitPin, false, BufferSize); // (RX, TX. inverted, buffer)
+	goodweSerial = new SoftwareSerial(settings->RS485Rx, settings->RS485Tx, false, BufferSize); // (RX, TX. inverted, buffer)
 	debugMode = inDebug;
 }
 
 void GoodWeCommunicator::start()
 {
 	//start the software serial
-	goodweSerial->begin(9600);
+	goodweSerial->begin(9600); //inverter fixed baud rate
 
 	//set the fixed part of our buffer
 	headerBuffer[0] = 0xAA;

GoodWeCommunicator.h

@@ -2,6 +2,7 @@
 #include <vector>
 #include <SoftwareSerial.h>
 #include <ESP8266WiFi.h>
+#include "SettingsManager.h"
 
 #define GOODWE_COMMS_ADDRES 0xAB
 #define PACKET_TIMEOUT 500			//0.5 sec packet timeout
@@ -54,7 +55,7 @@ class GoodWeCommunicator
 		float eDay = 0.0;
 	};
 
-	GoodWeCommunicator(int receivePin, int transmitPin, bool debugMode = false);
+	GoodWeCommunicator(SettingsManager * settingsManager, bool debugMode = false);
 	void start();
 	void stop();
 	void handle();

GoodWeLogger.ino

@@ -14,8 +14,8 @@
 #include "Settings.h"			//change and then rename Settings.example.h to Settings.h to compile
 
 
-GoodWeCommunicator goodweComms(D1, D2, true);
 SettingsManager settingsManager;
+GoodWeCommunicator goodweComms(&settingsManager, true);
 MQTTPublisher mqqtPublisher(&settingsManager, &goodweComms, true);
 PVOutputPublisher pvoutputPublisher(&settingsManager, &goodweComms, true);
 WiFiUDP ntpUDP;
@@ -40,6 +40,9 @@ void setup()
 	settings->wifiSSID = WIFI_SSID;
 	settings->wifiPassword = WIFI_PASSWORD;
 	settings->timezone = TIMEZONE;
+	settings->RS485Rx = RS485_RX;
+	settings->RS485Tx = RS485_TX;
+
 
 	/* add setup code here */
 	Serial.begin(115200);

Settings.example.h

@@ -34,3 +34,8 @@
 //timezone offset in hours (amsterdam is +2 in summertime). Used for posting to pvoutput
 #define TIMEZONE 2
 
+//rs485 receive pin
+#define RS485_RX D1
+
+//rs485 transmit pin
+#define RS485_TX D2

SettingsManager.h

@@ -15,16 +15,20 @@ class SettingsManager
 		int mqttQuickUpdateInterval;
 		int mqttRegularUpdateInterval;
 
-
-		int timezone;
-
+		//pvoutput settings
 		String pvoutputApiKey;
 		String pvoutputSystemId;
 		int pvoutputUpdateInterval;
 
+		//wifi settings
 		String wifiSSID;
 		String wifiPassword;
 
+		//general settings
+		int RS485Rx =D1;		//default set because added later
+		int RS485Tx =D2;
+		int timezone;
+
 	};
 	SettingsManager();
 	~SettingsManager();