Merge remote-tracking branch 'upstream/master' into develop

1 files changed, 9 insertions, 52 deletions

diff --git a/keyboards/handwired/traveller/traveller.c b/keyboards/handwired/traveller/traveller.c
index 9d25341300..409abe7d14 100644
--- a/keyboards/handwired/traveller/traveller.c
+++ b/keyboards/handwired/traveller/traveller.c
@@ -1,61 +1,18 @@
 #include "traveller.h"
 
-__attribute__ ((weak))
-void matrix_init_user(void) {
-        // leave this function blank - it can be defined in a keymap file
-};
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-        // leave this function blank - it can be defined in a keymap file
-}
-
-__attribute__ ((weak))
-void process_action_user(keyrecord_t *record) {
-        // leave this function blank - it can be defined in a keymap file
-}
-
-__attribute__ ((weak))
-void led_set_user(uint8_t usb_led) {
-        // leave this function blank - it can be defined in a keymap file
-}
-
 void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
+    // put your keyboard start-up code here
+    // runs once when the firmware starts up
 
 #ifdef RGBLIGHT_ENABLE
-        rgblight_init();
-        rgblight_mode(1); // solid, no timer
-        rgblight_setrgb(0,20,0);// dim green, happens to be same as _QW
+    rgblight_init();
+    rgblight_mode(1); // solid, no timer
+    rgblight_setrgb(0,20,0);// dim green, happens to be same as _QW
 #endif
 
-// Turn status LED on
-        DDRC |= (1<<7);
-        PORTC |= (1<<7);
+    // Turn status LED on
+    setPinOutput(C7);
+    writePinHigh(C7);
 
-        matrix_init_user();
+    matrix_init_user();
 }
-
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
-
-