Add chipID to generate DEV_EUI.

HelTecAutomation · Jun 19, 2021 · 7104eaa · 7104eaa
1 parent 2b11cac
commit 7104eaa
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 2 deletions.
diff --git a/examples/OTAA/OTAA.ino b/examples/OTAA/OTAA.ino
@@ -121,6 +121,9 @@ void loop()
   {
     case DEVICE_STATE_INIT:
     {
+#if(LORAWAN_DEVEUI_AUTO)
+			LoRaWAN.generateDeveuiByChipID();
+#endif
       LoRaWAN.init(loraWanClass,loraWanRegion);
       break;
     }

diff --git a/examples/OTAA_Battery_power/OTAA_Battery_power.ino b/examples/OTAA_Battery_power/OTAA_Battery_power.ino
@@ -133,6 +133,9 @@ void loop()
   {
     case DEVICE_STATE_INIT:
     {
+#if(LORAWAN_DEVEUI_AUTO)
+			LoRaWAN.generateDeveuiByChipID();
+#endif
       LoRaWAN.init(loraWanClass,loraWanRegion);
       break;
     }

diff --git a/examples/OTAA_LED/OTAA_LED.ino b/examples/OTAA_LED/OTAA_LED.ino
@@ -173,6 +173,9 @@ void loop()
   {
     case DEVICE_STATE_INIT:
     {
+#if(LORAWAN_DEVEUI_AUTO)
+			LoRaWAN.generateDeveuiByChipID();
+#endif
       LoRaWAN.init(loraWanClass,loraWanRegion);
       break;
     }

diff --git a/examples/OTAA_OLED/OTAA_OLED.ino b/examples/OTAA_OLED/OTAA_OLED.ino
@@ -125,6 +125,9 @@ void loop()
   {
     case DEVICE_STATE_INIT:
     {
+#if(LORAWAN_DEVEUI_AUTO)
+			LoRaWAN.generateDeveuiByChipID();
+#endif
       LoRaWAN.init(loraWanClass,loraWanRegion);
       break;
     }

diff --git a/examples/OTAA_OLED_Interrupt_CLASS_A/OTAA_OLED_Interrupt_CLASS_A.ino b/examples/OTAA_OLED_Interrupt_CLASS_A/OTAA_OLED_Interrupt_CLASS_A.ino
@@ -127,6 +127,9 @@ void loop()
   {
     case DEVICE_STATE_INIT:
     {
+#if(LORAWAN_DEVEUI_AUTO)
+			LoRaWAN.generateDeveuiByChipID();
+#endif
       LoRaWAN.init(loraWanClass,loraWanRegion);
       break;
     }

diff --git a/examples/OTAA_OLED_interrupt_CLASS_C/OTAA_OLED_interrupt_CLASS_C.ino b/examples/OTAA_OLED_interrupt_CLASS_C/OTAA_OLED_interrupt_CLASS_C.ino
@@ -138,6 +138,9 @@ void loop()
   {
     case DEVICE_STATE_INIT:
     {
+#if(LORAWAN_DEVEUI_AUTO)
+			LoRaWAN.generateDeveuiByChipID();
+#endif
       LoRaWAN.init(loraWanClass,loraWanRegion);
       break;
     }

diff --git a/examples/Sensor/LoRaWAN_HDC1080/LoRaWAN_HDC1080.ino b/examples/Sensor/LoRaWAN_HDC1080/LoRaWAN_HDC1080.ino
@@ -163,6 +163,9 @@ void loop()
   {
     case DEVICE_STATE_INIT:
     {
+#if(LORAWAN_DEVEUI_AUTO)
+			LoRaWAN.generateDeveuiByChipID();
+#endif
       LoRaWAN.init(loraWanClass,loraWanRegion);
       break;
     }

diff --git a/examples/WiFi_LoRaWAN/WiFi_LoRaWAN.ino b/examples/WiFi_LoRaWAN/WiFi_LoRaWAN.ino
@@ -262,6 +262,9 @@ void loop(void) {
   {
     case DEVICE_STATE_INIT:
     {
+#if(LORAWAN_DEVEUI_AUTO)
+			LoRaWAN.generateDeveuiByChipID();
+#endif
       LoRaWAN.init(loraWanClass,loraWanRegion);
       break;
     }

diff --git a/src/ESP32_LoRaWAN.cpp b/src/ESP32_LoRaWAN.cpp
@@ -360,6 +360,25 @@ static void lwan_dev_params_update( void )
 LoRaMacPrimitives_t LoRaMacPrimitive;
 LoRaMacCallback_t LoRaMacCallback;
 
+void LoRaWanClass::generateDeveuiByChipID()
+{
+	int i;
+	uint64_t chipid=ESP.getEfuseMac();//The chip ID is essentially its MAC address(length: 6 bytes).
+
+	//Serial.printf("\nDevEui=");
+	for( i=0;i<6;i++)
+	{
+		DevEui[i] = chipid&0XFF;// (uniqueId[1]>>(8*(3-i)))&0xFF;
+		chipid = chipid >>8;
+		//Serial.printf("%02X",DevEui[i]);	
+	}
+	DevEui[6] = DevEui[1] &DevEui[2];
+	//Serial.printf("%02X",DevEui[6]);
+	DevEui[7] = DevEui[3] &DevEui[4];
+	//Serial.printf("%02X",DevEui[7]);
+
+}
+
 void LoRaWanClass::init(DeviceClass_t classMode,LoRaMacRegion_t region)
 {
 	if(classMode == CLASS_B)
@@ -394,7 +413,11 @@ void LoRaWanClass::init(DeviceClass_t classMode,LoRaMacRegion_t region)
       mibReq.Param.Class = classMode;
       LoRaMacMibSetRequestConfirm( &mibReq );
 
-
+	   Serial.printf("\nDevEui=");
+	   for(int i = 0;i<8;i++)
+	   {
+			Serial.printf("%02X",DevEui[i]);	
+	   }
   	  Serial.print("\r\nLoRaWAN ");
   	  switch(region)
   	  {

diff --git a/src/ESP32_LoRaWAN.h b/src/ESP32_LoRaWAN.h
@@ -39,6 +39,7 @@ class LoRaWanClass{
   void displaySending();
   void displayAck();
   void displayMcuInit();
+  void generateDeveuiByChipID();
 };
 
 extern enum eDeviceState deviceState;

diff --git a/src/gpio.h b/src/gpio.h
@@ -26,7 +26,7 @@
  */
 #ifndef __GPIO_H__
 #define __GPIO_H__
-
+ 
 #include <stdint.h>
 #include "pinName-board.h"
 #include "pinName-ioe.h"