Merge pull request #1049 from UltimateHackingKeyboard/fix_hwconfig_order

Fix update order of hardware config stuff.

device/src/main.c

@@ -125,13 +125,9 @@ int main(void) {
 
     }
 
-    if (DEVICE_IS_UHK80_LEFT || DEVICE_IS_UHK80_RIGHT) {
-        Ledmap_InitLedLayout();
-    }
-
-    bt_enable(NULL);
+    bt_enable(NULL); // has to be before InitSettings
 
-    // has to be after bt_enable, has to be before ApplyConfig
+    // has to be after bt_enable; has to be before ApplyConfig
     InitSettings();
 
     // read configurations
@@ -141,6 +137,10 @@ int main(void) {
         Flash_ReadAreaSync(hardwareConfigArea, 0, HardwareConfigBuffer.buffer, HARDWARE_CONFIG_SIZE);
         USB_SetSerialNumber(HardwareConfig->uniqueId);
 
+        if (DEVICE_IS_UHK80_LEFT || DEVICE_IS_UHK80_RIGHT) {
+            Ledmap_InitLedLayout(); // has to be after hwconfig read
+        }
+
         if (DEVICE_IS_UHK80_RIGHT) {
             printk("Reading user config\n");
             Flash_ReadAreaSync(userConfigArea, 0, StagingUserConfigBuffer.buffer, USER_CONFIG_SIZE);