aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpngu <34752364+itspngu@users.noreply.github.com>2020-04-22 14:17:57 +0200
committerGitHub <noreply@github.com>2020-04-22 13:17:57 +0100
commit19bd8aa942519666fa8af298f7b80f6150d268a2 (patch)
tree42a44bfb476d2f671a3d458a22d909e991d39296
parent738c6612ca0c5d0d95195af259abb1b6e3995b9b (diff)
downloadqmk_firmware-19bd8aa942519666fa8af298f7b80f6150d268a2.tar.gz
qmk_firmware-19bd8aa942519666fa8af298f7b80f6150d268a2.zip
idb 60 Bugfixes / Preparations for Open Source Hardware (#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 <git@zvecr.com> * Update idb_60.h * Update idb_60.h * made suggested changes * Update keyboards/idb/idb_60/idb_60.h Co-Authored-By: Joel Challis <git@zvecr.com> Co-authored-by: root <root@DESKTOP-QQ80MAV.localdomain> Co-authored-by: tbrandt <thorben.brandt@dg-cybersicherheit.de> Co-authored-by: Joel Challis <git@zvecr.com>
-rw-r--r--keyboards/idb/idb_60/idb_60.c6
-rw-r--r--keyboards/idb/idb_60/idb_60.h12
-rw-r--r--keyboards/idb/idb_60/keymaps/all_keys/keymap.c8
-rw-r--r--keyboards/idb/idb_60/keymaps/default/keymap.c8
-rw-r--r--keyboards/idb/idb_60/keymaps/pngu/keymap.c12
-rw-r--r--keyboards/idb/idb_60/keymaps/via/keymap.c8
-rw-r--r--keyboards/idb/idb_60/readme.md5
-rw-r--r--keyboards/idb/idb_60/rules.mk1
8 files changed, 28 insertions, 32 deletions
diff --git a/keyboards/idb/idb_60/idb_60.c b/keyboards/idb/idb_60/idb_60.c
index d280f644b..18ce69043 100644
--- a/keyboards/idb/idb_60/idb_60.c
+++ b/keyboards/idb/idb_60/idb_60.c
@@ -1,11 +1,5 @@
1#include "idb_60.h" 1#include "idb_60.h"
2 2
3extern inline void _idb_60_caps_led_on(void);
4extern inline void _idb_60_esc_led_on(void);
5
6extern inline void _idb_60_caps_led_off(void);
7extern inline void _idb_60_esc_led_off(void);
8
9void keyboard_pre_init_kb(void) { 3void keyboard_pre_init_kb(void) {
10 setPinOutput(C4); 4 setPinOutput(C4);
11 setPinOutput(C5); 5 setPinOutput(C5);
diff --git a/keyboards/idb/idb_60/idb_60.h b/keyboards/idb/idb_60/idb_60.h
index c47d6b292..5d61ac464 100644
--- a/keyboards/idb/idb_60/idb_60.h
+++ b/keyboards/idb/idb_60/idb_60.h
@@ -3,21 +3,24 @@
3#include "quantum.h" 3#include "quantum.h"
4 4
5inline void _idb_60_caps_led_on(void) { 5inline void _idb_60_caps_led_on(void) {
6 writePinLow(C5); 6 writePinHigh(C5);
7} 7}
8 8
9inline void _idb_60_esc_led_on(void) { 9inline void _idb_60_fn_led_on(void) {
10 writePinLow(C4); 10 writePinHigh(C4);
11} 11}
12 12
13inline void _idb_60_caps_led_off(void) { 13inline void _idb_60_caps_led_off(void) {
14 writePinLow(C5); 14 writePinLow(C5);
15} 15}
16 16
17inline void _idb_60_esc_led_off(void) { 17inline void _idb_60_fn_led_off(void) {
18 writePinLow(C4); 18 writePinLow(C4);
19} 19}
20 20
21#define _idb_60_esc_led_on _idb_60_fn_led_on
22#define _idb_60_esc_led_off _idb_60_fn_led_off
23
21#define LAYOUT( \ 24#define LAYOUT( \
22 K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07,\ 25 K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07,\
23 K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,\ 26 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) {
57 { K80, K81, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ 60 { K80, K81, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
58 { KC_NO, KC_NO, KC_NO, K93, KC_NO, K95, K96 } \ 61 { KC_NO, KC_NO, KC_NO, K93, KC_NO, K95, K96 } \
59} 62}
60
diff --git a/keyboards/idb/idb_60/keymaps/all_keys/keymap.c b/keyboards/idb/idb_60/keymaps/all_keys/keymap.c
index 9f2ef36a1..2edde98c2 100644
--- 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] = {
37 37
38layer_state_t layer_state_set_user(layer_state_t state) { 38layer_state_t layer_state_set_user(layer_state_t state) {
39 if (layer_state_cmp(state, 1)) { 39 if (layer_state_cmp(state, 1)) {
40 _idb_60_esc_led_on(); 40 _idb_60_fn_led_on();
41 } else { 41 } else {
42 _idb_60_esc_led_off(); 42 _idb_60_fn_led_off();
43 } 43 }
44 44
45 return state; 45 return state;
46} \ No newline at end of file 46}
diff --git a/keyboards/idb/idb_60/keymaps/default/keymap.c b/keyboards/idb/idb_60/keymaps/default/keymap.c
index 22f208caa..1bf25867f 100644
--- 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] = {
37 37
38layer_state_t layer_state_set_user(layer_state_t state) { 38layer_state_t layer_state_set_user(layer_state_t state) {
39 if (layer_state_cmp(state, 1)) { 39 if (layer_state_cmp(state, 1)) {
40 _idb_60_esc_led_on(); 40 _idb_60_fn_led_on();
41 } else { 41 } else {
42 _idb_60_esc_led_off(); 42 _idb_60_fn_led_off();
43 } 43 }
44 44
45 return state; 45 return state;
46} \ No newline at end of file 46}
diff --git a/keyboards/idb/idb_60/keymaps/pngu/keymap.c b/keyboards/idb/idb_60/keymaps/pngu/keymap.c
index de336e5fa..ac0ad10d3 100644
--- 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] = {
6 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, 6 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,
7 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, 7 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,
8 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, 8 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,
9 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, 9 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),
10 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_MENU, MO(1) 10 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_MENU, KC_RGUI
11 ), 11 ),
12 [1] = LAYOUT( 12 [1] = LAYOUT(
13 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, _______, 13 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] = {
30 30
31layer_state_t layer_state_set_user(layer_state_t state) { 31layer_state_t layer_state_set_user(layer_state_t state) {
32 if (layer_state_cmp(state, 1)) { 32 if (layer_state_cmp(state, 1)) {
33 _idb_60_esc_led_on(); 33 _idb_60_fn_led_on();
34 } else { 34 } else {
35 _idb_60_esc_led_off(); 35 _idb_60_fn_led_off();
36 } 36 }
37 37
38 return state; 38 return state;
39} \ No newline at end of file 39}
diff --git a/keyboards/idb/idb_60/keymaps/via/keymap.c b/keyboards/idb/idb_60/keymaps/via/keymap.c
index 22f208caa..1bf25867f 100644
--- 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] = {
37 37
38layer_state_t layer_state_set_user(layer_state_t state) { 38layer_state_t layer_state_set_user(layer_state_t state) {
39 if (layer_state_cmp(state, 1)) { 39 if (layer_state_cmp(state, 1)) {
40 _idb_60_esc_led_on(); 40 _idb_60_fn_led_on();
41 } else { 41 } else {
42 _idb_60_esc_led_off(); 42 _idb_60_fn_led_off();
43 } 43 }
44 44
45 return state; 45 return state;
46} \ No newline at end of file 46}
diff --git a/keyboards/idb/idb_60/readme.md b/keyboards/idb/idb_60/readme.md
index 13a4841b4..bd2f76ae6 100644
--- a/keyboards/idb/idb_60/readme.md
+++ b/keyboards/idb/idb_60/readme.md
@@ -2,9 +2,10 @@
2 2
3Firmware for the idb 60 PCB 3Firmware for the idb 60 PCB
4 4
5* Keyboard Maintainer: [/u/omgitspngu](https://github.com/itspngu) 5* Keyboard Maintainer: [pngu](https://github.com/itspngu)
6* Hardware Supported: idb 60 PCB 6* Hardware Supported: idb 60 PCB
7* Hardware Availability: [/u/omgitspngu](https://www.reddit.com/user/omgitspngu/) 7* Hardware Availability: [Case & PCB Files (CC-by-SA 4.0)](https://github.com/itspngu/idb_60)
8* Project Website: [idb Keyboards ยป 60](https://idb-keyboards.xyz/60)
8 9
9Make example for this keyboard (after setting up your build environment): 10Make example for this keyboard (after setting up your build environment):
10 11
diff --git a/keyboards/idb/idb_60/rules.mk b/keyboards/idb/idb_60/rules.mk
index 289e77f77..7e11d4be7 100644
--- 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
25MIDI_ENABLE = no # MIDI controls 25MIDI_ENABLE = no # MIDI controls
26UNICODE_ENABLE = no # Unicode 26UNICODE_ENABLE = no # Unicode
27BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID 27BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
28DEBOUNCE_TYPE = eager_pk # Eager debounce type