option LCD_ICON_COLOR for different color for icons

git-svn-id: svn://mikrocontroller.net/transistortester@793 6ebdd44f-5a7e-449c-b779-36259138d2c7

Author: kubi48

Software/trunk/function_menu.c

@@ -901,8 +901,13 @@ uint8_t max_value;
      color[c_num] &= max_value;
      if (xcol == 0) {
         // foreground color
+ #ifdef LCD_ICON_COLOR
+        lcd_fg2_color.b[1] = (color[0] << 3) | (color[1] >> 3);
+        lcd_fg2_color.b[0] = ((color[1] & 7) << 5) | (color[2] & 0x1f);
+ #else
         lcd_fg_color.b[1] = (color[0] << 3) | (color[1] >> 3);
         lcd_fg_color.b[0] = ((color[1] & 7) << 5) | (color[2] & 0x1f);
+ #endif
      } else {
         lcd_bg_color.b[1] = (color[0] << 3) | (color[1] >> 3);
         lcd_bg_color.b[0] = ((color[1] & 7) << 5) | (color[2] & 0x1f);
@@ -923,8 +928,13 @@ uint8_t max_value;
 
 //  eeprom_write_byte((uint8_t *)(&EE_Volume_Value), (int8_t)contrast);	// save contrast value
   if (xcol == 0) {
+#ifdef LCD_ICON_COLOR
+     eeprom_write_byte((uint8_t *)(&EE_FG_COLOR1), (int8_t)lcd_fg2_color.b[0]);
+     eeprom_write_byte((uint8_t *)(&EE_FG_COLOR2), (int8_t)lcd_fg2_color.b[1]);
+#else
      eeprom_write_byte((uint8_t *)(&EE_FG_COLOR1), (int8_t)lcd_fg_color.b[0]);
      eeprom_write_byte((uint8_t *)(&EE_FG_COLOR2), (int8_t)lcd_fg_color.b[1]);
+#endif
   } else {
      eeprom_write_byte((uint8_t *)(&EE_BG_COLOR1), (int8_t)lcd_bg_color.b[0]);
      eeprom_write_byte((uint8_t *)(&EE_BG_COLOR2), (int8_t)lcd_bg_color.b[1]);

Software/trunk/lcd-routines.c

@@ -302,8 +302,7 @@ void lcd_data(unsigned char temp1) {
 
 #ifdef LCD_ICON_COLOR
  #ifdef LCD_CHANGE_COLOR
- lcd_fg_color.b[0] = eeprom_read_byte(&EE_FG_COLOR1);
- lcd_fg_color.b[1] = eeprom_read_byte(&EE_FG_COLOR2);
+ lcd_fg_color.w = lcd_fg2_color.w;
  #else
  lcd_fg_color.w = LCD_FG_COLOR;
  #endif
@@ -587,7 +586,10 @@ void lcd_init(void) {
  #ifdef LCD_CHANGE_COLOR
    lcd_bg_color.b[0] = eeprom_read_byte(&EE_BG_COLOR1);
    lcd_bg_color.b[1] = eeprom_read_byte(&EE_BG_COLOR2);
-  #ifndef LCD_ICON_COLOR
+  #ifdef LCD_ICON_COLOR
+   lcd_fg2_color.b[0] = eeprom_read_byte(&EE_FG_COLOR1);
+   lcd_fg2_color.b[1] = eeprom_read_byte(&EE_FG_COLOR2);
+  #else
    lcd_fg_color.b[0] = eeprom_read_byte(&EE_FG_COLOR1);
    lcd_fg_color.b[1] = eeprom_read_byte(&EE_FG_COLOR2);
   #endif

Software/trunk/mega328_color_kit/Makefile

@@ -160,7 +160,7 @@ CFLAGS += -DLCD_BG_COLOR=0x7800
 CFLAGS += -DLCD_FG_COLOR=0xffff
 
 # You can also select a icon color  (format 5 bit red, 6 bit green, 5 bit blue)
-# If LCD_ICON_COLOR is not specified, the LCF_FG_COLOR is used
+# If LCD_ICON_COLOR is not specified, the LCD_FG_COLOR is used
 CFLAGS += -DLCD_ICON_COLOR=0x03ff
 
 # If option WITH_LCD_ST7565 is present one of the following fonts should be