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

Extract getActiveLayer() and remove the static activeLayer variable.

Browse Source
This commit is contained in:
László Monda
2017-07-09 01:54:17 +02:00
parent d3166fb94c
commit 7c290ed372
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
right/src/usb_report_updater.c
View File

@@ -10,7 +10,6 @@
#include "slave_drivers/slave_driver_uhk_module.h"
#include "led_pwm.h"
static uint8_t activeLayer = LAYER_ID_BASE;
static uint8_t mouseWheelDivisorCounter = 0;
static uint8_t mouseSpeedAccelDivisorCounter = 0;
static uint8_t mouseSpeed = 3;
@@ -108,15 +107,9 @@ void processTestAction(key_action_t testAction)
}
}
void UpdateActiveUsbReports()
uint8_t getActiveLayer()
{
bzero(&UsbMouseReport, sizeof(usb_mouse_report_t));
uint8_t basicScancodeIndex = 0;
uint8_t mediaScancodeIndex = 0;
uint8_t systemScancodeIndex = 0;
activeLayer = LAYER_ID_BASE;
uint8_t activeLayer = LAYER_ID_BASE;
for (uint8_t slotId=0; slotId<SLOT_COUNT; slotId++) {
for (uint8_t keyId=0; keyId<MAX_KEY_COUNT_PER_MODULE; keyId++) {
if (CurrentKeyStates[slotId][keyId]) {
@@ -127,6 +120,17 @@ void UpdateActiveUsbReports()
}
}
}
return activeLayer;
}
void UpdateActiveUsbReports()
{
bzero(&UsbMouseReport, sizeof(usb_mouse_report_t));
uint8_t basicScancodeIndex = 0;
uint8_t mediaScancodeIndex = 0;
uint8_t systemScancodeIndex = 0;
uint8_t activeLayer = getActiveLayer();
for (uint8_t slotId=0; slotId<SLOT_COUNT; slotId++) {
for (uint8_t keyId=0; keyId<MAX_KEY_COUNT_PER_MODULE; keyId++) {