Diff: main.cpp

Revision:

6:6ae884c9757a

Parent:

5:4d8495cf1c10

Child:

7:9f4b7b55f902

--- a/main.cpp	Fri Feb 24 15:04:14 2017 +0000
+++ b/main.cpp	Wed Mar 15 11:12:37 2017 +0000
@@ -1,9 +1,7 @@
 #include "mbed.h"
 #include "pwm_tone.h"
 #include "C12832.h"
-
-
-
+Serial pc(USBTX, USBRX);
 PwmOut Buzzer(D5);
 C12832 lcd (p5, p7, p6, p8, p11);
 AnalogIn sensor(p17);
@@ -12,6 +10,9 @@
 PwmOut g (p24); // green light
 PwmOut b (p25); // blue light
 
+PwmOut Ctrl1(p21); //relay
+PwmOut Ctrl2(p22); //relay
+
 BusOut leds(LED1,LED2,LED3,LED4); // blue LEDs that we can still use  
 
 
@@ -21,7 +22,7 @@
 BusIn Left(p13);
 BusIn Right(p16);
 
-float C_3 = 1000000/Do3,  // can we erease it??
+/* float C_3 = 1000000/Do3,  // can we erease it??
        Cs_3 = 1000000/Do3s,
        D_3 = 1000000/Re3,
        Ds_3 = 1000000/Re3s,
@@ -61,7 +62,7 @@
 int tones[] = {E_4, D_4, C_4, D_4, E_4, E_4, E_4, 0, D_4, D_4, D_4, 0, E_4, G_4, G_4, 0, 
                              E_4, D_4, C_4, D_4, E_4, E_4, E_4, 0, D_4, D_4, E_4, D_4, C_4, 0, 0, 0};
 int tones_num = 32;
-
+*/
                          
 float multiplier = 50;    // this number got me closest to the reading on my multimeter temp probe
 float temp;               // calculated temperature
@@ -133,11 +134,13 @@
          r = 0; // red 
          g = 1; // green
          b = 1; // blue 
+         Ctrl1 = 1;
+         Ctrl2 = 0;
          
          // value 0 - max
          // value 1 - zero
          // so values closer to zero 0 brighter than closer to 1
-         buzz();
+         // buzz();
          
         }
         else
@@ -145,7 +148,8 @@
          r = 1;
          g = 0.25;
          b = 1;
-         
+         Ctrl1 = 1;
+         Ctrl2 = 1;
         }
         
         if(temp < min)
@@ -153,6 +157,8 @@
          r = 1;
          g = 1;
          b = 0.25;
+         Ctrl1 = 0;
+         Ctrl2 = 1;
          
         }
         else