Merge branch 'master' of intrepidcs.homeip.net:paulhollinsky/icsneonext

include/icsneo/device/device.h

@@ -103,29 +103,29 @@ protected:
 
 	template<typename Transport>
 	std::unique_ptr<ICommunication> makeTransport() { return std::unique_ptr<ICommunication>(new Transport(err, getWritableNeoDevice())); }
-	virtual void setupTransport(ICommunication* transport) {}
+	virtual void setupTransport(ICommunication* stransport) { (void)stransport; }
 
 	virtual std::shared_ptr<Packetizer> makePacketizer() { return std::make_shared<Packetizer>(err); }
-	virtual void setupPacketizer(Packetizer* packetizer) {}
+	virtual void setupPacketizer(Packetizer* spacketizer) { (void)spacketizer; }
 
 	virtual std::unique_ptr<Encoder> makeEncoder(std::shared_ptr<Packetizer> p) { return std::unique_ptr<Encoder>(new Encoder(err, p)); }
-	virtual void setupEncoder(Encoder* encoder) {}
+	virtual void setupEncoder(Encoder* sencoder) { (void)sencoder; }
 
 	virtual std::unique_ptr<Decoder> makeDecoder() { return std::unique_ptr<Decoder>(new Decoder(err)); }
-	virtual void setupDecoder(Decoder* decoder) {}
+	virtual void setupDecoder(Decoder* sdecoder) { (void)sdecoder; }
 
 	virtual std::shared_ptr<Communication> makeCommunication(
 		std::unique_ptr<ICommunication> t,
 		std::shared_ptr<Packetizer> p, 
 		std::unique_ptr<Encoder> e,
 		std::unique_ptr<Decoder> d) { return std::make_shared<Communication>(err, std::move(t), p, std::move(e), std::move(d)); }
-	virtual void setupCommunication(Communication* com) {}
+	virtual void setupCommunication(Communication* scom) { (void)scom; }
 
 	template<typename Settings>
 	std::unique_ptr<IDeviceSettings> makeSettings(std::shared_ptr<Communication> com) {
 		return std::unique_ptr<IDeviceSettings>(new Settings(com));
 	}
-	virtual void setupSettings(IDeviceSettings* settings) {}
+	virtual void setupSettings(IDeviceSettings* ssettings) { (void)ssettings; }
 	// END Initialization Functions
 
 	void handleInternalMessage(std::shared_ptr<Message> message);

include/icsneo/device/neovifire2/neovifire2eth.h

@@ -15,13 +15,12 @@ public:
 		std::vector<std::shared_ptr<Device>> found;
 		
 		for(auto& foundDev : PCAP::FindAll()) {
-			auto packetizer = std::make_shared<Packetizer>();
-			auto decoder = std::unique_ptr<Decoder>(new Decoder());
-			for(auto& payload : foundDev.discoveryPackets)
-				packetizer->input(payload);
-			for(auto& packet : packetizer->output()) {
+			auto fakedev = std::shared_ptr<NeoVIFIRE2ETH>(new NeoVIFIRE2ETH({}));
+			for (auto& payload : foundDev.discoveryPackets)
+				fakedev->com->packetizer->input(payload);
+			for (auto& packet : fakedev->com->packetizer->output()) {
 				std::shared_ptr<Message> msg;
-				if(!decoder->decode(msg, packet))
+				if (!fakedev->com->decoder->decode(msg, packet))
 					continue; // We failed to decode this packet
 
 				if(!msg || msg->network.getNetID() != Network::NetID::Main51)
@@ -44,17 +43,16 @@ public:
 		return found;
 	}
 
-protected:
-	virtual void setupSettings(IDeviceSettings* settings) {
-		// TODO Check firmware version, old firmwares will reset Ethernet settings on settings send
-		settings->readonly = true;
-	}
-
-private:
 	NeoVIFIRE2ETH(neodevice_t neodevice) : NeoVIFIRE2(neodevice) {
 		initialize<PCAP, NeoVIFIRE2Settings>();
 		productId = PRODUCT_ID;
 	}
+
+protected:
+	virtual void setupSettings(IDeviceSettings* ssettings) {
+		// TODO Check firmware version, old firmwares will reset Ethernet settings on settings send
+		ssettings->readonly = true;
+	}
 };
 
 }

include/icsneo/device/radgalaxy/radgalaxy.h

@@ -47,18 +47,17 @@ public:
 		return found;
 	}
 
-protected:
-	void setupPacketizer(Packetizer* packetizer) override {
-		packetizer->disableChecksum = true;
-		packetizer->align16bit = false;
-	}
-
-private:
 	RADGalaxy(neodevice_t neodevice) : Device(neodevice) {
 		initialize<PCAP>();
 		getWritableNeoDevice().type = DEVICE_TYPE;
 		productId = PRODUCT_ID;
 	}
+
+protected:
+	void setupPacketizer(Packetizer* packetizer) override {
+		packetizer->disableChecksum = true;
+		packetizer->align16bit = false;
+	}
 };
 
 }

include/icsneo/device/radstar2/radstar2eth.h

@@ -43,7 +43,6 @@ public:
 		return found;
 	}
 
-private:
 	RADStar2ETH(neodevice_t neodevice) : RADStar2(neodevice) {
 		initialize<PCAP>();
 	}