Merge pull request #177 from TheThingsNetwork/example/node

Revert Node from landing config

Author: johanstokking

examples/Node/Decoder.js

@@ -1,11 +1,10 @@
 /**
  * Use as payload decoder function.
  *
- * 12 8E 00 21 09 5A
+ * 12 8E 00 21 09 5A (port 2)
  * 
  * {
  *   "event": "interval",
- *   "device": "node",
  *   "battery": 4750,
  *   "light": 33,
  *   "temperature": 23.94
@@ -22,17 +21,10 @@ function Decoder(bytes, port) {
     4: 'button'
   };
 
-  if (port > 10) {
-    port = port - 10;
-    decoded.device = 'uno';
-  } else {
-    decoded.device = 'node';
-    decoded.battery = (bytes[0] << 8) + bytes[1];
-    decoded.light = (bytes[2] << 8) + bytes[3];
-    decoded.temperature = ((bytes[4] << 8) + bytes[5]) / 100;
-  }
-
   decoded.event = events[port];
+  decoded.battery = (bytes[0] << 8) + bytes[1];
+  decoded.light = (bytes[2] << 8) + bytes[3];
+  decoded.temperature = ((bytes[4] << 8) + bytes[5]) / 100;
 
   return decoded;
 }

examples/Node/Node.ino

@@ -1,16 +1,15 @@
 #include <TheThingsNetwork.h>
 #include <TheThingsNode.h>
 
-// These keys are for https://ttn.fyi/activate
-// Replace them if you want to use your own app
-const char *appEui = "70B3D57EF0001CEE";
-const char *appKey = "F2E5C891560FF9CE24AD56E1A69B85DF";
+// Set your AppEUI and AppKey
+const char *appEui = "0000000000000000";
+const char *appKey = "00000000000000000000000000000000";
 
 #define loraSerial Serial1
 #define debugSerial Serial
 
 // Replace REPLACE_ME with TTN_FP_EU868 or TTN_FP_US915
-#define freqPlan REPLACE_ME
+#define freqPlan TTN_FP_EU868
 
 TheThingsNetwork ttn(loraSerial, debugSerial, freqPlan);
 TheThingsNode *node;
@@ -24,8 +23,8 @@ void setup() {
   loraSerial.begin(57600);
   debugSerial.begin(9600);
 
-  // Test LoRa module
-  ttn.showStatus();
+  // Wait a maximum of 10s for Serial Monitor
+  while (!debugSerial && millis() < 10000);
 
   // Config Node
   node = TheThingsNode::setup();
@@ -41,12 +40,6 @@ void setup() {
   node->showStatus();
   node->setColor(TTN_GREEN);
 
-  // Wait a maximum of 10s for Serial Monitor
-  while (!debugSerial && millis() < 10000);
-
-  debugSerial.println("-- NODE: STATUS");
-  node->showStatus();
-
   debugSerial.println("-- TTN: STATUS");
   ttn.showStatus();
 
@@ -97,7 +90,7 @@ void sendData(uint8_t port) {
   node->showStatus();
 
   byte* bytes;
-  byte payload[9];
+  byte payload[6];
 
   uint16_t battery = node->getBattery();
   bytes = (byte*) &battery;