idb 60 Bugfixes / Preparations for Open Source Hardware (qmk#8866)

* Added idb 60 keyboard * fixed info.json * implemented revievers' suggested changes * fixed an error * implemented revievers' suggestions * further cleanup * implemented suggested changes * fixed errors * checkout * delete old files * delete old files * preparations for open source hardware files * revert eager debounce mode to default * fix indicator LEDs stuck in "on" mode, rename ESC LED to fn LED (rev 2 PCB will have another LED slot on the right shift FN key) * cleanup * cleanup * lost+found lufa * lost+found lufa * lost+found lufa * lost+found lufa * lost+found lufa * Update keyboards/idb/idb_60/keymaps/pngu/keymap.c Co-Authored-By: Joel Challis <[email protected]> * Update idb_60.h * Update idb_60.h * made suggested changes * Update keyboards/idb/idb_60/idb_60.h Co-Authored-By: Joel Challis <[email protected]> Co-authored-by: root <[email protected]> Co-authored-by: tbrandt <[email protected]> Co-authored-by: Joel Challis <[email protected]>
jakobaa · Jul 7, 2020 · 0a5aa84 · 0a5aa84
1 parent 71e722c
commit 0a5aa84
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 32 deletions.
diff --git a/keyboards/idb/idb_60/idb_60.c b/keyboards/idb/idb_60/idb_60.c
@@ -1,11 +1,5 @@
 #include "idb_60.h"
 
-extern inline void _idb_60_caps_led_on(void);
-extern inline void _idb_60_esc_led_on(void);
-
-extern inline void _idb_60_caps_led_off(void);
-extern inline void _idb_60_esc_led_off(void);
-
 void keyboard_pre_init_kb(void) {
     setPinOutput(C4);
     setPinOutput(C5);

diff --git a/keyboards/idb/idb_60/idb_60.h b/keyboards/idb/idb_60/idb_60.h
@@ -3,21 +3,24 @@
 #include "quantum.h"
 
 inline void _idb_60_caps_led_on(void) {
-    writePinLow(C5);
+    writePinHigh(C5);
 }
 
-inline void _idb_60_esc_led_on(void) {
-    writePinLow(C4);
+inline void _idb_60_fn_led_on(void) {
+    writePinHigh(C4);
 }
 
 inline void _idb_60_caps_led_off(void) {
     writePinLow(C5);
 }
 
-inline void _idb_60_esc_led_off(void) {
+inline void _idb_60_fn_led_off(void) {
     writePinLow(C4);
 }
 
+#define _idb_60_esc_led_on _idb_60_fn_led_on
+#define _idb_60_esc_led_off _idb_60_fn_led_off
+
 #define LAYOUT( \
 	K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07,\
 	K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,\
@@ -57,4 +60,3 @@ inline void _idb_60_esc_led_off(void) {
 	{ K80,   K81,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO         }, \
 	{ KC_NO, KC_NO, KC_NO, K93,   KC_NO, K95,   K96           } \
 }
-
diff --git a/keyboards/idb/idb_60/keymaps/all_keys/keymap.c b/keyboards/idb/idb_60/keymaps/all_keys/keymap.c
@@ -37,10 +37,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 layer_state_t layer_state_set_user(layer_state_t state) {
     if (layer_state_cmp(state, 1)) {
-        _idb_60_esc_led_on();
+        _idb_60_fn_led_on();
     } else {
-        _idb_60_esc_led_off();
+        _idb_60_fn_led_off();
     }
-	
+
 	return state;
-}
+}
diff --git a/keyboards/idb/idb_60/keymaps/default/keymap.c b/keyboards/idb/idb_60/keymaps/default/keymap.c
@@ -37,10 +37,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 layer_state_t layer_state_set_user(layer_state_t state) {
     if (layer_state_cmp(state, 1)) {
-        _idb_60_esc_led_on();
+        _idb_60_fn_led_on();
     } else {
-        _idb_60_esc_led_off();
+        _idb_60_fn_led_off();
     }
-	
+
 	return state;
-}
+}
diff --git a/keyboards/idb/idb_60/keymaps/pngu/keymap.c b/keyboards/idb/idb_60/keymaps/pngu/keymap.c
@@ -6,8 +6,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_NO,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Z,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
     LT(2, KC_CAPS), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-    KC_LSFT, KC_NUBS, KC_Y,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_NO,
-    KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                             KC_RALT, KC_MENU, MO(1)
+    KC_LSFT, KC_NUBS, KC_Y,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+    KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                             KC_RALT, KC_MENU, KC_RGUI
   ),
    [1] = LAYOUT(
 	RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
@@ -30,10 +30,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 layer_state_t layer_state_set_user(layer_state_t state) {
     if (layer_state_cmp(state, 1)) {
-        _idb_60_esc_led_on();
+        _idb_60_fn_led_on();
     } else {
-        _idb_60_esc_led_off();
+        _idb_60_fn_led_off();
     }
-	
+
 	return state;
-}
+}
diff --git a/keyboards/idb/idb_60/keymaps/via/keymap.c b/keyboards/idb/idb_60/keymaps/via/keymap.c
@@ -37,10 +37,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 layer_state_t layer_state_set_user(layer_state_t state) {
     if (layer_state_cmp(state, 1)) {
-        _idb_60_esc_led_on();
+        _idb_60_fn_led_on();
     } else {
-        _idb_60_esc_led_off();
+        _idb_60_fn_led_off();
     }
-	
+
 	return state;
-}
+}
diff --git a/keyboards/idb/idb_60/readme.md b/keyboards/idb/idb_60/readme.md
@@ -2,9 +2,10 @@
 
 Firmware for the idb 60 PCB
 
-* Keyboard Maintainer: [/u/omgitspngu](https://github.com/itspngu)
+* Keyboard Maintainer: [pngu](https://github.com/itspngu)
 * Hardware Supported: idb 60 PCB
-* Hardware Availability: [/u/omgitspngu](https://www.reddit.com/user/omgitspngu/)
+* Hardware Availability: [Case & PCB Files (CC-by-SA 4.0)](https://github.com/itspngu/idb_60)
+* Project Website: [idb Keyboards » 60](https://idb-keyboards.xyz/60)
 
 Make example for this keyboard (after setting up your build environment):
 

diff --git a/keyboards/idb/idb_60/rules.mk b/keyboards/idb/idb_60/rules.mk
@@ -25,4 +25,3 @@ BACKLIGHT_ENABLE = no			# Enable keyboard backlight functionality
 MIDI_ENABLE = no				# MIDI controls
 UNICODE_ENABLE = no				# Unicode
 BLUETOOTH_ENABLE = no			# Enable Bluetooth with the Adafruit EZ-Key HID
-DEBOUNCE_TYPE = eager_pk		# Eager debounce type