Diff: Led_Lcd.cpp

Revision:

2:39601122cf74

Parent:

1:4a8b2dbb7ff3

--- a/Led_Lcd.cpp	Mon May 11 18:19:58 2020 +0000
+++ b/Led_Lcd.cpp	Mon Jun 01 17:08:22 2020 +0000
@@ -2,40 +2,31 @@
 
 #define LENGTH_SIDE_SQUARE 80
 
-LedLcd::LedLcd(unsigned char ucColumnNr){
-    
+DigitalOut myled(LED1);
+
+LedLcd::LedLcd(unsigned char ucColumnNr){    
     lcd.Clear(LCD_COLOR_BLACK);
     lcd.SetFont(&Font24);
-    
-    if(ucColumnNr == 1){
-        square_x_pos = 80;  
-    }
-    else if(ucColumnNr == 2){
-        square_x_pos = 160;  
-    }
-    else{
-        square_x_pos = 0;
-    }  
+    square_x_pos = ucColumnNr * LENGTH_SIDE_SQUARE;
 }
 
 void LedLcd::On(unsigned char uLedLcdNumber){
+    char cText[2] = {'0'};
+    char *pText = cText;
     
     for(unsigned char ucSquareCounter = 0; ucSquareCounter <= 3; ucSquareCounter++){
+        *pText += 1;
         lcd.SetTextColor(LCD_COLOR_GREEN);
         lcd.DrawRect(square_x_pos, ucSquareCounter * LENGTH_SIDE_SQUARE, LENGTH_SIDE_SQUARE, LENGTH_SIDE_SQUARE);
         if(ucSquareCounter == uLedLcdNumber){
-            lcd.SetTextColor(LCD_COLOR_YELLOW);
+            lcd.SetTextColor(LCD_COLOR_MAGENTA);
         }
         else{
             lcd.SetTextColor(LCD_COLOR_BLUE);
         }
         lcd.FillRect(square_x_pos + 1, ucSquareCounter * LENGTH_SIDE_SQUARE + 1, LENGTH_SIDE_SQUARE - 2, LENGTH_SIDE_SQUARE - 2);
-        
+        lcd.SetBackColor(LCD_COLOR_RED);
+        lcd.SetTextColor(LCD_COLOR_WHITE);
+        lcd.DisplayStringAt(square_x_pos, ucSquareCounter * LENGTH_SIDE_SQUARE, (uint8_t *)pText, LEFT_MODE);
     }
-    lcd.SetBackColor(LCD_COLOR_RED);
-    lcd.SetTextColor(LCD_COLOR_WHITE);
-    lcd.DisplayStringAt(square_x_pos, 0 * LENGTH_SIDE_SQUARE,(uint8_t *)"0", LEFT_MODE);
-    lcd.DisplayStringAt(square_x_pos, 1 * LENGTH_SIDE_SQUARE,(uint8_t *)"1", LEFT_MODE);
-    lcd.DisplayStringAt(square_x_pos, 2 * LENGTH_SIDE_SQUARE,(uint8_t *)"2", LEFT_MODE);
-    lcd.DisplayStringAt(square_x_pos, 3 * LENGTH_SIDE_SQUARE,(uint8_t *)"3", LEFT_MODE);
 }