Skip to content

Commit

Permalink
Version 6.2.8: TTN3
Browse files Browse the repository at this point in the history
  • Loading branch information
@platenspeler
platenspeler committed Oct 18, 2021
1 parent ca7d0be commit 5f5a2fa
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 86 deletions.
4 changes: 2 additions & 2 deletions src/configGway.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@
// Maximum number of Message History statistics records gathered. 20 is a good maximum
// (memory intensive). For ESP32 maybe 30 could be used as well
#if !defined _MAXSTAT
# define _MAXSTAT 20
# define _MAXSTAT 30
#endif


Expand All @@ -321,7 +321,7 @@
// The initial version _NUMMAX stores max this many nodes, please make
// _MAXSEEN==0 when not used
#if !defined _MAXSEEN
# define _MAXSEEN 20
# define _MAXSEEN 15
#endif
#define _SEENFILE "/gwaySeen.txt"

Expand Down
91 changes: 7 additions & 84 deletions src/configNode.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 { 0x00, 0x00, 0x00, 0x00 }
# define _APPSKEY { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
# define _NWKSKEY { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}

// For ESP32 based T_BEAM/TTGO boards these two are normally included
// If included make value 1, else if not, make them 0
Expand All @@ -49,33 +49,6 @@ struct nodex {

// Add all your named and trusted nodes to this list
nodex nodes[] = {
{ 0x26011C6D , "lora-33 Empty node" }, // F=0
{ 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=0
{ 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, or on F=1
{ 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
{ 0x260112A9 , "lora-54 ESP8266 No sensor" }, // F=0
{ 0x2601152D , "lora-55 ESP8266 No sensor" }, // F=0
{ 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
{ 0x26011D1D , "lora-152 ESP32 No Sensor" }, // F=0
{ 0x00000000 , "lora-00 well known sensor" } // F=0
};

Expand Down Expand Up @@ -103,54 +76,10 @@ 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 }
},
{ 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 }
},
{ 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-52", // F=0
{ 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55, 0x54, 0x68, 0x69, 0x6E, 0x67, 0x73, 0x34, 0x55 },
{ 0x02, 0x02, 0x04, 0x34, 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
{ 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

Expand All @@ -169,12 +98,6 @@ struct wpas {
// below. This is needed to get the gateway working
//
wpas wpa[] = {
// { "mala_w", "DeWestenbergjesZijn1Bosbes!" },
// { "mala_z", "DeWestenbergjesZijn1Bosbes!" },
{ "mala", "DeWestenbergjesZijn1Bosbes!" },
{ "mala_a", "DeWestenbergjesZijn1Bosbes!" },
// { "Livebox-8AFC", "QMWvLKjMgcYMDrRGQZ" },
{ "platenspeler", "maanlama@16" }
};


Expand All @@ -184,15 +107,15 @@ wpas wpa[] = {
// Port is UDP port in this program
//
// Default for testing: Switched off
// #define _THINGSERVER "westenberg.org" // Server URL of the LoRa-udp.js handler
// #define _THINGSERVER "" // Server URL of the LoRa-udp.js handler
// #define _THINGPORT 1700 // Port 1700 is old compatibility


// Define the name of the accesspoint if the gateway is in accesspoint mode (is
// getting WiFi SSID and password using WiFiManager).
// If you do not need them, comment out.
//#define AP_NAME "Gway-Things4U"
//#define AP_PASSWD "ttnAutoPw"
//#define AP_NAME ""
//#define AP_PASSWD ""


// Gateway Ident definitions. Where is the gateway located?
Expand Down

0 comments on commit 5f5a2fa

Please sign in to comment.