Changes in Finger Race Stage3

Lenardgeorge · Lenardgeorge · commit e3a167e13388 · 2019-07-08T17:02:50.000+02:00
diff --git a/Examples/Lessons/L7_AnalogInputs/L7_Activity3/L7_Activity3.ino b/Examples/Lessons/L7_AnalogInputs/L7_Activity3/L7_Activity3.ino
@@ -1,15 +1,15 @@
+
 /*
   CTC GO! CORE MODULE 
   LESSON 07 - Analog Inputs
 
   This sketch is written to accompany Activity 3 in Lesson 07 of the CTC GO! core module
 */
 
-  
-  int USsensor = A0; 
-   int yellowLED = 9;
-  int redLED = 11;   
-  int greenLED = 13;
+  int USsensor = A0;
+  int greenLED = 9; 
+  int yellowLED = 11;
+  int redLED = 13;   
   
   float distance = 0; 
   int value = 0;
@@ -37,11 +37,14 @@
     if (distance < 200)
     {
       digitalWrite(redLED, HIGH);
+      digitalWrite(yellowLED, LOW);
+      digitalWrite(greenLED, LOW);
     }
     else if (distance < 400)
     {
       digitalWrite(yellowLED, HIGH);
       digitalWrite(redLED, LOW);
+      digitalWrite(greenLED, LOW);
     }
     else if (distance < 600)
     {
@@ -54,6 +57,5 @@
       digitalWrite(greenLED, LOW);
       digitalWrite(yellowLED, LOW);
       digitalWrite(redLED, LOW);
-  
     }
   }
diff --git a/Examples/Projects/P1_FingerRace/P1_FingerRace_Stage3/P1_FingerRace_Stage3.ino b/Examples/Projects/P1_FingerRace/P1_FingerRace_Stage3/P1_FingerRace_Stage3.ino
@@ -12,7 +12,7 @@ int button_P1 = 6;
 int button_P2 = 7;
 
 int blueLED_P1 =  12;
-int blueLED_P2 =  11;
+int blueLED_P2 =  10;
 
 int gameState = 0;
 
diff --git a/Examples/Projects/P1_FingerRace/P1_FingerRace_Stage4/P1_FingerRace_Stage4.ino b/Examples/Projects/P1_FingerRace/P1_FingerRace_Stage4/P1_FingerRace_Stage4.ino
@@ -8,7 +8,7 @@
 int greenLED_P1 = 13;
 int blueLED_P1 =  12;
 
-int blueLED_P2 =  11;
+int blueLED_P2 =  10;
 int greenLED_P2 =  9;
 
 int button_P1 = 6;
diff --git a/Examples/Projects/P1_FingerRace/P1_FingerRace_Stage5/P1_FingerRace_Stage5.ino b/Examples/Projects/P1_FingerRace/P1_FingerRace_Stage5/P1_FingerRace_Stage5.ino
@@ -8,7 +8,7 @@
 int greenLED_P1 = 13;
 int blueLED_P1 =  12;
 
-int blueLED_P2 =  11;
+int blueLED_P2 =  10;
 int greenLED_P2 =  9;
 
 int button_P1 = 6;
diff --git a/Examples/Projects/P1_FingerRace/P1_FingerRace_Stage6/P1_FingerRace_Stage6.ino b/Examples/Projects/P1_FingerRace/P1_FingerRace_Stage6/P1_FingerRace_Stage6.ino
@@ -8,7 +8,7 @@
 int greenLED_P1 = 13;
 int blueLED_P1 =  12;
 
-int blueLED_P2 =  11;
+int blueLED_P2 =  10;
 int greenLED_P2 =  9;
 
 int button_P1 = 6;

Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,15 @@`
	`1`	`+`
`1`	`2`	`/*`
`2`	`3`	`CTC GO! CORE MODULE`
`3`	`4`	`LESSON 07 - Analog Inputs`
`4`	`5`
`5`	`6`	`This sketch is written to accompany Activity 3 in Lesson 07 of the CTC GO! core module`
`6`	`7`	`*/`
`7`	`8`
`8`		`-`
`9`		`- int USsensor = A0;`
`10`		`- int yellowLED = 9;`
`11`		`- int redLED = 11;`
`12`		`- int greenLED = 13;`
	`9`	`+ int USsensor = A0;`
	`10`	`+ int greenLED = 9;`
	`11`	`+ int yellowLED = 11;`
	`12`	`+ int redLED = 13;`
`13`	`13`
`14`	`14`	`float distance = 0;`
`15`	`15`	`int value = 0;`
`@@ -37,11 +37,14 @@`
`37`	`37`	`if (distance < 200)`
`38`	`38`	`{`
`39`	`39`	`digitalWrite(redLED, HIGH);`
	`40`	`+ digitalWrite(yellowLED, LOW);`
	`41`	`+ digitalWrite(greenLED, LOW);`
`40`	`42`	`}`
`41`	`43`	`else if (distance < 400)`
`42`	`44`	`{`
`43`	`45`	`digitalWrite(yellowLED, HIGH);`
`44`	`46`	`digitalWrite(redLED, LOW);`
	`47`	`+ digitalWrite(greenLED, LOW);`
`45`	`48`	`}`
`46`	`49`	`else if (distance < 600)`
`47`	`50`	`{`
`@@ -54,6 +57,5 @@`
`54`	`57`	`digitalWrite(greenLED, LOW);`
`55`	`58`	`digitalWrite(yellowLED, LOW);`
`56`	`59`	`digitalWrite(redLED, LOW);`
`57`		`-`
`58`	`60`	`}`
`59`	`61`	`}`