summaryrefslogtreecommitdiffstats
path: root/keyboards/jj40
diff options
context:
space:
mode:
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 @@
#include <stdio.h>
// Port D: digital pins of the AVR chipset
-#define NUMLOCK_PORT (1 << 1) // 1st pin of Port D (digital)
-#define CAPSLOCK_PORT (1 << 2) // 2nd pin
-#define BACKLIGHT_PORT (1 << 4) // 4th pin
-#define SCROLLLOCK_PORT (1 << 6) // 6th pin
+#define NUMLOCK_PORT (1 << 0) // D0
+#define CAPSLOCK_PORT (1 << 1) // D1
+#define BACKLIGHT_PORT (1 << 4) // D4
+#define SCROLLLOCK_PORT (1 << 6) // D6
#define TIMER_CLK_DIV64 0x03 ///< Timer clocked at F_CPU/64
#define TIMER1PRESCALE TIMER_CLK_DIV64 ///< timer 1 prescaler default
@@ -43,6 +43,7 @@ extern backlight_config_t backlight_config;
// @Override
// turn LEDs on and off depending on USB caps/num/scroll lock states.
+__attribute__ ((weak))
void led_set_user(uint8_t usb_led) {
if (usb_led & (1 << USB_LED_NUM_LOCK)) {
// 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 @@
#define _QWERTY 0
#define _LOWER 1
#define _RAISE 2
-#define _NUMPAD 3
enum custom_keycodes {
QWERTY = SAFE_RANGE,
@@ -15,14 +14,6 @@ void matrix_scan_user(void) {
// runs at every matrix scan.
}
-// enum {
-// TD_H_E = 0
-// };
-//
-// qk_tap_dance_action_t tap_dance_actions[] = {
-// [TD_H_E] = ACTION_TAP_DANCE_DOUBLE(KC_HOME, KC_END)
-// };
-
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwerty
* ,-----------------------------------------------------------------------------------.
@@ -36,10 +27,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----------------------------------------------------------------------------------'
*/
[_QWERTY] = LAYOUT_2U_space( \
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \
- KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \
- TO(_NUMPAD),KC_LCTL, KC_LGUI, KC_LALT, MO(_LOWER), KC_SPC, MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \
+ KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \
+ _______, KC_LCTL, KC_LGUI, KC_LALT, MO(_LOWER), KC_SPC, MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
),
/* Lower
@@ -76,23 +67,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \
_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_END, KC_PGUP, KC_PGDN, _______, \
_______, KC_MRWD, KC_MPLY, KC_MNXT, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
- ),
-
- /* Numpad
- * ,-----------------------------------------------------------------------------------.
- * | Esc | 7 | 8 | 9 | * | / | | | | | | |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | <-- | 4 | 5 | 6 | + | - | | | | | | |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | | 1 | 2 | 3 |Enter |Enter | | | | | | |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Qwerty| 0 | . | . |Enter |Enter | | | | | |
- * `-----------------------------------------------------------------------------------'
- */
- [_NUMPAD] = LAYOUT_2U_space( \
- KC_ESC, KC_P7, KC_P8, KC_P9, KC_PAST, KC_PSLS, _______, _______, _______, _______, _______, _______, \
- KC_BSPC, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_PMNS, _______, _______, _______, _______, _______, _______, \
- _______, KC_P1, KC_P2, KC_P3, KC_PENT, KC_PENT, _______, _______, _______, _______, _______, _______, \
- TO(_QWERTY),KC_P0, KC_PDOT, KC_PDOT, KC_PENT, _______, _______, _______, _______, _______, _______ \
)
};
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 @@
+/* Numpad
+ * ,-----------------------------------------------------------------------------------.
+ * | Esc | 7 | 8 | 9 | * | / | | | | | | |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | <-- | 4 | 5 | 6 | + | - | | | | | | |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | | 1 | 2 | 3 |Enter |Enter | | | | | | |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |Qwerty| 0 | . | . |Enter |Enter | | | | | |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_NUMPAD] = LAYOUT_2U_space( \
+ KC_ESC, KC_P7, KC_P8, KC_P9, KC_PAST, KC_PSLS, _______, _______, _______, _______, _______, _______, \
+ KC_BSPC, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_PMNS, _______, _______, _______, _______, _______, _______, \
+ _______, KC_P1, KC_P2, KC_P3, KC_PENT, KC_PENT, _______, _______, _______, _______, _______, _______, \
+ TO(_QWERTY),KC_P0, KC_PDOT, KC_PDOT, KC_PENT, _______, _______, _______, _______, _______, _______ \
+)
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 @@
#include <avr/interrupt.h>
// Port D: digital pins of the AVR chipset
-#define NUMLOCK_PORT (1 << 1) // 1st pin of Port D (digital)
-#define CAPSLOCK_PORT (1 << 2) // 2nd pin
-#define BACKLIGHT_PORT (1 << 4) // 4th pin
-#define SCROLLLOCK_PORT (1 << 6) // 6th pin
+#define NUMLOCK_PORT (1 << 0) // D0
+#define CAPSLOCK_PORT (1 << 1) // D1
+#define BACKLIGHT_PORT (1 << 4) // D4
+#define SCROLLLOCK_PORT (1 << 6) // D6
/**
* References
@@ -25,6 +25,7 @@
// @Override
// turn LEDs on and off depending on USB caps/num/scroll lock states.
+__attribute__ ((weak))
void led_set_user(uint8_t usb_led) {
/* It appears that these cause the v1 JJ40 PCB to hang.
* I haven't looked into why, but I don't have any LEDs on my board anyway. */
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-27 05:30:00 +0100