Diff: main.cpp

Revision:

2:7e2fbb1f16d4

Parent:

1:03835eef0976

Child:

3:3230439ce904

--- a/main.cpp	Sat Apr 17 10:22:14 2021 +0000
+++ b/main.cpp	Mon Apr 19 18:16:20 2021 +0000
@@ -1,6 +1,11 @@
 // Lab 4 Colour Mixer
-// Control colours coming on using pot 1 and print values to tera term
+// Control colours coming on using PWM Out interface using pot 1 and print values to tera term
 // John Curran T00214119
+// when ADC data is between 0.0 and <= 0.2 all leds off
+// when ADC data is between 0.2 and <= 0.4 red led is on
+// when ADC data is between 0.4 and <= 0.6 all leds off
+// when ADC data is between 0.6 and <= 0.8 all leds off
+// when ADC data is between 0.8 and <= 1.0 all leds off 
 #include "mbed.h"
 Serial pc(USBTX,USBRX);// serial communications
 DigitalOut redled(p23);// built in red led
@@ -15,44 +20,44 @@
         ADCdata=Ain;//read pin 19
 
         if(ADCdata>0.0 && ADCdata <= 0.2) {
-            pc.printf ( " ADCdata >0.0-<=0.2");
+            pc.printf ( " ADCdata >0.0-<=0.2, All Leds Off\n\r");
             redled = 1;
             greenled=1;
             blueled= 1;
-            wait =(0.5);
+            wait (0.5);
             }
          
         
         if(ADCdata>0.2 && ADCdata <= 0.4) {
-            pc.printf ( " ADCdata >0.2-<=0.4");
+            pc.printf ( " ADCdata >0.2-<=0.4, Red Led is on\n\r");
             redled = 0;
             greenled=1;
             blueled= 1;
-            wait=(0.5);
+            wait(0.5);
             
         }
-        if(ADCdata>0.4 && ADCdata <= 0.8) {
-            pc.printf ( " ADCdata >0.4-<=0.8");
+        if(ADCdata>0.4 && ADCdata <= 0.6) {
+            pc.printf ( " ADCdata >0.4-<=0.8, Green Led is on\n\r");
             redled = 1;
             greenled=0;
             blueled= 1;
-            wait=(0.5);
+            wait(0.5);
             
         }
-        if(ADCdata>0.8 && ADCdata <= 0.9) {
-            pc.printf ( " ADCdata >0.8-<=0.9");
+        if(ADCdata>0.6 && ADCdata <= 0.8) {
+            pc.printf ( " ADCdata >0.8-<=0.9, Blue Led is on\n\r");
             redled = 1;
             greenled=1;
             blueled= 0;
-            wait=(0.5);
+            wait(0.5);
             
         }
-        if(ADCdata>0.9 && ADCdata <= 1.0) {
-            pc.printf ( " ADCdata >0.9-<=1.0");
+        if(ADCdata>0.8 && ADCdata <= 1.0) {
+            pc.printf ( " ADCdata >0.9-<=1.0, Yellow Led is on\n\r");
             redled = 0;
             greenled=0;
             blueled= 1;
-            wait=(0.5);
+            wait(0.5);
             
         }
         }