From e4eb3ae38d558a74df528898bcac40bd9b880aed Mon Sep 17 00:00:00 2001 From: Aurora Date: Tue, 6 Sep 2016 22:23:28 +0200 Subject: [PATCH] Minor stuff --- source/config.c | 3 +-- source/draw.h | 9 +++++---- source/exceptions.c | 24 ++++++++++++------------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/source/config.c b/source/config.c index e920833..048ace4 100644 --- a/source/config.c +++ b/source/config.c @@ -204,8 +204,7 @@ void configMenu(bool oldPinStatus) drawCharacter(selected, 10 + multiOptions[selectedOption].posXs[oldEnabled] * SPACING_X, multiOptions[selectedOption].posY, COLOR_BLACK); multiOptions[selectedOption].enabled = (oldEnabled == 3 || !multiOptions[selectedOption].posXs[oldEnabled + 1]) ? 0 : oldEnabled + 1; - if(!selectedOption) - updateBrightness(multiOptions[selectedOption].enabled); + if(!selectedOption) updateBrightness(multiOptions[0].enabled); } else { diff --git a/source/draw.h b/source/draw.h index 2c2fcd9..1f1c345 100644 --- a/source/draw.h +++ b/source/draw.h @@ -35,10 +35,11 @@ #define SPACING_Y 10 #define SPACING_X 8 -#define COLOR_TITLE 0xFF9900 -#define COLOR_WHITE 0xFFFFFF -#define COLOR_RED 0x0000FF -#define COLOR_BLACK 0x000000 +#define COLOR_TITLE 0xFF9900 +#define COLOR_WHITE 0xFFFFFF +#define COLOR_RED 0x0000FF +#define COLOR_BLACK 0x000000 +#define COLOR_YELLOW 0x00FFFF bool loadSplash(void); void drawCharacter(char character, int posX, int posY, u32 color); diff --git a/source/exceptions.c b/source/exceptions.c index fbb43e1..55f6ba0 100644 --- a/source/exceptions.c +++ b/source/exceptions.c @@ -97,14 +97,14 @@ void detectAndProcessExceptionDumps(void) "SP", "LR", "PC", "CPSR", "FPEXC" }; - char hexstring[] = "00000000"; - char arm11Str[] = "Processor: ARM11 (core X)"; - if(dumpHeader->processor == 11) arm11Str[29] = '0' + (char)dumpHeader->core; + char hexString[] = "00000000"; + char arm11String[] = "Processor: ARM11 (core X)"; + if(dumpHeader->processor == 11) arm11String[29] = '0' + (char)dumpHeader->core; initScreens(); drawString("An exception occurred", 10, 10, COLOR_RED); - int posY = drawString(dumpHeader->processor == 11 ? arm11Str : "Processor: ARM9", 10, 30, COLOR_WHITE) + SPACING_Y; + int posY = drawString(dumpHeader->processor == 11 ? arm11String : "Processor: ARM9", 10, 30, COLOR_WHITE) + SPACING_Y; posY = drawString("Exception type: ", 10, posY, COLOR_WHITE); posY = drawString(handledExceptionNames[dumpHeader->type], 10 + 17 * SPACING_X, posY, COLOR_WHITE); @@ -130,9 +130,9 @@ void detectAndProcessExceptionDumps(void) if(dumpHeader->processor == 11 && dumpHeader->additionalDataSize != 0) { posY += SPACING_Y; - char processNameStr[] = "Current process: --------"; - memcpy(processNameStr + 17, (char *)additionalData, 8); - posY = drawString(processNameStr, 10, posY, COLOR_WHITE); + char processName[] = "Current process: --------"; + memcpy(processName + 17, (char *)additionalData, 8); + posY = drawString(processName, 10, posY, COLOR_WHITE); } posY += 3 * SPACING_Y; @@ -140,14 +140,14 @@ void detectAndProcessExceptionDumps(void) for(u32 i = 0; i < 17; i += 2) { posY = drawString(registerNames[i], 10, posY, COLOR_WHITE); - hexItoa(regs[i], hexstring); - posY = drawString(hexstring, 10 + 7 * SPACING_X, posY, COLOR_WHITE); + hexItoa(regs[i], hexString); + posY = drawString(hexString, 10 + 7 * SPACING_X, posY, COLOR_WHITE); if(dumpHeader->processor != 9 || i != 16) { posY = drawString(registerNames[i + 1], 10 + 22 * SPACING_X, posY, COLOR_WHITE); - hexItoa(i == 16 ? regs[20] : regs[i + 1], hexstring); - posY = drawString(hexstring, 10 + 29 * SPACING_X, posY, COLOR_WHITE); + hexItoa(i == 16 ? regs[20] : regs[i + 1], hexString); + posY = drawString(hexString, 10 + 29 * SPACING_X, posY, COLOR_WHITE); } posY += SPACING_Y; @@ -158,7 +158,7 @@ void detectAndProcessExceptionDumps(void) u32 mode = regs[16] & 0xF; if(dumpHeader->type == 3 && (mode == 7 || mode == 11)) { - posY = drawString("Incorrect dump: failed to dump code and/or stack", 10, posY, 0x00FFFF) + 2 * SPACING_Y; //In yellow + posY = drawString("Incorrect dump: failed to dump code and/or stack", 10, posY, COLOR_YELLOW) + 2 * SPACING_Y; if(dumpHeader->processor != 9) posY -= SPACING_Y; }