Преглед на файлове

Fixed LED Function Calls

Fixed LED indicator function calls to match how the matrix init function
calls are formatted.
IBNobody преди 10 години
родител
ревизия
10491ba21f
променени са 4 файла, в които са добавени 22 реда и са изтрити 34 реда
  1. 9 21
      keyboard/retro_refit/retro_refit.c
  2. 3 3
      keyboard/retro_refit/retro_refit.h
  3. 7 8
      quantum/led.c
  4. 3 2
      tmk_core/common/led.h

+ 9 - 21
keyboard/retro_refit/retro_refit.c

@@ -1,24 +1,21 @@
 #include "retro_refit.h"
 
 __attribute__ ((weak))
-void * matrix_init_user(void) {
+void matrix_init_user(void) {
 	// leave this function blank - it can be defined in a keymap file
-	return NULL;
 };
 
 __attribute__ ((weak))
-void * matrix_scan_user(void) {
+void matrix_scan_user(void) {
 	// leave this function blank - it can be defined in a keymap file
-	return NULL;
 };
 
 __attribute__ ((weak))
-void * led_set_user(uint8_t usb_led) {
+void led_set_user(uint8_t usb_led) {
 	// leave this function blank - it can be defined in a keymap file
-	return NULL;
 };
 
-void * matrix_init_kb(void) {
+void matrix_init_kb(void) {
 	// put your keyboard start-up code here
 	// runs once when the firmware starts up
 	
@@ -26,23 +23,17 @@ void * matrix_init_kb(void) {
 	DDRD |= (1<<6);
 	PORTD |= (1<<6);
 	
-	if (matrix_init_user) {
-		(*matrix_init_user)();
-	}
-	return NULL;
+	matrix_init_user();
 };
 
-void * matrix_scan_kb(void) {
+void amatrix_scan_kb(void) {
     // put your looping keyboard code here
     // runs every cycle (a lot)
 
-	if (matrix_scan_user) {
-		(*matrix_scan_user)();
-	}
-	return NULL;
+	matrix_scan_user();
 };
 
-void * led_set_kb(uint8_t usb_led) {
+void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
     if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
@@ -73,8 +64,5 @@ void * led_set_kb(uint8_t usb_led) {
         PORTC &= ~(1<<6);
     }	
 	
-	if (led_set_user) {
-		(*led_set_user)(usb_led);
-	}
-	return NULL;
+	led_set_user(usb_led);
 };

+ 3 - 3
keyboard/retro_refit/retro_refit.h

@@ -38,8 +38,8 @@
 {	KC_##KA0,	KC_##KA1,	KC_##KA2,	KC_##KA3,	KC_##KA4,	KC_##KA5,	KC_##KA6,	KC_##KA7,	} \
 }
 
-void * matrix_init_user(void);
-void * matrix_scan_user(void);
-void * led_set_user(uint8_t usb_led);
+void matrix_init_user(void);
+void matrix_scan_user(void);
+void led_set_user(uint8_t usb_led);
 
 #endif

+ 7 - 8
quantum/led.c

@@ -16,16 +16,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <avr/io.h>
-#include <stddef.h>
+#include "stdint.h"
 #include "led.h"
 
 __attribute__ ((weak))
-void * led_set_kb(uint8_t usb_led) {
-    return NULL;
+void led_set_kb(uint8_t usb_led) {
+
 };
 
 void led_set(uint8_t usb_led)
 {
+
+	// Example LED Code
+	//
     // // Using PE6 Caps Lock LED
     // if (usb_led & (1<<USB_LED_CAPS_LOCK))
     // {
@@ -40,9 +43,5 @@ void led_set(uint8_t usb_led)
     //     PORTE &= ~(1<<6);
     // }
 
-    if (led_set_kb) {
-        (*led_set_kb)(usb_led);
-    }
-
-    return;
+	led_set_kb(usb_led);
 }

+ 3 - 2
tmk_core/common/led.h

@@ -33,11 +33,12 @@ extern "C" {
 #endif
 
 void led_set(uint8_t usb_led);
-void * led_set_kb(uint8_t usb_led);
 
+/* keyboard-specific LED functionality */
+void led_set_kb(uint8_t usb_led);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif
+#endif