Diff: main.cpp

Revision:

7:9c5bca0ac9d7

Parent:

6:6346ef2b4638

Child:

8:e6e4eece90f7

diff -r 6346ef2b4638 -r 9c5bca0ac9d7 main.cpp
--- a/main.cpp	Thu Aug 18 07:41:33 2016 +0000
+++ b/main.cpp	Wed Sep 28 14:34:47 2016 +0000
@@ -118,26 +118,26 @@
 //-------------------------------------------------------------------------------
 //The system looks up the type of LED that is being detected for Each sensor and will fill in the result table & update the associated Output list
 //outputs start at 0 torough to 15
-/*
+
 char Config[32]={   //RGB,    0,  //sensor 0 , uses 3 outputs  - 0,1,2
-                    GREEN_YELLOW,   0,  //sensor 0 , uses 3 outputs  - 0,1,2
+                    GREEN_YELLOW,   0,  //sensor 0 , uses 2 outputs  - 0,1
                     NOTUSED,        2,  //sensor 1
                     NOTUSED,        3,  //sensor 2
                     NOTUSED,        4,  //sensor 3
                     NOTUSED,        5,  //sensor 4                    
                     NOTUSED,        6,  //sensor 5
                     NOTUSED,        7,  //sensor 6
-                    RGB,            8,  //sensor 7
-                    NOTUSED,        11,  //sensor 8
-                    NOTUSED,        12,  //sensor 9
-                    NOTUSED,        13,  //sensor 10
-                    NOTUSED,        14,  //sensor 11
-                    NOTUSED,        15,  //sensor 12
-                    NOTUSED,        15,  //sensor 13
+                    NOTUSED,        8,  //sensor 7
+                    NOTUSED,        9,  //sensor 8
+                    NOTUSED,        10,  //sensor 9
+                    NOTUSED,        11,  //sensor 10
+                    NOTUSED,        12,  //sensor 11
+                    NOTUSED,        13,  //sensor 12
+                    NOTUSED,        14,  //sensor 13
                     NOTUSED,        15,  //sensor 14
                     NOTUSED,        15,  //sensor 15
                 };
-*/
+/*
 char Config[32]={   //RGB,    0,  //sensor 0 , uses 3 outputs  - 0,1,2
                     STD_RED,        0,  //sensor 0 , uses 3 outputs  - 0,1,2
                     STD_GREEN,      1,  //sensor 1
@@ -156,7 +156,7 @@
                     STD_RED,        14,  //sensor 14
                     STD_GREEN,      15,  //sensor 15
                 };
-
+*/
 //new config trpe
 
 
@@ -409,7 +409,7 @@
 void UpdateDisplay(void)
 {
     lcd.locate(0, 0);
-    lcd.printf("R%02i G%02i B%02i W%04i",RedProp,GreenProp,BlueProp,White); 
+    lcd.printf("R%02i G%02i B%02i W%03i",RedProp,GreenProp,BlueProp,White); 
     lcd.locate(0, 1);       
     lcd.printf("R%02i G%02i B%02i H%02i ",RedThreshold, GreenThreshold, BlueThreshold, Hysteresis);   
 }