Use the new Focus helpers

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
pull/389/head
Gergely Nagy 8 years ago
parent 0f04e75df6
commit 6b1bcd2522

@ -18,6 +18,7 @@
#include <Kaleidoscope-EEPROM-Colormap.h> #include <Kaleidoscope-EEPROM-Colormap.h>
#include <Kaleidoscope-EEPROM-Settings.h> #include <Kaleidoscope-EEPROM-Settings.h>
#include <Kaleidoscope-Focus.h>
#include <EEPROM.h> #include <EEPROM.h>
namespace KaleidoscopePlugins { namespace KaleidoscopePlugins {
@ -100,14 +101,10 @@ namespace KaleidoscopePlugins {
cRGB color; cRGB color;
EEPROM.get (paletteBase + i * sizeof (color), color); EEPROM.get (paletteBase + i * sizeof (color), color);
Serial.print (color.r); ::Focus.printColor (color);
Serial.print (F(" "));
Serial.print (color.g);
Serial.print (F(" "));
Serial.print (color.b);
if (i < 14) if (i < 14)
Serial.print (F(" | ")); ::Focus.printSeparator ();
} }
Serial.println (); Serial.println ();
break; break;
@ -139,10 +136,10 @@ namespace KaleidoscopePlugins {
indexes = EEPROM.read (mapBase + loc); indexes = EEPROM.read (mapBase + loc);
Serial.print (indexes >> 4); ::Focus.printNumber (indexes >> 4);
Serial.print (F(" | ")); ::Focus.printSeparator ();
Serial.print (indexes & ~0xf0); ::Focus.printNumber (indexes & ~0xf0);
Serial.print (F(" | ")); ::Focus.printSeparator ();
} }
Serial.println (); Serial.println ();
} }
@ -150,6 +147,7 @@ namespace KaleidoscopePlugins {
} }
break; break;
} }
uint16_t maxIndex = (maxLayers * ROWS * COLS) / 2; uint16_t maxIndex = (maxLayers * ROWS * COLS) / 2;
uint8_t loc = 0; uint8_t loc = 0;

Loading…
Cancel
Save