uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename some variables and clean up coding style.

Browse Source
This commit is contained in:
László Monda
2018-04-28 11:19:01 +02:00
parent 02d6fb4628
commit 06ebed5537
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
right/src/led_display.c
View File

@@ -6,7 +6,7 @@
uint8_t IconsAndLayerTextsBrightness = 0xff; uint8_t IconsAndLayerTextsBrightness = 0xff;
uint8_t AlphanumericSegmentsBrightness = 0xff; uint8_t AlphanumericSegmentsBrightness = 0xff;
static const uint16_t capitalLetterToSegmentSet[] = { static const uint16_t capitalLetterToSegmentMap[] = {
0b0000000011110111, 0b0000000011110111,
0b0001001010001111, 0b0001001010001111,
0b0000000000111001, 0b0000000000111001,
@@ -35,7 +35,7 @@ static const uint16_t capitalLetterToSegmentSet[] = {
0b0000110000001001, 0b0000110000001001,
}; };
static const uint16_t digitToSegmentSet[] = { static const uint16_t digitToSegmentMap[] = {
0b0000110000111111, 0b0000110000111111,
0b0000010000000110, 0b0000010000000110,
0b0000100010001011, 0b0000100010001011,
@@ -48,13 +48,13 @@ static const uint16_t digitToSegmentSet[] = {
0b0000000011101111, 0b0000000011101111,
}; };
static uint16_t characterToSegmentSet(char character) static uint16_t characterToSegmentMap(char character)
{ {
switch (character) { switch (character) {
case 'A' ... 'Z': case 'A' ... 'Z':
return capitalLetterToSegmentSet[character - 'A']; return capitalLetterToSegmentMap[character - 'A'];
case '0' ... '9': case '0' ... '9':
return digitToSegmentSet[character - '0']; return digitToSegmentMap[character - '0'];
} }
return 0; return 0;
} }
@@ -65,11 +65,11 @@ void LedDisplay_SetText(uint8_t length, const char* text)
switch (length) { switch (length) {
case 3: case 3:
allSegmentSets = (uint64_t)characterToSegmentSet(text[2]) << 28; allSegmentSets = (uint64_t)characterToSegmentMap(text[2]) << 28;
case 2: case 2:
allSegmentSets |= characterToSegmentSet(text[1]) << 14; allSegmentSets |= characterToSegmentMap(text[1]) << 14;
case 1: case 1:
allSegmentSets |= characterToSegmentSet(text[0]); allSegmentSets |= characterToSegmentMap(text[0]);
} }
LedDriverValues[LedDriverId_Left][11] = allSegmentSets & 0b00000001 ? AlphanumericSegmentsBrightness : 0; LedDriverValues[LedDriverId_Left][11] = allSegmentSets & 0b00000001 ? AlphanumericSegmentsBrightness : 0;

6
right/src/usb_composite_device.c
View File

@@ -196,8 +196,10 @@ static void ComputerIsSleeping(void) {
} }
void WakeupComputer(bool sendResume) { void WakeupComputer(bool sendResume) {
if (sendResume) // The device should wake up the computer 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); // 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 computerSleeping = false; // The computer is now awake