Diff: proto_code.cpp

Revision:

42:ed38b8671e43

Parent:

41:dee3fd34e37a

Parent:

40:dec5270e03e9

Child:

43:6eeb44bee87e

diff -r dee3fd34e37a -r ed38b8671e43 proto_code.cpp
--- a/proto_code.cpp	Sat Jan 09 12:04:00 2016 +0000
+++ b/proto_code.cpp	Sat Jan 09 12:15:16 2016 +0000
@@ -175,6 +175,8 @@
   }    
   
   ta.post_color(0xFF0000);
+  
+  srand(millis());
 }
 #else
 static void slave_setup()
@@ -368,6 +370,7 @@
     if (last_mode != mode)
     {
         if (mode == FREEFORM)
+            srand(millis());
             writeToPhone("RR.\r\n");
             
         if (mode == PATTERN)
@@ -399,12 +402,7 @@
     #ifdef MASTER
     if(mode == FREEFORM)
     {
-      ++active_cone;//getRandomCone(); 
-      
-      if (active_cone > NUM_CONES)
-      {
-        active_cone = 1;    
-      }
+      active_cone = getRandomCone(); 
       
       writeToPhone("GN_AC: %d\r\n", active_cone);
       
@@ -980,18 +978,54 @@
 
 static uint8_t getRandomCone(void)
 {
-  static uint8_t lastCone = 0;
+  static uint8_t last_cone = 0;
   uint8_t cone;
+  int counter = 0;
   
   do
   {
-    cone = random(1, NUM_CONES + 1);
+    cone =  (rand() % NUM_CONES);
+    ++cone;
+    
+    if (cone == last_cone)
+    {
+        if (rand() % 2 == 1)
+        {
+            --cone;
+            
+            if (cone <= 0)
+            {
+                cone = NUM_CONES;    
+            }    
+        }
+        else
+        {
+            ++cone;
+            
+            if (cone > NUM_CONES)
+            {
+                cone = 1;    
+            }
+        }
+    }
   }
-  while(cone == lastCone || active_cones[cone] == false);
+  while(active_cones[cone] == false && ++counter < 10);
   
-  //DEBUG("Target cone is ");
-  //DEBUG("%d\n",cone);
-  lastCone = cone;
+  if (!active_cones[cone])
+  {
+      for (int i = 0; i < NUM_CONES; ++i)
+      {
+          if (i == last_cone || !active_cones[cone])
+          {
+              continue;    
+          }    
+          
+          cone = i;
+          break;
+      }
+  }
+  
+  last_cone = cone;
   return cone;
 }