From 06ebed553756dfd4c6aaa82853660f9c672500e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Sat, 28 Apr 2018 11:19:01 +0200 Subject: [PATCH] Rename some variables and clean up coding style. --- right/src/led_display.c | 16 ++++++++-------- right/src/usb_composite_device.c | 6 ++++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/right/src/led_display.c b/right/src/led_display.c index ed00fd7..1096dfb 100644 --- a/right/src/led_display.c +++ b/right/src/led_display.c @@ -6,7 +6,7 @@ uint8_t IconsAndLayerTextsBrightness = 0xff; uint8_t AlphanumericSegmentsBrightness = 0xff; -static const uint16_t capitalLetterToSegmentSet[] = { +static const uint16_t capitalLetterToSegmentMap[] = { 0b0000000011110111, 0b0001001010001111, 0b0000000000111001, @@ -35,7 +35,7 @@ static const uint16_t capitalLetterToSegmentSet[] = { 0b0000110000001001, }; -static const uint16_t digitToSegmentSet[] = { +static const uint16_t digitToSegmentMap[] = { 0b0000110000111111, 0b0000010000000110, 0b0000100010001011, @@ -48,13 +48,13 @@ static const uint16_t digitToSegmentSet[] = { 0b0000000011101111, }; -static uint16_t characterToSegmentSet(char character) +static uint16_t characterToSegmentMap(char character) { switch (character) { case 'A' ... 'Z': - return capitalLetterToSegmentSet[character - 'A']; + return capitalLetterToSegmentMap[character - 'A']; case '0' ... '9': - return digitToSegmentSet[character - '0']; + return digitToSegmentMap[character - '0']; } return 0; } @@ -65,11 +65,11 @@ void LedDisplay_SetText(uint8_t length, const char* text) switch (length) { case 3: - allSegmentSets = (uint64_t)characterToSegmentSet(text[2]) << 28; + allSegmentSets = (uint64_t)characterToSegmentMap(text[2]) << 28; case 2: - allSegmentSets |= characterToSegmentSet(text[1]) << 14; + allSegmentSets |= characterToSegmentMap(text[1]) << 14; case 1: - allSegmentSets |= characterToSegmentSet(text[0]); + allSegmentSets |= characterToSegmentMap(text[0]); } LedDriverValues[LedDriverId_Left][11] = allSegmentSets & 0b00000001 ? AlphanumericSegmentsBrightness : 0; diff --git a/right/src/usb_composite_device.c b/right/src/usb_composite_device.c index 1a0ddf2..ca8d23d 100644 --- a/right/src/usb_composite_device.c +++ b/right/src/usb_composite_device.c @@ -196,8 +196,10 @@ static void ComputerIsSleeping(void) { } void WakeupComputer(bool sendResume) { - if (sendResume) // The device should wake up the computer - USB_DeviceSetStatus(UsbCompositeDevice.deviceHandle, kUSB_DeviceStatusBus, NULL); // Send resume signal - this will call USB_DeviceKhciControl(khciHandle, kUSB_DeviceControlResume, NULL); + if (sendResume) { // The device should wake up the computer + // Send resume signal - this will call USB_DeviceKhciControl(khciHandle, kUSB_DeviceControlResume, NULL); + USB_DeviceSetStatus(UsbCompositeDevice.deviceHandle, kUSB_DeviceStatusBus, NULL); + } computerSleeping = false; // The computer is now awake