aboutsummaryrefslogtreecommitdiff
path: root/keyboards/jj40
diff options
context:
space:
mode:
authorKenneth Aloysius <krusli@users.noreply.github.com>2018-07-24 02:11:56 +0700
committerDrashna Jaelre <drashna@live.com>2018-07-23 12:11:56 -0700
commitf2bc70a2643bd158eb9910c61b682dafab83d41d (patch)
tree7aaea01088dfbe2cad768a8e9c4257e837383390 /keyboards/jj40
parent4e41812a6761d5b573d4100ef16e3e9cd0442073 (diff)
downloadqmk_firmware-f2bc70a2643bd158eb9910c61b682dafab83d41d.tar.gz
qmk_firmware-f2bc70a2643bd158eb9910c61b682dafab83d41d.zip
ps2avrgb: fix incorrect avr ports specified (for numlock and capslock LEDs) (#3453)
* Add M6-A keymap * Update XD60 keymap * Update XD60 keymap readme * Update JJ40 and Let's Split keymaps * Add readme for M6-A * Fix typo, update JJ40 README * Update jj40 readme * Cleanup jj40 keymap * Revert Let's Split QWERTY layer to default before #2010 * Update numpad layers * Fix: Let's Split keymap getting stuck mods due to having keycodes assigned on the Raise layer * Keep ASCII art consistent with keymap * Staryu: initial port * Add personal keymap * Added and updated READMEs * Fix: default keymap for staryu * Rudimentary backlight support. * Enabled mousekeys for default keymap * use QMK_KEYBOARD_H and LAYOUT * Update readme.md for NIU mini: flash using avrdude * Fix missing linebreaks for Staryu README * Update readme.md * Update PS2AVRGB boards with new matrix.c * Update canoe matrix.c; untested * Fix canoe.c for building (needs matrix_scan_user and matrix_init_user) * Add personal Iris keymap * Update keymap * Update keymap * Update keymap, disable backlighting and underglow * Move PrintScreen button * Add README * Update personal keymaps * Add INS key * Limit USB max power consumption, change Fn to MENU * Remove Numpad layer (easy to accidentally toggle) * Fix backlighting for ps2avrgb * Update comments to refer to actual pin naming * Possible fix for xyverz ortho keymap: define RGBLED_NUM * Make led_set_user in backlight.c overridable * Add changes to address points raised in code review, untested (don't have build env right now)
Diffstat (limited to 'keyboards/jj40')
-rw-r--r--keyboards/jj40/backlight.c9
-rw-r--r--keyboards/jj40/keymaps/krusli/keymap.c35
-rw-r--r--keyboards/jj40/keymaps/krusli/numpad.txt17
-rw-r--r--keyboards/jj40/keymaps/oscillope/backlight.c9
4 files changed, 31 insertions, 39 deletions
diff --git a/keyboards/jj40/backlight.c b/keyboards/jj40/backlight.c
index 079c410ff..fbd241fa9 100644
--- a/keyboards/jj40/backlight.c
+++ b/keyboards/jj40/backlight.c
@@ -17,10 +17,10 @@
17#include <stdio.h> 17#include <stdio.h>
18 18
19// Port D: digital pins of the AVR chipset 19// Port D: digital pins of the AVR chipset
20#define NUMLOCK_PORT (1 << 1) // 1st pin of Port D (digital) 20#define NUMLOCK_PORT (1 << 0) // D0
21#define CAPSLOCK_PORT (1 << 2) // 2nd pin 21#define CAPSLOCK_PORT (1 << 1) // D1
22#define BACKLIGHT_PORT (1 << 4) // 4th pin 22#define BACKLIGHT_PORT (1 << 4) // D4
23#define SCROLLLOCK_PORT (1 << 6) // 6th pin 23#define SCROLLLOCK_PORT (1 << 6) // D6
24 24
25#define TIMER_CLK_DIV64 0x03 ///< Timer clocked at F_CPU/64 25#define TIMER_CLK_DIV64 0x03 ///< Timer clocked at F_CPU/64
26#define TIMER1PRESCALE TIMER_CLK_DIV64 ///< timer 1 prescaler default 26#define TIMER1PRESCALE TIMER_CLK_DIV64 ///< timer 1 prescaler default
@@ -43,6 +43,7 @@ extern backlight_config_t backlight_config;
43 43
44// @Override 44// @Override
45// turn LEDs on and off depending on USB caps/num/scroll lock states. 45// turn LEDs on and off depending on USB caps/num/scroll lock states.
46__attribute__ ((weak))
46void led_set_user(uint8_t usb_led) { 47void led_set_user(uint8_t usb_led) {
47 if (usb_led & (1 << USB_LED_NUM_LOCK)) { 48 if (usb_led & (1 << USB_LED_NUM_LOCK)) {
48 // turn on 49 // turn on
diff --git a/keyboards/jj40/keymaps/krusli/keymap.c b/keyboards/jj40/keymaps/krusli/keymap.c
index 73dd0b287..6fea9d314 100644
--- a/keyboards/jj40/keymaps/krusli/keymap.c
+++ b/keyboards/jj40/keymaps/krusli/keymap.c
@@ -3,7 +3,6 @@
3#define _QWERTY 0 3#define _QWERTY 0
4#define _LOWER 1 4#define _LOWER 1
5#define _RAISE 2 5#define _RAISE 2
6#define _NUMPAD 3
7 6
8enum custom_keycodes { 7enum custom_keycodes {
9 QWERTY = SAFE_RANGE, 8 QWERTY = SAFE_RANGE,
@@ -15,14 +14,6 @@ void matrix_scan_user(void) {
15 // runs at every matrix scan. 14 // runs at every matrix scan.
16} 15}
17 16
18// enum {
19// TD_H_E = 0
20// };
21//
22// qk_tap_dance_action_t tap_dance_actions[] = {
23// [TD_H_E] = ACTION_TAP_DANCE_DOUBLE(KC_HOME, KC_END)
24// };
25
26const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 17const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
27 /* Qwerty 18 /* Qwerty
28 * ,-----------------------------------------------------------------------------------. 19 * ,-----------------------------------------------------------------------------------.
@@ -36,10 +27,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
36 * `-----------------------------------------------------------------------------------' 27 * `-----------------------------------------------------------------------------------'
37 */ 28 */
38 [_QWERTY] = LAYOUT_2U_space( \ 29 [_QWERTY] = LAYOUT_2U_space( \
39 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ 30 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \
40 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ 31 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
41 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \ 32 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \
42 TO(_NUMPAD),KC_LCTL, KC_LGUI, KC_LALT, MO(_LOWER), KC_SPC, MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ 33 _______, KC_LCTL, KC_LGUI, KC_LALT, MO(_LOWER), KC_SPC, MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
43 ), 34 ),
44 35
45 /* Lower 36 /* Lower
@@ -76,23 +67,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
76 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ 67 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \
77 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_END, KC_PGUP, KC_PGDN, _______, \ 68 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_END, KC_PGUP, KC_PGDN, _______, \
78 _______, KC_MRWD, KC_MPLY, KC_MNXT, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ 69 _______, KC_MRWD, KC_MPLY, KC_MNXT, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
79 ),
80
81 /* Numpad
82 * ,-----------------------------------------------------------------------------------.
83 * | Esc | 7 | 8 | 9 | * | / | | | | | | |
84 * |------+------+------+------+------+-------------+------+------+------+------+------|
85 * | <-- | 4 | 5 | 6 | + | - | | | | | | |
86 * |------+------+------+------+------+------|------+------+------+------+------+------|
87 * | | 1 | 2 | 3 |Enter |Enter | | | | | | |
88 * |------+------+------+------+------+------+------+------+------+------+------+------|
89 * |Qwerty| 0 | . | . |Enter |Enter | | | | | |
90 * `-----------------------------------------------------------------------------------'
91 */
92 [_NUMPAD] = LAYOUT_2U_space( \
93 KC_ESC, KC_P7, KC_P8, KC_P9, KC_PAST, KC_PSLS, _______, _______, _______, _______, _______, _______, \
94 KC_BSPC, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_PMNS, _______, _______, _______, _______, _______, _______, \
95 _______, KC_P1, KC_P2, KC_P3, KC_PENT, KC_PENT, _______, _______, _______, _______, _______, _______, \
96 TO(_QWERTY),KC_P0, KC_PDOT, KC_PDOT, KC_PENT, _______, _______, _______, _______, _______, _______ \
97 ) 70 )
98}; 71};
diff --git a/keyboards/jj40/keymaps/krusli/numpad.txt b/keyboards/jj40/keymaps/krusli/numpad.txt
new file mode 100644
index 000000000..8fbdc1829
--- /dev/null
+++ b/keyboards/jj40/keymaps/krusli/numpad.txt
@@ -0,0 +1,17 @@
1/* Numpad
2 * ,-----------------------------------------------------------------------------------.
3 * | Esc | 7 | 8 | 9 | * | / | | | | | | |
4 * |------+------+------+------+------+-------------+------+------+------+------+------|
5 * | <-- | 4 | 5 | 6 | + | - | | | | | | |
6 * |------+------+------+------+------+------|------+------+------+------+------+------|
7 * | | 1 | 2 | 3 |Enter |Enter | | | | | | |
8 * |------+------+------+------+------+------+------+------+------+------+------+------|
9 * |Qwerty| 0 | . | . |Enter |Enter | | | | | |
10 * `-----------------------------------------------------------------------------------'
11 */
12[_NUMPAD] = LAYOUT_2U_space( \
13 KC_ESC, KC_P7, KC_P8, KC_P9, KC_PAST, KC_PSLS, _______, _______, _______, _______, _______, _______, \
14 KC_BSPC, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_PMNS, _______, _______, _______, _______, _______, _______, \
15 _______, KC_P1, KC_P2, KC_P3, KC_PENT, KC_PENT, _______, _______, _______, _______, _______, _______, \
16 TO(_QWERTY),KC_P0, KC_PDOT, KC_PDOT, KC_PENT, _______, _______, _______, _______, _______, _______ \
17)
diff --git a/keyboards/jj40/keymaps/oscillope/backlight.c b/keyboards/jj40/keymaps/oscillope/backlight.c
index a4cb66e0c..14c677cd6 100644
--- a/keyboards/jj40/keymaps/oscillope/backlight.c
+++ b/keyboards/jj40/keymaps/oscillope/backlight.c
@@ -9,10 +9,10 @@
9#include <avr/interrupt.h> 9#include <avr/interrupt.h>
10 10
11// Port D: digital pins of the AVR chipset 11// Port D: digital pins of the AVR chipset
12#define NUMLOCK_PORT (1 << 1) // 1st pin of Port D (digital) 12#define NUMLOCK_PORT (1 << 0) // D0
13#define CAPSLOCK_PORT (1 << 2) // 2nd pin 13#define CAPSLOCK_PORT (1 << 1) // D1
14#define BACKLIGHT_PORT (1 << 4) // 4th pin 14#define BACKLIGHT_PORT (1 << 4) // D4
15#define SCROLLLOCK_PORT (1 << 6) // 6th pin 15#define SCROLLLOCK_PORT (1 << 6) // D6
16 16
17/** 17/**
18 * References 18 * References
@@ -25,6 +25,7 @@
25 25
26// @Override 26// @Override
27// turn LEDs on and off depending on USB caps/num/scroll lock states. 27// turn LEDs on and off depending on USB caps/num/scroll lock states.
28__attribute__ ((weak))
28void led_set_user(uint8_t usb_led) { 29void led_set_user(uint8_t usb_led) {
29/* It appears that these cause the v1 JJ40 PCB to hang. 30/* It appears that these cause the v1 JJ40 PCB to hang.
30 * I haven't looked into why, but I don't have any LEDs on my board anyway. */ 31 * I haven't looked into why, but I don't have any LEDs on my board anyway. */
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-13 16:27:04 +0000