Diff: main.cpp

Revision:

4:60bddeca288c

Parent:

3:c8f1a16767f2

Child:

5:c6b7bdcadcd4

--- a/main.cpp	Mon Nov 30 13:57:16 2020 +0000
+++ b/main.cpp	Sat Dec 05 18:35:22 2020 +0000
@@ -5,17 +5,23 @@
 InterruptIn user_button(USER_BUTTON);
 DigitalOut led1(LED1);
 extern "C" uint32_t getMax();
-extern "C" uint32_t getTotFreq;
+extern "C" uint32_t getTotFreq();
 extern "C" uint8_t * GetWordAt(int32_t i); 
 extern "C" int16_t GetFreqAt(int32_t i); 
 
 void button_pressed()
 {
+      lcd.Clear(LCD_COLOR_GREEN);
+      lcd.SetBackColor(LCD_COLOR_BROWN);
+      lcd.SetTextColor(LCD_COLOR_BLACK);
     
 }
 
 void button_released()
 {
+      lcd.Clear(LCD_COLOR_BLUE);
+      lcd.SetBackColor(LCD_COLOR_BLUE);
+      lcd.SetTextColor(LCD_COLOR_WHITE);
     
 }
 int main()
@@ -23,17 +29,18 @@
     user_button.rise(&button_pressed);
     user_button.fall(&button_released);
     uint8_t text[30];
+    uint8_t text2[30];
     led1 = 1;
 
     uint32_t count=getMax();
-    int16_t freq=GetFreqAt(2);
-    uint32_t totalFreq=0;
+    //int16_t freq=GetFreqAt(2);
+    uint32_t totalFreq=getTotFreq();
     BSP_LCD_SetFont(&Font20);
     lcd.DisplayStringAt(0, LINE(1), (uint8_t *)"MBED EXAMPLE", CENTER_MODE);
     wait(1);
     
-    sprintf((char*)text, "freq=%d", freq);
-    lcd.DisplayStringAt(1, LINE(1), (uint8_t *)&text, LEFT_MODE);
+    //sprintf((char*)text, "freq=%d", freq);
+    //lcd.DisplayStringAt(1, LINE(1), (uint8_t *)&text, LEFT_MODE);
     
     while(1)
     {      
@@ -45,12 +52,14 @@
       uint16_t Xpos =100;
       for(int i=0;i<count;i++){
           uint32_t word=0;
-          uint32_t wordFreq=0;
+          uint16_t wordFreq=GetFreqAt(i);
           float freq= wordFreq/totalFreq;
-          sprintf((char*)text, "freq=%d", freq);
-          lcd.DisplayStringAt(1, LINE(1), (uint8_t *)&text, LEFT_MODE);
-          //sprintf((char*)text, "count=%d", count);
-          //lcd.DisplayStringAt(i, LINE(i), (uint8_t *)&text, LEFT_MODE);
+          sprintf((char*)text, "count=%d", count);
+          lcd.DisplayStringAt(i, LINE(i), (uint8_t *)&text, LEFT_MODE);
+          sprintf((char*)text2, "Tfreq=%d", totalFreq);
+          lcd.DisplayStringAt(5, LINE(5), (uint8_t *)&text2, LEFT_MODE);
+//          sprintf((char*)text, "freq=%d", wordFreq);
+//          lcd.DisplayStringAt(i, LINE(i), (uint8_t *)&text, LEFT_MODE);
           
           uint16_t h=i*20;
           lcd.DrawRect(Xpos, 200, 20, h);
@@ -58,26 +67,7 @@
       }
       wait(1);
 
-      lcd.Clear(LCD_COLOR_GREEN);
-      
-      lcd.SetTextColor(LCD_COLOR_BLUE);
-      lcd.FillRect(10, 20, 50, 50);
-      wait(0.1);
-      lcd.SetTextColor(LCD_COLOR_BROWN);
-      lcd.FillCircle(80, 80, 50);
-      wait(0.1);
-      lcd.SetTextColor(LCD_COLOR_YELLOW);
-      lcd.FillEllipse(150, 150, 50, 100);
-      wait(0.1);
-      lcd.SetTextColor(LCD_COLOR_RED);
-      lcd.FillCircle(200, 200, 40);
-      wait(1);
 
-      lcd.SetBackColor(LCD_COLOR_ORANGE);
-      lcd.SetTextColor(LCD_COLOR_CYAN);
-      BSP_LCD_SetFont(&Font24);
-      lcd.DisplayStringAt(0, LINE(7), (uint8_t *)"HAVE FUN !!!", CENTER_MODE);
-      wait(1);
 
       led1 = !led1;
       wait(0.5);