소스 검색

Version 6.2.5; Focus on Downstream messaging

platenspeler 5 년 전
부모
커밋
9ca63c9e77
1개의 변경된 파일13개의 추가작업 그리고 65개의 파일을 삭제
  1. 13 65
      src/configNode.h

+ 13 - 65
src/configNode.h

@@ -30,9 +30,9 @@
 #	define _SENSOR_INTERVAL 300
 
 	// Sensor and app address information
-#	define _DEVADDR { 0x26, 0x01, 0x1B, 0x96 }
-#	define _APPSKEY { 0x02, 0x02, 0x04, 0x32, 0x00, 0x00, 0x00, 0x00, 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55 }
-#	define _NWKSKEY { 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55, 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55 }
+#define _DEVADDR { 0xAA, 0xAA, 0xAA, 0xAA }
+#define _APPSKEY { 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB }
+#define _NWKSKEY { 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC }
 
 	// For ESP32 based T_BEAM/TTGO boards these two are normally included
 	// If included make value 1, else if not, make them 0
@@ -52,27 +52,6 @@ nodex nodes[] = {
 	{ 0x260116BD , "lora-34 PIR node" },						// F=0
 	{ 0x26011152 , "lora-35 temp+humi node" },					// F=0
 	{ 0x2601148C , "lora-36 test node"  },						// F=0
-// LoRa 37
-	{ 0x26011B90 , "lora-39 temp DS18B20" },					// F=1
-	{ 0x260119A6 , "lora-40 airquality" },						// F=0
-	{ 0x2601117D , "lora-41 temp+humi SR04T" },
-	{ 0x26011593 , "lora-42 temp DS18B20" },					// F=0	
-	{ 0x26011514 , "lora-43 temp DS18B20" },					// F=0
-	{ 0x2601145C , "lora-44 Distance" },						// F=0
-	{ 0x26011D77 , "lora-45 no sensor" },
-	{ 0x2601160F , "lora-46 HTU21 metal case" },				// F=0
-	{ 0x26011E71 , "lora-47 Dallas temperature" },				// F=0
-	{ 0x26011215 , "lora-48 AM2315 temp/Humi" },				// F=0
-	{ 0x2601168F , "lora-49 EU433 Sensor" },					// 433, F=0
-	{ 0x26011b96 , "lora-50 Internal T-Beam gway" },			// F=0
-//	{ 0xAABBCCDD , "lora-51 Heltec OTAA" },						// F=ALL
-	{ 0x26011199 , "lora-52 CubeCell sensor" },					// F=ALL
-	{ 0x26011E52 , "lora-53 gas sensor" },						// F=ALL
-	{ 0x26011F66 , "lora-62 CubeCell Capsule" },				// F=ALL
-	{ 0x260110ED , "lora-63 CubeCell Board" },					// F=ALL
-	{ 0x26011A2B , "lora-64 Metal temp humi" },					// F=0
-	{ 0x260114EA , "lora-65 Waterproof temp humi" },			// F=0
-	{ 0x00000000 , "lora-00 well known sensor" }				// F=0
 };
 
 #endif //_TRUSTED_NODES
@@ -99,50 +78,18 @@ struct codex  {
 // Definition of all nodes that we want to decode locally on the gateway.
 //
 codex decodes[] = {
-	{	0x26011152 , "lora-35",	// F=0
-		{ 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55, 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55 },
-		{ 0x02, 0x02, 0x04, 0x23, 0x00, 0x00, 0x00, 0x00, 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55 } 
+	{ 0xAAAAAAAA , "lora-EE", 	// F=0
+		{ 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB },
+		{ 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC } 
 	},
-	{	0x2601148C , "lora-36",	// F=0
-		{ 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55, 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55 },
-		{ 0x02, 0x02, 0x04, 0x24, 0x00, 0x00, 0x00, 0x00, 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55 } 
+	{ 0xBBBBBBBB , "lora-FF", 	// F=0
+		{ 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB },
+		{ 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC } 
 	},
-	{	0x26011B90 , "lora-39",	// F=0
-		{ 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55, 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55 },
-		{ 0x02, 0x02, 0x04, 0x27, 0x00, 0x00, 0x00, 0x00, 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55 }
-	},
-	{	0x26011593 , "lora-42",	// F=0
-		{ 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55, 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55 },
-		{ 0x02, 0x02, 0x04, 0x2A, 0x00, 0x00, 0x00, 0x00, 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55 }
-	},
-	{	0x26011D77 , "lora-43",	// F=0
-		{ 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55, 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55 },
-		{ 0x02, 0x02, 0x04, 0x2B, 0x00, 0x00, 0x00, 0x00, 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55 }
-	},
-	{	0x27000599 , "lora-44",	// F=0
-		{ 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55, 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55 },
-		{ 0x02, 0x02, 0x04, 0x2C, 0x00, 0x00, 0x00, 0x00, 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55 }
-	},
-	{	0x26011B96 , "lora-50",	// F=0
-		{ 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55, 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55 },
-		{ 0x02, 0x02, 0x04, 0x32, 0x00, 0x00, 0x00, 0x00, 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55 }
-	},
-	{	0x26011B96 , "lora-62",	// F=0
-		{ 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55, 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55 },
-		{ 0x02, 0x02, 0x04, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55 }
-	},
-	{	0x26011B96 , "lora-63",	// F=0
-		{ 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55, 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55 },
-		{ 0x02, 0x02, 0x04, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55 }
-	},
-	{	0x260114EA , "lora-65",	// F=0
-		{ 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55, 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55 },
-		{ 0x02, 0x02, 0x04, 0x41, 0x00, 0x00, 0x00, 0x00, 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55 }
-	},
-	{	0x00000000 , "lora-00",	// F=0
+	{ 0x00000000 , "lora-00",	// F=0
 		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
 		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
-	}					
+	}	
 };
 #endif //_LOCALSERVER
 
@@ -163,7 +110,8 @@ struct wpas {
 // below. This is needed to get the gateway working
 //
 wpas wpa[] = {
-	{ "platenspeler", "maanlama@16" }
+	{ "yourSSID", "yourPassword" },
+	{ "Your2SSID", "your2Password" }
 };