Merge branch 'user_led_configuration' into infinity60

Conflicts:
	keyboards/infinity60/keymaps/jpetermans/keymap.c

1 files changed, 15 insertions, 12 deletions

diff --git a/keyboards/infinity60/led.c b/keyboards/infinity60/led.c
index e17a5dd0d..53147a78a 100644
--- a/keyboards/infinity60/led.c
+++ b/keyboards/infinity60/led.c
@@ -26,25 +26,28 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * In particular, I2C functions (interrupt-driven) should NOT be called from here.
  */
 void led_set(uint8_t usb_led) {
-/*
-    // PTA5: LED (1:on/0:off)
-    GPIOA->PDDR |= (1<<1);
-    PORTA->PCR[5] |= PORTx_PCRn_DSE | PORTx_PCRn_MUX(1);
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-        GPIOA->PSOR |= (1<<5);
+    msg_t msg;
+
+    if (usb_led & (1<<USB_LED_NUM_LOCK)) {
+        chSysUnconditionalLock();
+        msg=(1 << 8) | TOGGLE_NUM_LOCK;
+        chMBPostI(&led_mailbox, msg);
+        chSysUnconditionalUnlock();
     } else {
-        GPIOA->PCOR |= (1<<5);
+        chSysUnconditionalLock();
+        msg=(0 << 8) | TOGGLE_NUM_LOCK;
+        chMBPostI(&led_mailbox, msg);
+        chSysUnconditionalUnlock();
     }
- */
     if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-        // signal the LED control thread
         chSysUnconditionalLock();
-        chMBPostI(&led_mailbox, LED_MSG_CAPS_ON);
+        msg=(1 << 8) | TOGGLE_CAPS_LOCK;
+        chMBPostI(&led_mailbox, msg);
         chSysUnconditionalUnlock();
     } else {
-        // signal the LED control thread
         chSysUnconditionalLock();
-        chMBPostI(&led_mailbox, LED_MSG_CAPS_OFF);
+        msg=(0 << 8) | TOGGLE_CAPS_LOCK;
+        chMBPostI(&led_mailbox, msg);
         chSysUnconditionalUnlock();
     }
 }