Lora working

Author: fabik111

src/ArduinoIoTCloud.h

@@ -177,16 +177,17 @@ class ArduinoIoTCloudClass {
     ArduinoIoTSynchronizationStatus _syncStatus = ArduinoIoTSynchronizationStatus::SYNC_STATUS_SYNCHRONIZED;
 
 
-    String _device_id, _thing_id;
+	String _device_id = "";
+	String _thing_id = "";
 
 
     ArduinoCloudThing Thing;
 
-    int _lastSyncRequestTickTime;
+    int _lastSyncRequestTickTime = 0;
 
-    OnCloudEventCallback _on_sync_event_callback,
-                         _on_connect_event_callback,
-                         _on_disconnect_event_callback;
+	OnCloudEventCallback _on_sync_event_callback = NULL;
+	OnCloudEventCallback _on_connect_event_callback = NULL;
+	OnCloudEventCallback _on_disconnect_event_callback = NULL;
 
     static void execCloudEventCallback(OnCloudEventCallback & callback, void * callback_arg) {
 		if (callback) {
@@ -204,13 +205,15 @@ class ArduinoIoTCloudClass {
 		}
 	}
 };
-#if defined(ARDUINO_SAMD_MKRGSM1400) || defined(ARDUINO_SAMD_MKRWIFI1010) ||   \
-  defined(ARDUINO_SAMD_MKR1000) || defined(ARDUINO_SAMD_NANO_33_IOT)
-#include "ArduinoIoTCloudTCP.h"
-extern ArduinoIoTCloudTCP ArduinoCloud;
-#elif defined(ARDUINO_SAMD_MKR1300) || defined(ARDUINO_SAMD_MKR1310)
-//#include "ArduinoIoTCloudLPWAN.h"
-//extern ArduinoIoTCloudLPWAN ArduinoCloud;
+
+#if defined(ARDUINO_SAMD_MKRGSM1400) || defined(ARDUINO_SAMD_MKRWIFI1010) ||  defined(ARDUINO_SAMD_MKR1000) || defined(ARDUINO_SAMD_NANO_33_IOT)
+  //#error HAS_TCP
+  #include "ArduinoIoTCloudTCP.h"
+  extern ArduinoIoTCloudTCP ArduinoCloud;
+#elif defined(ARDUINO_SAMD_MKRWAN1300) || defined(ARDUINO_SAMD_MKRWAN1310)
+  //#error HAS_LORA
+  #include "ArduinoIoTCloudLPWAN.h"
+  //extern ArduinoIoTCloudLPWAN ArduinoCloud;
 #endif
 
 #endif

src/ArduinoIoTCloudLPWAN.cpp

@@ -15,17 +15,19 @@
    a commercial license, send an email to [email protected].
 */
 
+#if defined(ARDUINO_SAMD_MKRWAN1300) || defined(ARDUINO_SAMD_MKRWAN1310)
+
 #include<ArduinoIoTCloudLPWAN.h>
 
 ArduinoIoTCloudLPWAN::ArduinoIoTCloudLPWAN() :
 	_connection(NULL)
 {
-	_thing_id = "";
+	/*_thing_id = "";
 	_lastSyncRequestTickTime = 0;
 	_on_sync_event_callback(NULL);
 	_on_connect_event_callback(NULL);
 	_on_disconnect_event_callback(NULL);
-	_device_id = "";
+	_device_id = "";*/
 }
 
 ArduinoIoTCloudLPWAN::~ArduinoIoTCloudLPWAN() {
@@ -34,7 +36,8 @@ ArduinoIoTCloudLPWAN::~ArduinoIoTCloudLPWAN() {
 int ArduinoIoTCloudLPWAN::connect()
 {
 	_connection->connect();
-	return _connection->getStatus();
+	int state = _connection->getStatus() == NetworkConnectionState::INIT ? 1 : 0;
+	return state;
 }
 
 bool ArduinoIoTCloudLPWAN::disconnect()
@@ -45,7 +48,8 @@ bool ArduinoIoTCloudLPWAN::disconnect()
 
 int ArduinoIoTCloudLPWAN::connected()
 {
-	return _connection->getStatus();
+	int state = _connection->getStatus() == NetworkConnectionState::INIT ? 1 : 0;
+	return state;
 }
 
 int ArduinoIoTCloudLPWAN::begin(LPWANConnectionHandler& connection)
@@ -73,8 +77,6 @@ void ArduinoIoTCloudLPWAN::update(CallbackFunc onSyncCompleteCallback) {
 			msgBuf[i++] = _connection->read();
 		}
 
-		CloudSerial.appendStdin(msgBuf, sizeof(msgBuf));
-
 		Thing.decode(msgBuf, sizeof(msgBuf));
 	}
 
@@ -132,33 +134,22 @@ void ArduinoIoTCloudLPWAN::connectionCheck() {
 	case ArduinoIoTConnectionStatus::RECONNECTING: {
 		int const ret_code = connect();
 		Debug.print(DBG_INFO, "ArduinoCloud.reconnect()");
-		if (ret_code == NetworkConnectionState::INIT) {
+		if (ret_code == 1) {
 			_iotStatus = ArduinoIoTConnectionStatus::IDLE;
 		}
 		else {
 			_iotStatus = ArduinoIoTConnectionStatus::ERROR;
 		}
 
-		/*int const ret_code_reconnect = reconnect(*_net);
-		Debug.print(DBG_INFO, "ArduinoCloud.reconnect(): %d", ret_code_reconnect);
-		if (ret_code_reconnect == CONNECT_SUCCESS) {
-			_iotStatus = ArduinoIoTConnectionStatus::CONNECTED;
-			printConnectionStatus(_iotStatus);
-			execCloudEventCallback(_on_connect_event_callback, 0 callback_arg );
-			CloudSerial.begin(9600);
-			CloudSerial.println("Hello from Cloud Serial!");
-		}*/
 	}
 												   break;
 	case ArduinoIoTConnectionStatus::CONNECTING: {	
-		int const net_status = _connection->getStatus();
+		NetworkConnectionState net_status = _connection->getStatus();
 		Debug.print(DBG_VERBOSE, "ArduinoCloud.connect(): %d", net_status);
 		if (net_status == NetworkConnectionState::CONNECTED) {
 			_iotStatus = ArduinoIoTConnectionStatus::CONNECTED;
 			printConnectionStatus(_iotStatus);
 			execCloudEventCallback(_on_connect_event_callback, 0 /* callback_arg */);
-			CloudSerial.begin(9600);
-			CloudSerial.println("Hello from Cloud Serial!");
 		}
 
 	}
@@ -197,4 +188,7 @@ void ArduinoIoTCloudLPWAN::sendPropertiesToCloud() {
 		writeProperties(data, length);
 	}
 }
+//#error MULTIPLE_DEFINITION
 ArduinoIoTCloudLPWAN ArduinoCloud;
+
+#endif

src/ArduinoIoTCloudLPWAN.h

@@ -18,6 +18,8 @@
 #ifndef ARDUINO_IOT_CLOUD_LPWAN_H
 #define ARDUINO_IOT_CLOUD_LPWAN_H
 
+//#ifdef defined(ARDUINO_SAMD_MKRWAN1300) || defined(ARDUINO_SAMD_MKRWAN1310)
+
 #include <ArduinoIoTCloud.h>
 #include <Arduino_ConnectionHandler.h>
 
@@ -46,16 +48,18 @@ class ArduinoIoTCloudLPWAN : public ArduinoIoTCloudClass {
 
 
 	protected:
-		friend class CloudSerialClass;
 		int writeStdout(const byte data[], int length);
 		int writeProperties(const byte data[], int length);
 		int writeShadowOut(const byte data[], int length);
 
 	private:
 		LPWANConnectionHandler* _connection;
+		void sendPropertiesToCloud();
 
 };
 
 extern ArduinoIoTCloudLPWAN ArduinoCloud;
 
+//#endif
+
 #endif

src/ArduinoIoTCloudTCP.cpp

@@ -14,6 +14,8 @@
    software without disclosing the source code of your own applications. To purchase
    a commercial license, send an email to [email protected].
 */
+#if defined(ARDUINO_SAMD_MKRGSM1400) || defined(ARDUINO_SAMD_MKRWIFI1010) ||  defined(ARDUINO_SAMD_MKR1000) || defined(ARDUINO_SAMD_NANO_33_IOT)
+
 #include <ArduinoIoTCloudTCP.h>
 #ifdef BOARD_HAS_ECCX08
 #include "utility/ECCX08Cert.h"
@@ -71,12 +73,12 @@ ArduinoIoTCloudTCP::ArduinoIoTCloudTCP():
 	_dataTopicIn(""),
 	_otaTopic("")
 	 {
-	_thing_id="";
+	/*_thing_id="";
 	_lastSyncRequestTickTime=0;
 	_on_sync_event_callback(NULL);
 	_on_connect_event_callback(NULL);
 	_on_disconnect_event_callback(NULL);
-	_device_id="";
+	_device_id="";*/
 }
 
 
@@ -443,4 +445,8 @@ void ArduinoIoTCloudTCP::printDebugInfo() {
 	Debug.print(DBG_INFO, "Thing ID: %s", getThingId().c_str());
 	Debug.print(DBG_INFO, "MQTT Broker: %s:%d", _brokerAddress.c_str(), _brokerPort);
 }
-ArduinoIoTCloudTCP ArduinoCloud;
+
+//#error DEFINING_ARDUINOCLOUD2
+ArduinoIoTCloudTCP ArduinoCloud;
+
+#endif

src/ArduinoIoTCloudTCP.h

@@ -18,6 +18,9 @@
 #ifndef ARDUINO_IOT_CLOUD_TCP_H
 #define ARDUINO_IOT_CLOUD_TCP_H
 
+//#ifdef defined(ARDUINO_SAMD_MKRGSM1400) || defined(ARDUINO_SAMD_MKRWIFI1010) ||  defined(ARDUINO_SAMD_MKR1000) || defined(ARDUINO_SAMD_NANO_33_IOT)
+
+
 #include <ArduinoIoTCloud.h>
 #include <Arduino_ConnectionHandler.h>
 
@@ -140,4 +143,6 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
 
 extern ArduinoIoTCloudTCP ArduinoCloud;
 
+//#endif
+
 #endif

src/ArduinoIoTCloud_Defines.h

@@ -23,12 +23,11 @@
   defined(ARDUINO_SAMD_MKRNB1500)
   #define BOARD_HAS_ECCX08
   #define HAS_TCP
+  //#error HAS_TCP_SET
 #endif
 
-
-
-#if defined(ARDUINO_SAMD_MKR1300) || defined(ARDUINO_SAMD_MKR1310)
-// TODO set BOARD_HAS_LORA
+#if defined(ARDUINO_SAMD_MKRWAN1300) || defined(ARDUINO_SAMD_MKRWAN1310)
+  #define HAS_LORA
 #endif
 
 #if defined(ARDUINO_ESP8266_ESP12) || defined(ARDUINO_ARCH_ESP32) || defined(ESP8266)

src/CloudSerial.cpp

@@ -14,6 +14,7 @@
    software without disclosing the source code of your own applications. To purchase
    a commercial license, send an email to [email protected].
 */
+#if defined(ARDUINO_SAMD_MKRGSM1400) || defined(ARDUINO_SAMD_MKRWIFI1010) ||  defined(ARDUINO_SAMD_MKR1000) || defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_ESP8266_ESP12) || defined(ARDUINO_ARCH_ESP32) || defined(ESP8266)
 
 #include "ArduinoIoTCloud.h"
 #include "CloudSerial.h"
@@ -86,3 +87,5 @@ void CloudSerialClass::appendStdin(const uint8_t *buffer, size_t size) {
 }
 
 CloudSerialClass CloudSerial;
+
+#endif

src/CloudSerial.h

@@ -28,11 +28,9 @@
 #define CLOUD_SERIAL_TX_BUFFER_SIZE 64
 #define CLOUD_SERIAL_RX_BUFFER_SIZE 512
 
-#ifdef HAS_TCP
+
 class ArduinoIoTCloudTCP;
-#else
-class ArduinoIoTCloudLPWAN;
-#endif
+
 
 class CloudSerialClass : public Stream {
   public:
@@ -52,11 +50,9 @@ class CloudSerialClass : public Stream {
     operator bool();
 
   protected:
-	#ifdef HAS_TCP
-	  friend class ArduinoIoTCloudTCP;
-	#else
-	  friend class ArduinoIoTCloudLPWAN;
-	#endif
+
+	friend class ArduinoIoTCloudTCP;
+
 
 
     void appendStdin(const uint8_t *buffer, size_t size);