Diff: main.cpp

Revision:

1:d2987a6252ff

Parent:

0:088a61d66abb

Child:

2:abfd621d131a

--- a/main.cpp	Sun Apr 25 13:06:30 2021 +0000
+++ b/main.cpp	Sun Apr 25 13:20:54 2021 +0000
@@ -1,18 +1,24 @@
+/* Lab 4 colour mixing complete*/
+
 #include "mbed.h"
+#include "C12832.h"
 
-PwmOut led1(p23);
-PwmOut led2(p25);
+C12832 lcd(p5, p7, p6, p8, p11); // LCD pins initilised
+PwmOut led1(p23);                // LED 1 initalised
+PwmOut led2(p25);                // LED 2 initalised
 
-AnalogIn pot1(p19);
-AnalogIn pot2(p20);
+AnalogIn pot1(p19); // Pot 1 initalised
+AnalogIn pot2(p20); // Pot 2 initalised
 
 
-int main() {
+int main()
+{
     while(1) {
-       led1.write(pot1.read());
-       printf("red: %f ", pot1.read());
-       led2.write(pot2.read());
-       printf("blue: %f ", pot1.read());
-       wait(.05);
+        led1.write(pot1.read());                    // LED 1 output, input value from pot 1
+        lcd.printf("red: %f ", pot1.read());        // Display red value on LCD
+        led2.write(pot2.read());                    // LED 2 output, input value from pot 2
+        lcd.printf("blue: %f ", pot1.read());       // Display blue value on LCD
+        lcd.cls();                                  // Clears LCD screen
+        wait(.05);                                  // Delay 0.05s
     }
 }