Diff: main.cpp

Revision:

4:8331c1239f6a

Parent:

3:927028389e55

Child:

5:1e8b48d6682b

--- a/main.cpp	Mon Apr 27 05:25:27 2020 +0000
+++ b/main.cpp	Mon Apr 27 19:30:53 2020 +0000
@@ -15,11 +15,12 @@
 Nav_Switch myNav(p9, p6, p7, p5, p8); //pin order on Sparkfun breakout
 uLCD_4DGL uLCD(p28, p27, p30); // serial tx, serial rx, reset pin; 
 PwmOut myled(LED1);
-SDFileSystem sd(p11, p12, p13, p10, "sd");
+//SDFileSystem sd(p11, p12, p13, p10, "sd");
 microphone mymic1(p15);
 AnalogIn pot(p16);
 AnalogOut DACout(p18);
 DigitalOut led(LED2);
+//BusOut led_strip(p21, p22, p23, p24, p25, p26);
 
 Thread thread1;
 
@@ -348,7 +349,26 @@
 //    }
 }
 int getScore2() {
-    return int(mymic1*1000.0);
+    return mymic1*1000.0;
+}
+
+void update_leds(float val){
+    if(val <= 2.5){
+        led_strip = 0b100000; 
+    } else if (2.5 > val && val < 5){
+        led_strip = 0b110000; 
+    } else if (val > 5 && val < 7.5){
+        led_strip = 0b111000; 
+    } else if (val > 7.5 && val < 10){
+        led_strip = 0b111100; 
+    } else if (val > 10 && val < 12.5){
+        led_strip = 0b111110; 
+    } else if (val > 12.5 && val < 15){
+        led_strip = 0b111111; 
+    } else {
+        led_strip = 0; 
+    }
+    Thread::wait(0.2); 
 }
 
 void play() {
@@ -390,6 +410,7 @@
             if (timer % 25 == 0) {
                 score1 = getScore1(); //(int) (pot*100.0); //curTime+1000; // int(mymic1*1000.0);
                 score2 = getScore2(); //curTime+2000;
+                update_leds(getScore2());
                 uLCD.color(BLUE);
                 uLCD.locate(0,1);
                 uLCD.printf("%4d", score1);
@@ -551,14 +572,14 @@
 
 int main() {
      // read in highScoresArr from SD card
-     FILE *fp = fopen("/sd/finalProj/highscores.txt", "r");
+     /*FILE *fp = fopen("/sd/finalProj/highscores.txt", "r");
      if(fp == NULL) {
      uLCD.printf("Error Open \n");
      }
      for (int i=0; i<sizeof(highScoresArr)/4; i++) {
         fscanf(fp, "%4d", &highScoresArr[i]);
      }
-     fclose(fp);
+     fclose(fp);*/
      // create menu interface
      uLCD.background_color(LBLUE);
      uLCD.cls();