[Keyboard] LFK78 refactor (#7835)

* Change include guards to pragma once

* Clean up default keymaps

* Remove some magic numbers and use GPIO macros

* Clean up keyboard.[ch]

* Tidy up info.json and readme

* Align config.h with template

* Split up revision code into subfolders

* rev C-H has no audio, apparently

* Change revc_h to revc and document differences

* Turn off Audio on revb for now, for Travis' sake

* Split info.json into revision folders

* Clean up default keymaps some more

1 files changed, 75 insertions, 65 deletions

diff --git a/keyboards/lfkeyboards/lfk78/lfk78.c b/keyboards/lfkeyboards/lfk78/lfk78.c
index 60b7ab4ce0..cf49a5cfd0 100644
--- a/keyboards/lfkeyboards/lfk78/lfk78.c
+++ b/keyboards/lfkeyboards/lfk78/lfk78.c
@@ -1,13 +1,11 @@
-#include <avr/sfr_defs.h>
+#include "lfk78.h"
+
 #include <avr/timer_avr.h>
 #include <avr/wdt.h>
-#include "lfk78.h"
-#include "keymap.h"
+#include <audio/audio.h>
 #include "issi.h"
 #include "TWIlib.h"
 #include "lighting.h"
-#include "debug.h"
-#include <audio/audio.h>
 
 uint16_t click_hz = CLICK_HZ;
 uint16_t click_time = CLICK_MS;
@@ -15,85 +13,91 @@ uint8_t click_toggle = CLICK_ENABLED;
 
 __attribute__((weak))
 const Layer_Info layer_info[] = {
-  // Layer     Mask           Red     Green   Blue
-  {0x00000000, 0xFFFFFFFF, {0x0000, 0x0FFF, 0x0000}}, // base layer - green
-  {0x00000002, 0xFFFFFFFE, {0x0000, 0x0000, 0x0FFF}}, // function layer - blue
-  {0x00000004, 0xFFFFFFFC, {0x0FFF, 0x0000, 0x0FFF}}, // settings layer - magenta
-  {0xFFFFFFFF, 0xFFFFFFFF, {0x0FFF, 0x0FFF, 0x0FFF}}, // unknown layer - REQUIRED - white
+    // Layer      Mask          Red     Green   Blue
+    { 0x00000000, 0xFFFFFFFF, { 0x0000, 0x0FFF, 0x0000 } }, // base layer - green
+    { 0x00000002, 0xFFFFFFFE, { 0x0000, 0x0000, 0x0FFF } }, // function layer - blue
+    { 0x00000004, 0xFFFFFFFC, { 0x0FFF, 0x0000, 0x0FFF } }, // settings layer - magenta
+    { 0xFFFFFFFF, 0xFFFFFFFF, { 0x0FFF, 0x0FFF, 0x0FFF } }  // unknown layer - REQUIRED - white
 };
 
-void matrix_init_kb(void)
-{
+void matrix_init_kb(void) {
     matrix_init_user();
 
     // Configure the Layer LED
-    // Set up 16 bit PWM: Fast PWM, mode 15, inverted
-    TCCR1A = 0b11111110;
-    TCCR1B = 0b00011001;
+    // Set up 16 bit PWM: Fast PWM, mode 14, inverted
+    TCCR1A = _BV(COM1A1) | _BV(COM1A0) | _BV(COM1B1) | _BV(COM1B0) | _BV(COM1C1) | _BV(COM1C0) | _BV(WGM11);
+    TCCR1B = _BV(WGM13) | _BV(WGM12) | _BV(CS10);
     ICR1 = 0xFFFF;
     // PWM values - 0xFFFF = off, 0x0000 = max
-    OCR1C = 0x0000; // B7 - Blue
-    OCR1B = 0x0000; // B6 - Green
     OCR1A = 0x0FFF; // B5 - Red
+    OCR1B = 0x0000; // B6 - Green
+    OCR1C = 0x0000; // B7 - Blue
     // Set as output
-    DDRB |= 0b11100000;
+    setPinOutput(B5);
+    setPinOutput(B6);
+    setPinOutput(B7);
 
 #ifndef AUDIO_ENABLE
     // If we're not using the audio pin, drive it low
-    sbi(DDRC, 6);
-    cbi(PORTC, 6);
+    setPinOutput(C6);
+    writePinLow(C6);
 #endif
 
 #ifdef ISSI_ENABLE
     issi_init();
 #endif
+
 #ifdef WATCHDOG_ENABLE
     // This is done after turning the layer LED red, if we're caught in a loop
     // we should get a flashing red light
     wdt_enable(WDTO_500MS);
 #endif
-
 }
 
-void matrix_scan_kb(void)
-{
+void matrix_scan_kb(void) {
 #ifdef WATCHDOG_ENABLE
     wdt_reset();
 #endif
+
 #ifdef ISSI_ENABLE
     // switch/underglow lighting update
     static uint32_t issi_device = 0;
     static uint32_t twi_last_ready = 0;
-    if(twi_last_ready > 1000){
-        // Its been way too long since the last ISSI update, reset the I2C bus and start again
+
+    if (twi_last_ready > 1000) {
+        // It's been way too long since the last ISSI update, reset the I2C bus and start again
         dprintf("TWI failed to recover, TWI re-init\n");
         twi_last_ready = 0;
         TWIInit();
         force_issi_refresh();
     }
-    if(isTWIReady()){
+
+    if (isTWIReady()) {
         twi_last_ready = 0;
         // If the i2c bus is available, kick off the issi update, alternate between devices
         update_issi(issi_device, issi_device);
-        if(issi_device){
+
+        if (issi_device) {
             issi_device = 0;
-        }else{
+        } else {
             issi_device = 3;
         }
-    }else{
+    } else {
         twi_last_ready++;
     }
 #endif
+
     // Update layer indicator LED
     //
     // Not sure how else to reliably do this... TMK has the 'hook_layer_change'
     // but can't find QMK equiv
     static uint32_t layer_indicator = -1;
-    if(layer_indicator != layer_state){
-        for(uint32_t i=0;; i++){
+
+    if (layer_indicator != layer_state) {
+        for (uint32_t i = 0; ; i++) {
             // the layer_info list should end with layer 0xFFFFFFFF
             // it will break this out of the loop and define the unknown layer color
-            if((layer_info[i].layer == (layer_state & layer_info[i].mask)) || (layer_info[i].layer == 0xFFFFFFFF)){
+            if ((layer_info[i].layer == (layer_state & layer_info[i].mask)) || (layer_info[i].layer == 0xFFFFFFFF)) {
                 OCR1A = layer_info[i].color.red;
                 OCR1B = layer_info[i].color.green;
                 OCR1C = layer_info[i].color.blue;
@@ -102,14 +106,15 @@ void matrix_scan_kb(void)
             }
         }
     }
+
     matrix_scan_user();
 }
 
-void click(uint16_t freq, uint16_t duration){
+void click(uint16_t freq, uint16_t duration) {
 #ifdef AUDIO_ENABLE
-    if(freq >= 100 && freq <= 20000 && duration < 100){
+    if (freq >= 100 && freq <= 20000 && duration < 100) {
         play_note(freq, 10);
-        for (uint16_t i = 0; i < duration; i++){
+        for (uint16_t i = 0; i < duration; i++) {
             _delay_ms(1);
         }
         stop_all_notes();
@@ -117,35 +122,37 @@ void click(uint16_t freq, uint16_t duration){
 #endif
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t* record)
-{
-    if (click_toggle && record->event.pressed){
+bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
+    if (click_toggle && record->event.pressed) {
         click(click_hz, click_time);
     }
+
     if (keycode == RESET) {
         reset_keyboard_kb();
-    } else {
     }
+
     return process_record_user(keycode, record);
 }
 
-void action_function(keyrecord_t *event, uint8_t id, uint8_t opt)
-{
+void action_function(keyrecord_t *event, uint8_t id, uint8_t opt) {
 #ifdef AUDIO_ENABLE
     int8_t sign = 1;
 #endif
-    if(id == LFK_ESC_TILDE){
+
+    if (id == LFK_ESC_TILDE) {
         // Send ~ on shift-esc
         void (*method)(uint8_t) = (event->event.pressed) ? &add_key : &del_key;
         uint8_t shifted = get_mods() & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT));
-        if(layer_state == 0){
+
+        if (layer_state == 0) {
             method(shifted ? KC_GRAVE : KC_ESCAPE);
-        }else{
+        } else {
             method(shifted ? KC_ESCAPE : KC_GRAVE);
         }
+
         send_keyboard_report();
-    }else if(event->event.pressed){
-        switch(id){
+    } else if (event->event.pressed) {
+        switch (id) {
             case LFK_SET_DEFAULT_LAYER:
                 // set/save the current base layer to eeprom, falls through to LFK_CLEAR
                 eeconfig_update_default_layer(1UL << opt);
@@ -161,24 +168,24 @@ void action_function(keyrecord_t *event, uint8_t id, uint8_t opt)
 #endif
 #ifdef AUDIO_ENABLE
             case LFK_CLICK_FREQ_LOWER:
-                sign = -1;  // continue to next statement
+                sign = -1; // continue to next statement
             case LFK_CLICK_FREQ_HIGHER:
                 click_hz += sign * 100;
                 click(click_hz, click_time);
                 break;
             case LFK_CLICK_TOGGLE:
-                if(click_toggle){
+                if (click_toggle) {
                     click_toggle = 0;
                     click(4000, 100);
                     click(1000, 100);
-                }else{
+                } else {
                     click_toggle = 1;
                     click(1000, 100);
                     click(4000, 100);
                 }
                 break;
             case LFK_CLICK_TIME_SHORTER:
-                sign = -1;  // continue to next statement
+                sign = -1; // continue to next statement
             case LFK_CLICK_TIME_LONGER:
                 click_time += sign;
                 click(click_hz, click_time);
@@ -194,49 +201,52 @@ void action_function(keyrecord_t *event, uint8_t id, uint8_t opt)
     }
 }
 
-void reset_keyboard_kb(){
+void reset_keyboard_kb() {
 #ifdef WATCHDOG_ENABLE
     MCUSR = 0;
     wdt_disable();
     wdt_reset();
 #endif
+
     OCR1A = 0x0000; // B5 - Red
     OCR1B = 0x0FFF; // B6 - Green
     OCR1C = 0x0FFF; // B7 - Blue
+
     reset_keyboard();
 }
 
-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
 #ifdef ISSI_ENABLE
-#ifdef CAPSLOCK_LED
+#    ifdef CAPSLOCK_LED
     if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
         activateLED(0, 3, 7, 255);
-    }else{
+    } else {
         activateLED(0, 3, 7, 0);
     }
-#endif // CAPSLOCK_LED
+#    endif // CAPSLOCK_LED
 #endif // ISS_ENABLE
+
     led_set_user(usb_led);
 }
 
 // LFK lighting info
-const uint8_t switch_matrices[] = {0, 1};
-const uint8_t rgb_matrices[] = {6, 7};
+const uint8_t switch_matrices[] = { 0, 1 };
+const uint8_t rgb_matrices[] = { 6, 7 };
 const uint8_t rgb_sequence[] = {
     12, 11, 10, 9, 16, 32, 31, 30, 28, 25, 24, 22, 21,
     20, 19, 18, 17, 1, 2, 3, 4, 5, 6, 7, 8, 14, 13
 };
+
 // Maps switch LEDs from Row/Col to ISSI matrix.
 // Value breakdown:
 //     Bit     | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 |
 //            /    \ ISSI Col  |    ISSI Row   |
 //          matrix idx
-const uint8_t switch_leds[MATRIX_ROWS][MATRIX_COLS] =
-LAYOUT(
-  0x19, 0x18,   0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x99, 0x98, 0x97, 0x96, 0x95, 0x94,   0x93,   0x92, 0x91,
-  0x29, 0x28,    0x27,  0x26, 0x25, 0x24, 0x23, 0x22, 0x21, 0xA9, 0xA8, 0xA7, 0xA6, 0xA5, 0xA4, 0xA3,   0xA2, 0xA1,
-  0x39, 0x38,      0x37,  0x36, 0x35, 0x34, 0x33, 0x32, 0x31, 0xB9, 0xB8, 0xB7, 0xB6, 0xB5,     0xB3,
-  0x49, 0x48,    0x47,     0x45, 0x44, 0x43, 0x42, 0x41, 0xC9, 0xC8, 0xC7, 0xC6, 0xC5,          0xC4,   0xC2,
-  0x59, 0x58,   0x57,  0x56,  0x55,             0x51,                   0xD6, 0xE5, 0xE4,         0xE3, 0xE2, 0xE1);
+const uint8_t switch_leds[MATRIX_ROWS][MATRIX_COLS] = LAYOUT(
+    0x19, 0x18,   0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x99, 0x98, 0x97, 0x96, 0x95, 0x94,   0x93,   0x92, 0x91,
+    0x29, 0x28,    0x27,  0x26, 0x25, 0x24, 0x23, 0x22, 0x21, 0xA9, 0xA8, 0xA7, 0xA6, 0xA5, 0xA4, 0xA3,   0xA2, 0xA1,
+    0x39, 0x38,      0x37,  0x36, 0x35, 0x34, 0x33, 0x32, 0x31, 0xB9, 0xB8, 0xB7, 0xB6, 0xB5,     0xB3,
+    0x49, 0x48,    0x47,     0x45, 0x44, 0x43, 0x42, 0x41, 0xC9, 0xC8, 0xC7, 0xC6, 0xC5,          0xC4,   0xC2,
+    0x59, 0x58,   0x57,  0x56,  0x55,             0x51,                   0xD6, 0xE5, 0xE4,         0xE3, 0xE2, 0xE1
+);