aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzvecr <git@zvecr.com>2019-04-08 19:35:47 +0100
committerDrashna Jaelre <drashna@live.com>2019-04-08 11:35:47 -0700
commitda9bb590551e4e40552f301852074dffccd2c29d (patch)
tree5d8fd5838f6e2060b7cf66619b40a8f8d5533413
parent15d7c5f0bdfff97d5d7af6d474cc57d66b6bba94 (diff)
downloadqmk_firmware-da9bb590551e4e40552f301852074dffccd2c29d.tar.gz
qmk_firmware-da9bb590551e4e40552f301852074dffccd2c29d.zip
[Keyboard] Refactor jj4x4 to current standards (#5567)
* Refactor 4x4 in line with current ps2avrgb template * Add backlight pwm bodge till #4324 lands * Disable bootmagic lite as it seems to not work on atmega32a/bootloadHID
Diffstat
-rw-r--r--keyboards/jj4x4/backlight.c213
-rw-r--r--keyboards/jj4x4/backlight_custom.h15
-rw-r--r--keyboards/jj4x4/breathing_custom.h140
-rw-r--r--keyboards/jj4x4/config.h25
-rw-r--r--keyboards/jj4x4/i2c.c104
-rw-r--r--keyboards/jj4x4/i2c.h25
-rw-r--r--keyboards/jj4x4/jj4x4.c61
-rw-r--r--keyboards/jj4x4/jj4x4.h10
-rw-r--r--keyboards/jj4x4/keymaps/default/keymap.c89
-rw-r--r--keyboards/jj4x4/rules.mk42
-rw-r--r--keyboards/jj4x4/usbconfig.h4
11 files changed, 122 insertions, 606 deletions
diff --git a/keyboards/jj4x4/backlight.c b/keyboards/jj4x4/backlight.c
deleted file mode 100644
index fbd241fa9..000000000
--- a/keyboards/jj4x4/backlight.c
+++ /dev/null
@@ -1,213 +0,0 @@
1/**
2 * Backlighting code for PS2AVRGB boards (ATMEGA32A)
3 * Kenneth A. (github.com/krusli | krusli.me)
4 */
5
6#include "backlight.h"
7#include "quantum.h"
8
9#include <avr/pgmspace.h>
10#include <avr/interrupt.h>
11
12#include "backlight_custom.h"
13#include "breathing_custom.h"
14
15// DEBUG
16#include <stdlib.h>
17#include <stdio.h>
18
19// Port D: digital pins of the AVR chipset
20#define NUMLOCK_PORT (1 << 0) // D0
21#define CAPSLOCK_PORT (1 << 1) // D1
22#define BACKLIGHT_PORT (1 << 4) // D4
23#define SCROLLLOCK_PORT (1 << 6) // D6
24
25#define TIMER_CLK_DIV64 0x03 ///< Timer clocked at F_CPU/64
26#define TIMER1PRESCALE TIMER_CLK_DIV64 ///< timer 1 prescaler default
27
28#define TIMER_PRESCALE_MASK 0x07 ///< Timer Prescaler Bit-Mask
29
30#define PWM_MAX 0xFF
31#define TIMER_TOP 255 // 8 bit PWM
32
33extern backlight_config_t backlight_config;
34
35/**
36 * References
37 * Port Registers: https://www.arduino.cc/en/Reference/PortManipulation
38 * TCCR1A: https://electronics.stackexchange.com/questions/92350/what-is-the-difference-between-tccr1a-and-tccr1b
39 * Timers: http://www.avrbeginners.net/architecture/timers/timers.html
40 * 16-bit timer setup: http://sculland.com/ATmega168/Interrupts-And-Timers/16-Bit-Timer-Setup/
41 * PS2AVRGB firmware: https://github.com/showjean/ps2avrU/tree/master/firmware
42 */
43
44// @Override
45// turn LEDs on and off depending on USB caps/num/scroll lock states.
46__attribute__ ((weak))
47void led_set_user(uint8_t usb_led) {
48 if (usb_led & (1 << USB_LED_NUM_LOCK)) {
49 // turn on
50 DDRD |= NUMLOCK_PORT;
51 PORTD |= NUMLOCK_PORT;
52 } else {
53 // turn off
54 DDRD &= ~NUMLOCK_PORT;
55 PORTD &= ~NUMLOCK_PORT;
56 }
57
58 if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
59 DDRD |= CAPSLOCK_PORT;
60 PORTD |= CAPSLOCK_PORT;
61 } else {
62 DDRD &= ~CAPSLOCK_PORT;
63 PORTD &= ~CAPSLOCK_PORT;
64 }
65
66 if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
67 DDRD |= SCROLLLOCK_PORT;
68 PORTD |= SCROLLLOCK_PORT;
69 } else {
70 DDRD &= ~SCROLLLOCK_PORT;
71 PORTD &= ~SCROLLLOCK_PORT;
72 }
73}
74
75#ifdef BACKLIGHT_ENABLE
76
77// sets up Timer 1 for 8-bit PWM
78void timer1PWMSetup(void) { // NOTE ONLY CALL THIS ONCE
79 // default 8 bit mode
80 TCCR1A &= ~(1 << 1); // cbi(TCCR1A,PWM11); <- set PWM11 bit to HIGH
81 TCCR1A |= (1 << 0); // sbi(TCCR1A,PWM10); <- set PWM10 bit to LOW
82
83 // clear output compare value A
84 // outb(OCR1AH, 0);
85 // outb(OCR1AL, 0);
86
87 // clear output comparator registers for B
88 OCR1BH = 0; // outb(OCR1BH, 0);
89 OCR1BL = 0; // outb(OCR1BL, 0);
90}
91
92bool is_init = false;
93void timer1Init(void) {
94 // timer1SetPrescaler(TIMER1PRESCALE)
95 // set to DIV/64
96 (TCCR1B) = ((TCCR1B) & ~TIMER_PRESCALE_MASK) | TIMER1PRESCALE;
97
98 // reset TCNT1
99 TCNT1H = 0; // outb(TCNT1H, 0);
100 TCNT1L = 0; // outb(TCNT1L, 0);
101
102 // TOIE1: Timer Overflow Interrupt Enable (Timer 1);
103 TIMSK |= _BV(TOIE1); // sbi(TIMSK, TOIE1);
104
105 is_init = true;
106}
107
108void timer1UnInit(void) {
109 // set prescaler back to NONE
110 (TCCR1B) = ((TCCR1B) & ~TIMER_PRESCALE_MASK) | 0x00; // TIMERRTC_CLK_STOP
111
112 // disable timer overflow interrupt
113 TIMSK &= ~_BV(TOIE1); // overflow bit?
114
115 setPWM(0);
116
117 is_init = false;
118}
119
120
121// handle TCNT1 overflow
122//! Interrupt handler for tcnt1 overflow interrupt
123ISR(TIMER1_OVF_vect, ISR_NOBLOCK)
124{
125 // sei();
126 // handle breathing here
127 #ifdef BACKLIGHT_BREATHING
128 if (is_breathing()) {
129 custom_breathing_handler();
130 }
131 #endif
132
133 // TODO call user defined function
134}
135
136// enable timer 1 PWM
137// timer1PWMBOn()
138void timer1PWMBEnable(void) {
139 // turn on channel B (OC1B) PWM output
140 // set OC1B as non-inverted PWM
141 TCCR1A |= _BV(COM1B1);
142 TCCR1A &= ~_BV(COM1B0);
143}
144
145// disable timer 1 PWM
146// timer1PWMBOff()
147void timer1PWMBDisable(void) {
148 TCCR1A &= ~_BV(COM1B1);
149 TCCR1A &= ~_BV(COM1B0);
150}
151
152void enableBacklight(void) {
153 DDRD |= BACKLIGHT_PORT; // set digital pin 4 as output
154 PORTD |= BACKLIGHT_PORT; // set digital pin 4 to high
155}
156
157void disableBacklight(void) {
158 // DDRD &= ~BACKLIGHT_PORT; // set digital pin 4 as input
159 PORTD &= ~BACKLIGHT_PORT; // set digital pin 4 to low
160}
161
162void startPWM(void) {
163 timer1Init();
164 timer1PWMBEnable();
165 enableBacklight();
166}
167
168void stopPWM(void) {
169 timer1UnInit();
170 disableBacklight();
171 timer1PWMBDisable();
172}
173
174void b_led_init_ports(void) {
175 /* turn backlight on/off depending on user preference */
176 #if BACKLIGHT_ON_STATE == 0
177 // DDRx register: sets the direction of Port D
178 // DDRD &= ~BACKLIGHT_PORT; // set digital pin 4 as input
179 PORTD &= ~BACKLIGHT_PORT; // set digital pin 4 to low
180 #else
181 DDRD |= BACKLIGHT_PORT; // set digital pin 4 as output
182 PORTD |= BACKLIGHT_PORT; // set digital pin 4 to high
183 #endif
184
185 timer1PWMSetup();
186 startPWM();
187
188 #ifdef BACKLIGHT_BREATHING
189 breathing_enable();
190 #endif
191}
192
193void b_led_set(uint8_t level) {
194 if (level > BACKLIGHT_LEVELS) {
195 level = BACKLIGHT_LEVELS;
196 }
197
198 setPWM((int)(TIMER_TOP * (float) level / BACKLIGHT_LEVELS));
199}
200
201// called every matrix scan
202void b_led_task(void) {
203 // do nothing for now
204}
205
206void setPWM(uint16_t xValue) {
207 if (xValue > TIMER_TOP) {
208 xValue = TIMER_TOP;
209 }
210 OCR1B = xValue; // timer1PWMBSet(xValue);
211}
212
213#endif // BACKLIGHT_ENABLE
diff --git a/keyboards/jj4x4/backlight_custom.h b/keyboards/jj4x4/backlight_custom.h
deleted file mode 100644
index 7210be840..000000000
--- a/keyboards/jj4x4/backlight_custom.h
+++ /dev/null
@@ -1,15 +0,0 @@
1/**
2 * Backlighting code for PS2AVRGB boards (ATMEGA32A)
3 * Kenneth A. (github.com/krusli | krusli.me)
4 */
5
6#ifndef BACKLIGHT_CUSTOM_H
7#define BACKLIGHT_CUSTOM_H
8
9#include <avr/pgmspace.h>
10void b_led_init_ports(void);
11void b_led_set(uint8_t level);
12void b_led_task(void);
13void setPWM(uint16_t xValue);
14
15#endif // BACKLIGHT_CUSTOM_H
diff --git a/keyboards/jj4x4/breathing_custom.h b/keyboards/jj4x4/breathing_custom.h
deleted file mode 100644
index 71416b1b4..000000000
--- a/keyboards/jj4x4/breathing_custom.h
+++ /dev/null
@@ -1,140 +0,0 @@
1/**
2 * Breathing effect code for PS2AVRGB boards (ATMEGA32A)
3 * Works in conjunction with `backlight.c`.
4 *
5 * Code adapted from `quantum.c` to register with the existing TIMER1 overflow
6 * handler in `backlight.c` instead of setting up its own timer.
7 * Kenneth A. (github.com/krusli | krusli.me)
8 */
9
10#ifdef BACKLIGHT_ENABLE
11#ifdef BACKLIGHT_BREATHING
12
13#include "backlight_custom.h"
14
15#ifndef BREATHING_PERIOD
16#define BREATHING_PERIOD 6
17#endif
18
19#define breathing_min() do {breathing_counter = 0;} while (0)
20#define breathing_max() do {breathing_counter = breathing_period * 244 / 2;} while (0)
21
22// TODO make this share code with quantum.c
23
24#define BREATHING_NO_HALT 0
25#define BREATHING_HALT_OFF 1
26#define BREATHING_HALT_ON 2
27#define BREATHING_STEPS 128
28
29static uint8_t breathing_period = BREATHING_PERIOD;
30static uint8_t breathing_halt = BREATHING_NO_HALT;
31static uint16_t breathing_counter = 0;
32
33static bool breathing = false;
34
35bool is_breathing(void) {
36 return breathing;
37}
38
39// See http://jared.geek.nz/2013/feb/linear-led-pwm
40static uint16_t cie_lightness(uint16_t v) {
41 if (v <= 5243) // if below 8% of max
42 return v / 9; // same as dividing by 900%
43 else {
44 uint32_t y = (((uint32_t) v + 10486) << 8) / (10486 + 0xFFFFUL); // add 16% of max and compare
45 // to get a useful result with integer division, we shift left in the expression above
46 // and revert what we've done again after squaring.
47 y = y * y * y >> 8;
48 if (y > 0xFFFFUL) // prevent overflow
49 return 0xFFFFU;
50 else
51 return (uint16_t) y;
52 }
53}
54
55void breathing_enable(void) {
56 breathing = true;
57 breathing_counter = 0;
58 breathing_halt = BREATHING_NO_HALT;
59 // interrupt already registered
60}
61
62void breathing_pulse(void) {
63 if (get_backlight_level() == 0)
64 breathing_min();
65 else
66 breathing_max();
67 breathing_halt = BREATHING_HALT_ON;
68 // breathing_interrupt_enable();
69 breathing = true;
70}
71
72void breathing_disable(void) {
73 breathing = false;
74 // backlight_set(get_backlight_level());
75 b_led_set(get_backlight_level()); // custom implementation of backlight_set()
76}
77
78void breathing_self_disable(void)
79{
80 if (get_backlight_level() == 0)
81 breathing_halt = BREATHING_HALT_OFF;
82 else
83 breathing_halt = BREATHING_HALT_ON;
84}
85
86void breathing_toggle(void) {
87 if (is_breathing())
88 breathing_disable();
89 else
90 breathing_enable();
91}
92
93void breathing_period_set(uint8_t value)
94{
95 if (!value)
96 value = 1;
97 breathing_period = value;
98}
99
100void breathing_period_default(void) {
101 breathing_period_set(BREATHING_PERIOD);
102}
103
104void breathing_period_inc(void)
105{
106 breathing_period_set(breathing_period+1);
107}
108
109void breathing_period_dec(void)
110{
111 breathing_period_set(breathing_period-1);
112}
113
114/* To generate breathing curve in python:
115 * from math import sin, pi; [int(sin(x/128.0*pi)**4*255) for x in range(128)]
116 */
117static const uint8_t breathing_table[BREATHING_STEPS] PROGMEM = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 3, 4, 5, 6, 8, 10, 12, 15, 17, 20, 24, 28, 32, 36, 41, 46, 51, 57, 63, 70, 76, 83, 91, 98, 106, 113, 121, 129, 138, 146, 154, 162, 170, 178, 185, 193, 200, 207, 213, 220, 225, 231, 235, 240, 244, 247, 250, 252, 253, 254, 255, 254, 253, 252, 250, 247, 244, 240, 235, 231, 225, 220, 213, 207, 200, 193, 185, 178, 170, 162, 154, 146, 138, 129, 121, 113, 106, 98, 91, 83, 76, 70, 63, 57, 51, 46, 41, 36, 32, 28, 24, 20, 17, 15, 12, 10, 8, 6, 5, 4, 3, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
118
119// Use this before the cie_lightness function.
120static inline uint16_t scale_backlight(uint16_t v) {
121 return v / BACKLIGHT_LEVELS * get_backlight_level();
122}
123
124void custom_breathing_handler(void) {
125 uint16_t interval = (uint16_t) breathing_period * 244 / BREATHING_STEPS;
126 // resetting after one period to prevent ugly reset at overflow.
127 breathing_counter = (breathing_counter + 1) % (breathing_period * 244);
128 uint8_t index = breathing_counter / interval % BREATHING_STEPS;
129
130 if (((breathing_halt == BREATHING_HALT_ON) && (index == BREATHING_STEPS / 2)) ||
131 ((breathing_halt == BREATHING_HALT_OFF) && (index == BREATHING_STEPS - 1)))
132 {
133 // breathing_interrupt_disable();
134 }
135
136 setPWM(cie_lightness(scale_backlight((uint16_t) pgm_read_byte(&breathing_table[index]) * 0x0101U)));
137}
138
139#endif // BACKLIGHT_BREATHING
140#endif // BACKLIGHT_ENABLE
diff --git a/keyboards/jj4x4/config.h b/keyboards/jj4x4/config.h
index 3ecdc06ea..a8df46f01 100644
--- a/keyboards/jj4x4/config.h
+++ b/keyboards/jj4x4/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
19 19
20#include "config_common.h" 20#include "config_common.h"
21 21
22
23#define VENDOR_ID 0x20A0 22#define VENDOR_ID 0x20A0
24#define PRODUCT_ID 0x422D 23#define PRODUCT_ID 0x422D
25// TODO: share these strings with usbconfig.h 24// TODO: share these strings with usbconfig.h
@@ -36,16 +35,24 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
36/* COL2ROW or ROW2COL */ 35/* COL2ROW or ROW2COL */
37#define DIODE_DIRECTION COL2ROW 36#define DIODE_DIRECTION COL2ROW
38 37
38#define BACKLIGHT_PIN D4
39#define BACKLIGHT_LEVELS 12 39#define BACKLIGHT_LEVELS 12
40// #define BACKLIGHT_BREATHING // works, but BL_TOGG might not work 40// #define BACKLIGHT_BREATHING // Requires #4324 to enable hardware pwm for atmega32a
41
42/* RGB underglow */
43// NOTE: for PS2AVRGB boards, underglow commands are sent via I2C to 0xB0.
44#define RGBLED_NUM 4
45#define RGBLIGHT_ANIMATIONS
41 46
42#define TAPPING_TOGGLE 3 47/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
48#define DEBOUNCING_DELAY 5
43 49
44#define NO_UART 1 50#define NO_UART 1
45 51
46/* RGB underglow */ 52/* key combination for magic key command */
47// The RGB_DI_PIN value seems to be shared between all PS2AVRGB boards. 53/* defined by default; to change, uncomment and set to the combination you want */
48// The same pin is used on the JJ40, at least. 54// #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
49#define RGBLED_NUM 5 55
50#define RGB_DI_PIN E2 // NOTE: for PS2AVRGB boards, underglow commands are sent via I2C to 0xB0. 56/* Bootmagic Lite key configuration */
51#define RGBLIGHT_ANIMATIONS 57// #define BOOTMAGIC_LITE_ROW 0
58// #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/jj4x4/i2c.c b/keyboards/jj4x4/i2c.c
deleted file mode 100644
index c27f3e3d1..000000000
--- a/keyboards/jj4x4/i2c.c
+++ /dev/null
@@ -1,104 +0,0 @@
1/*
2Copyright 2016 Luiz Ribeiro <luizribeiro@gmail.com>
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#include <avr/io.h>
19#include <util/twi.h>
20
21#include "i2c.h"
22
23void i2c_set_bitrate(uint16_t bitrate_khz) {
24 uint8_t bitrate_div = ((F_CPU / 1000l) / bitrate_khz);
25 if (bitrate_div >= 16) {
26 bitrate_div = (bitrate_div - 16) / 2;
27 }
28 TWBR = bitrate_div;
29}
30
31void i2c_init(void) {
32 // set pull-up resistors on I2C bus pins
33 PORTC |= 0b11;
34
35 i2c_set_bitrate(400);
36
37 // enable TWI (two-wire interface)
38 TWCR |= (1 << TWEN);
39
40 // enable TWI interrupt and slave address ACK
41 TWCR |= (1 << TWIE);
42 TWCR |= (1 << TWEA);
43}
44
45uint8_t i2c_start(uint8_t address) {
46 // reset TWI control register
47 TWCR = 0;
48
49 // begin transmission and wait for it to end
50 TWCR = (1<<TWINT) | (1<<TWSTA) | (1<<TWEN);
51 while (!(TWCR & (1<<TWINT)));
52
53 // check if the start condition was successfully transmitted
54 if ((TWSR & 0xF8) != TW_START) {
55 return 1;
56 }
57
58 // transmit address and wait
59 TWDR = address;
60 TWCR = (1<<TWINT) | (1<<TWEN);
61 while (!(TWCR & (1<<TWINT)));
62
63 // check if the device has acknowledged the READ / WRITE mode
64 uint8_t twst = TW_STATUS & 0xF8;
65 if ((twst != TW_MT_SLA_ACK) && (twst != TW_MR_SLA_ACK)) {
66 return 1;
67 }
68
69 return 0;
70}
71
72void i2c_stop(void) {
73 TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTO);
74}
75
76uint8_t i2c_write(uint8_t data) {
77 TWDR = data;
78
79 // transmit data and wait
80 TWCR = (1<<TWINT) | (1<<TWEN);
81 while (!(TWCR & (1<<TWINT)));
82
83 if ((TWSR & 0xF8) != TW_MT_DATA_ACK) {
84 return 1;
85 }
86
87 return 0;
88}
89
90uint8_t i2c_send(uint8_t address, uint8_t *data, uint16_t length) {
91 if (i2c_start(address)) {
92 return 1;
93 }
94
95 for (uint16_t i = 0; i < length; i++) {
96 if (i2c_write(data[i])) {
97 return 1;
98 }
99 }
100
101 i2c_stop();
102
103 return 0;
104}
diff --git a/keyboards/jj4x4/i2c.h b/keyboards/jj4x4/i2c.h
deleted file mode 100644
index 27c9d3d05..000000000
--- a/keyboards/jj4x4/i2c.h
+++ /dev/null
@@ -1,25 +0,0 @@
1/*
2Copyright 2016 Luiz Ribeiro <luizribeiro@gmail.com>
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#ifndef __I2C_H__
19#define __I2C_H__
20
21void i2c_init(void);
22void i2c_set_bitrate(uint16_t bitrate_khz);
23uint8_t i2c_send(uint8_t address, uint8_t *data, uint16_t length);
24
25#endif
diff --git a/keyboards/jj4x4/jj4x4.c b/keyboards/jj4x4/jj4x4.c
index 6fbff7afb..265508b2d 100644
--- a/keyboards/jj4x4/jj4x4.c
+++ b/keyboards/jj4x4/jj4x4.c
@@ -18,53 +18,26 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
18 18
19#include "jj4x4.h" 19#include "jj4x4.h"
20 20
21#include <avr/pgmspace.h> 21#ifdef RGBLIGHT_ENABLE
22
23#include "action_layer.h"
24#include "quantum.h"
25 22
26#include "i2c.h" 23#include <string.h>
24#include "i2c_master.h"
25#include "rgblight.h"
27 26
28#include "backlight.h" 27extern rgblight_config_t rgblight_config;
29#include "backlight_custom.h"
30 28
31// for keyboard subdirectory level init functions
32// @Override
33void matrix_init_kb(void) { 29void matrix_init_kb(void) {
30 i2c_init();
34 // call user level keymaps, if any 31 // call user level keymaps, if any
35 matrix_init_user(); 32 matrix_init_user();
36} 33}
37
38#ifdef BACKLIGHT_ENABLE
39/// Overrides functions in `quantum.c`
40void backlight_init_ports(void) {
41 b_led_init_ports();
42}
43
44void backlight_task(void) {
45 b_led_task();
46}
47
48void backlight_set(uint8_t level) {
49 b_led_set(level);
50}
51#endif
52
53#ifdef RGBLIGHT_ENABLE
54extern rgblight_config_t rgblight_config;
55
56// custom RGB driver 34// custom RGB driver
57void rgblight_set(void) { 35void rgblight_set(void) {
58 if (!rgblight_config.enable) { 36 if (!rgblight_config.enable) {
59 for (uint8_t i=0; i<RGBLED_NUM; i++) { 37 memset(led, 0, 3 * RGBLED_NUM);
60 led[i].r = 0;
61 led[i].g = 0;
62 led[i].b = 0;
63 }
64 } 38 }
65 39
66 i2c_init(); 40 i2c_transmit(0xb0, (uint8_t*)led, 3 * RGBLED_NUM, 100);
67 i2c_send(0xb0, (uint8_t*)led, 3 * RGBLED_NUM);
68} 41}
69 42
70bool rgb_init = false; 43bool rgb_init = false;
@@ -72,26 +45,12 @@ bool rgb_init = false;
72void matrix_scan_kb(void) { 45void matrix_scan_kb(void) {
73 // if LEDs were previously on before poweroff, turn them back on 46 // if LEDs were previously on before poweroff, turn them back on
74 if (rgb_init == false && rgblight_config.enable) { 47 if (rgb_init == false && rgblight_config.enable) {
75 i2c_init(); 48 i2c_transmit(0xb0, (uint8_t*)led, 3 * RGBLED_NUM, 100);
76 i2c_send(0xb0, (uint8_t*)led, 3 * RGBLED_NUM);
77 rgb_init = true; 49 rgb_init = true;
78 } 50 }
79 51
80 rgblight_task(); 52 rgblight_task();
81#else
82void matrix_scan_kb(void) {
83#endif
84 matrix_scan_user(); 53 matrix_scan_user();
85 /* Nothing else for now. */
86}
87
88__attribute__((weak)) // overridable
89void matrix_init_user(void) {
90
91} 54}
92 55
93 56#endif
94__attribute__((weak)) // overridable
95void matrix_scan_user(void) {
96
97}
diff --git a/keyboards/jj4x4/jj4x4.h b/keyboards/jj4x4/jj4x4.h
index 5a24b9033..7b8cb8183 100644
--- a/keyboards/jj4x4/jj4x4.h
+++ b/keyboards/jj4x4/jj4x4.h
@@ -19,8 +19,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
19 19
20#include "quantum.h" 20#include "quantum.h"
21 21
22void matrix_init_user(void); // TODO port this to other PS2AVRGB boards 22/* This a shortcut to help you visually see your layout.
23 23 *
24 * The first section contains all of the arguments representing the physical
25 * layout of the board and position of the keys.
26 *
27 * The second converts the arguments into a two-dimensional array which
28 * represents the switch matrix.
29 */
24#define LAYOUT_ortho_4x4( \ 30#define LAYOUT_ortho_4x4( \
25 K01, K02, K03, K04, \ 31 K01, K02, K03, K04, \
26 K11, K12, K13, K14, \ 32 K11, K12, K13, K14, \
diff --git a/keyboards/jj4x4/keymaps/default/keymap.c b/keyboards/jj4x4/keymaps/default/keymap.c
index 51d4e7d61..a0b06ee92 100644
--- a/keyboards/jj4x4/keymaps/default/keymap.c
+++ b/keyboards/jj4x4/keymaps/default/keymap.c
@@ -1,34 +1,73 @@
1/* Copyright 2019
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
1#include QMK_KEYBOARD_H 16#include QMK_KEYBOARD_H
2 17
18enum layers {
19 _BASE = 0,
20 _FN1,
21 _FN2,
22};
3 23
4#define _QWERTY 0 24// Defines the keycodes used by our macros in process_record_user
5
6
7enum custom_keycodes { 25enum custom_keycodes {
8 QWERTY = SAFE_RANGE, 26 QMKBEST = SAFE_RANGE,
27 QMKURL
9}; 28};
10 29
11const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 30const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
12/* Qwerty
13 * ,---------------------------.
14 * | A | B | C | D |
15 * +------+------+------+------|
16 * | E | F | G | H |
17 * +------+------+------+------|
18 * | I | J | K | L |
19 * +------+------+------+------|
20 * | M | N | O | P |
21 * ----------------------------'
22 */
23[_QWERTY] = LAYOUT_ortho_4x4( \
24 KC_A, KC_B, KC_C, KC_D, \
25 KC_E, KC_F, KC_G, KC_H, \
26 KC_I, KC_J, KC_K, KC_L, \
27 KC_M, KC_N, KC_O, KC_P \
28),
29};
30 31
31// Loop 32 [_BASE] = LAYOUT_ortho_4x4(
32void matrix_scan_user(void) { 33 KC_PGUP, KC_HOME, KC_UP, KC_END , \
33 // Empty 34 KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, \
35 MO(_FN2), KC_VOLU, KC_MPLY, KC_MPRV, \
36 MO(_FN1), KC_VOLD, KC_MUTE, KC_MNXT \
37 ),
38 [_FN1] = LAYOUT_ortho_4x4(
39 KC_ESC, KC_P7, KC_P8, KC_P9, \
40 KC_TAB, KC_P4, KC_P5, KC_P6, \
41 KC_ENT, KC_P1, KC_P2, KC_P3, \
42 _______, KC_P0, KC_P0, KC_DOT \
43 ),
44 [_FN2] = LAYOUT_ortho_4x4(
45 RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, \
46 RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, \
47 _______, _______, _______, RESET, \
48 BL_STEP, _______, QMKBEST, QMKURL \
49 )
50
34}; 51};
52
53bool process_record_user(uint16_t keycode, keyrecord_t *record) {
54 switch (keycode) {
55 case QMKBEST:
56 if (record->event.pressed) {
57 // when keycode QMKBEST is pressed
58 SEND_STRING("QMK is the best thing ever!");
59 } else {
60 // when keycode QMKBEST is released
61 }
62 break;
63 case QMKURL:
64 if (record->event.pressed) {
65 // when keycode QMKURL is pressed
66 SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER));
67 } else {
68 // when keycode QMKURL is released
69 }
70 break;
71 }
72 return true;
73}
diff --git a/keyboards/jj4x4/rules.mk b/keyboards/jj4x4/rules.mk
index d99aebbd2..3ac2cc043 100644
--- a/keyboards/jj4x4/rules.mk
+++ b/keyboards/jj4x4/rules.mk
@@ -30,27 +30,29 @@ F_CPU = 12000000
30# automatically (+60). See bootloader.mk for all options. 30# automatically (+60). See bootloader.mk for all options.
31BOOTLOADER = bootloadHID 31BOOTLOADER = bootloadHID
32 32
33# build options 33# Build Options
34BOOTMAGIC_ENABLE = no 34# change yes to no to disable
35MOUSEKEY_ENABLE = no 35#
36EXTRAKEY_ENABLE = yes 36BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
37CONSOLE_ENABLE = no 37MOUSEKEY_ENABLE = no # Mouse keys(+4700)
38COMMAND_ENABLE = yes 38EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
39 39CONSOLE_ENABLE = no # Console for debug(+400)
40BACKLIGHT_ENABLE = yes 40COMMAND_ENABLE = no # Commands for debug and configuration
41BACKLIGHT_CUSTOM_DRIVER = yes
42
43RGBLIGHT_ENABLE = yes
44RGBLIGHT_CUSTOM_DRIVER = yes
45
46KEY_LOCK_ENABLE = yes
47
48# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE 41# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
49SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend 42SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
50 43# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
51OPT_DEFS = -DDEBUG_LEVEL=0 44NKRO_ENABLE = no # USB Nkey Rollover
52 45BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default
53SRC = i2c.c backlight.c 46RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
47RGBLIGHT_CUSTOM_DRIVER = yes
48MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config)
49UNICODE_ENABLE = no # Unicode
50BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
51AUDIO_ENABLE = no # Audio output on port C6
52FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
53HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400)
54
55SRC += i2c_master.c
54 56
55# programming options 57# programming options
56PROGRAM_CMD = ./util/atmega32a_program.py $(TARGET).hex 58PROGRAM_CMD = ./util/atmega32a_program.py $(TARGET).hex
diff --git a/keyboards/jj4x4/usbconfig.h b/keyboards/jj4x4/usbconfig.h
index ad97e7f0a..a7653bde8 100644
--- a/keyboards/jj4x4/usbconfig.h
+++ b/keyboards/jj4x4/usbconfig.h
@@ -252,8 +252,8 @@ section at the end of this file).
252 * obdev's free shared VID/PID pair. See the file USB-IDs-for-free.txt for 252 * obdev's free shared VID/PID pair. See the file USB-IDs-for-free.txt for
253 * details. 253 * details.
254 */ 254 */
255#define USB_CFG_DEVICE_NAME 'j', 'j', '4', '0' 255#define USB_CFG_DEVICE_NAME 'j', 'j', '4', 'x', '4'
256#define USB_CFG_DEVICE_NAME_LEN 4 256#define USB_CFG_DEVICE_NAME_LEN 5
257/* Same as above for the device name. If you don't want a device name, undefine 257/* Same as above for the device name. If you don't want a device name, undefine
258 * the macros. See the file USB-IDs-for-free.txt before you assign a name if 258 * the macros. See the file USB-IDs-for-free.txt before you assign a name if
259 * you use a shared VID/PID. 259 * you use a shared VID/PID.
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-21 23:31:16 +0000