X-Git-Url: https://git.rohieb.name/hackover2013-badge-firmware.git/blobdiff_plain/9d18e10afb2439a6a9ba6978a799259746a837b7..277c38b5c941330bcba626fd3c22dfba0e0e0be4:/project/commands/drawing/cmd_button.c?ds=inline diff --git a/project/commands/drawing/cmd_button.c b/project/commands/drawing/cmd_button.c index 98d376f..6dcd77c 100644 --- a/project/commands/drawing/cmd_button.c +++ b/project/commands/drawing/cmd_button.c @@ -44,10 +44,10 @@ #include "project/commands.h" // Generic helper functions #ifdef CFG_TFTLCD - #include "drivers/lcd/tft/lcd.h" - #include "drivers/lcd/tft/drawing.h" - #include "drivers/lcd/tft/touchscreen.h" - #include "drivers/lcd/tft/fonts/dejavusans9.h" + #include "drivers/displays/tft/lcd.h" + #include "drivers/displays/tft/drawing.h" + #include "drivers/displays/tft/touchscreen.h" + #include "drivers/displays/tft/fonts/dejavusans9.h" /**************************************************************************/ /*! @@ -76,7 +76,7 @@ void cmd_button(uint8_t argc, char **argv) if (argc == 7) { // Render the button with no text - drawButton(x, y, w, h, &dejaVuSans9ptFontInfo, 7, (uint16_t)border, (uint16_t)fill, (uint16_t)font, NULL); + drawButton(x, y, w, h, &dejaVuSans9ptFontInfo, (uint16_t)border, (uint16_t)fill, (uint16_t)font, NULL); } else { @@ -93,7 +93,7 @@ void cmd_button(uint8_t argc, char **argv) *data_ptr++ = '\0'; // Render the button with text - drawButton(x, y, w, h, &dejaVuSans9ptFontInfo, 7, (uint16_t)border, (uint16_t)fill, (uint16_t)font, (char *)&data); + drawButton(x, y, w, h, &dejaVuSans9ptFontInfo, (uint16_t)border, (uint16_t)fill, (uint16_t)font, (char *)&data); } }