Diff: main.cpp

Revision:

85:4692a1790cfa

Parent:

83:79cb2ba44b66

Child:

86:2a569d9e67f5

--- a/main.cpp	Sat May 28 13:13:41 2016 +0000
+++ b/main.cpp	Thu Jun 02 03:41:43 2016 +0000
@@ -102,6 +102,18 @@
     }
 }
 
+void spaceLEDs(level) {
+    if(level<=0) {
+        ledSpace5 = 1; ledSpace10 = 0; ledSpace15 = 0; ledSpace20 = 0;
+    } else if(level<=1) {
+        ledSpace5 = 0; ledSpace10 = 1; ledSpace15 = 0; ledSpace20 = 0;
+    } else if(level<=2) {
+        ledSpace5 = 0; ledSpace10 = 0; ledSpace15 = 1; ledSpace20 = 0;
+    } else {
+        ledSpace5 = 0; ledSpace10 = 0; ledSpace15 = 0; ledSpace20 = 1;
+    }
+}
+
 /////////////////////////////////// CLASSES ///////////////////////////////////
 
 struct Contact {
@@ -222,6 +234,8 @@
     int bTeamOld = 1;
 #endif
     int bTeamNew, bSpaceOld=0, bSpaceNew, bVMNew, bVLNew, bVMOld=0, bVLOld=0;
+
+    spaceLEDs(level);
     
     char this_node = int(ain.read()*255+17)*int(ain.read()*255+11); // random node value
     out.printf("Node: %d\r\n", this_node);
@@ -233,7 +247,11 @@
 #endif
     radio.encrypt(0);
     radio.promiscuous(promiscuousMode);
-    radio.setFrequency(868000000);
+    if(FREQUENCY == RF69_868MHZ) 
+        radio.setFrequency(868000000);
+    else if(FREQUENCY == RF69_915MHZ) 
+        radio.setFrequency(915000000);
+        
 
     generate_name(rand_name, sizeof(rand_name));
     out.printf("Name: %s\r\n", rand_name);
@@ -271,15 +289,7 @@
         bSpaceNew = buttonSpace;
         if(bSpaceNew && !bSpaceOld) {
             level = (level+1) & 0b11;   // four states
-            if(level<=0) {
-                ledSpace5 = 1; ledSpace10 = 0; ledSpace15 = 0; ledSpace20 = 0;
-            } else if(level<=1) {
-                ledSpace5 = 0; ledSpace10 = 1; ledSpace15 = 0; ledSpace20 = 0;
-            } else if(level<=2) {
-                ledSpace5 = 0; ledSpace10 = 0; ledSpace15 = 1; ledSpace20 = 0;
-            } else {
-                ledSpace5 = 0; ledSpace10 = 0; ledSpace15 = 0; ledSpace20 = 1;
-            }
+            spaceLEDs(level);
             out.clear();
             out.printf("New level: %d\r\n", level);
             out.sleep(2);