summaryrefslogtreecommitdiff
path: root/keyboards/input_club/k_type
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/input_club/k_type')
-rw-r--r--keyboards/input_club/k_type/is31fl3733-dual.c52
-rw-r--r--keyboards/input_club/k_type/is31fl3733-dual.h16
-rw-r--r--keyboards/input_club/k_type/k_type-rgbdriver.c21
-rw-r--r--keyboards/input_club/k_type/keymaps/default/keymap.c3
-rw-r--r--keyboards/input_club/k_type/rules.mk2
5 files changed, 47 insertions, 47 deletions
diff --git a/keyboards/input_club/k_type/is31fl3733-dual.c b/keyboards/input_club/k_type/is31fl3733-dual.c
index 3898016875..2dec2b0a26 100644
--- a/keyboards/input_club/k_type/is31fl3733-dual.c
+++ b/keyboards/input_club/k_type/is31fl3733-dual.c
@@ -65,7 +65,7 @@ uint8_t g_twi_transfer_buffer[20];
// The control buffers match the PG0 LED On/Off registers.
// Storing them like this is optimal for I2C transfers to the registers.
// We could optimize this and take out the unused registers from these
-// buffers and the transfers in IS31FL3733_write_pwm_buffer() but it's
+// buffers and the transfers in is31fl3733_write_pwm_buffer() but it's
// probably not worth the extra complexity.
uint8_t g_pwm_buffer[DRIVER_COUNT][192];
bool g_pwm_buffer_update_required[DRIVER_COUNT] = {false};
@@ -73,7 +73,7 @@ bool g_pwm_buffer_update_required[DRIVER_COUNT] = {false};
uint8_t g_led_control_registers[DRIVER_COUNT][24] = {{0}, {0}};
bool g_led_control_registers_update_required[DRIVER_COUNT] = {false};
-bool IS31FL3733_write_register(uint8_t index, uint8_t addr, uint8_t reg, uint8_t data) {
+bool is31fl3733_write_register(uint8_t index, uint8_t addr, uint8_t reg, uint8_t data) {
// If the transaction fails function returns false.
g_twi_transfer_buffer[0] = reg;
g_twi_transfer_buffer[1] = data;
@@ -92,7 +92,7 @@ bool IS31FL3733_write_register(uint8_t index, uint8_t addr, uint8_t reg, uint8_t
return true;
}
-bool IS31FL3733_write_pwm_buffer(uint8_t index, uint8_t addr, uint8_t *pwm_buffer) {
+bool is31fl3733_write_pwm_buffer(uint8_t index, uint8_t addr, uint8_t *pwm_buffer) {
// Assumes PG1 is already selected.
// If any of the transactions fails function returns false.
// Transmit PWM registers in 12 transfers of 16 bytes.
@@ -123,7 +123,7 @@ bool IS31FL3733_write_pwm_buffer(uint8_t index, uint8_t addr, uint8_t *pwm_buffe
return true;
}
-void IS31FL3733_init(uint8_t bus, uint8_t addr, uint8_t sync) {
+void is31fl3733_init(uint8_t bus, uint8_t addr, uint8_t sync) {
// In order to avoid the LEDs being driven with garbage data
// in the LED driver's PWM registers, shutdown is enabled last.
// Set up the mode and other settings, clear the PWM registers,
@@ -131,35 +131,35 @@ void IS31FL3733_init(uint8_t bus, uint8_t addr, uint8_t sync) {
// Sync is passed so set it according to the datasheet.
// Unlock the command register.
- IS31FL3733_write_register(bus, addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+ is31fl3733_write_register(bus, addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
// Select PG0
- IS31FL3733_write_register(bus, addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
+ is31fl3733_write_register(bus, addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
// Turn off all LEDs.
for (int i = 0x00; i <= 0x17; i++) {
- IS31FL3733_write_register(bus, addr, i, 0x00);
+ is31fl3733_write_register(bus, addr, i, 0x00);
}
// Unlock the command register.
- IS31FL3733_write_register(bus, addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+ is31fl3733_write_register(bus, addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
// Select PG1
- IS31FL3733_write_register(bus, addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM);
+ is31fl3733_write_register(bus, addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM);
// Set PWM on all LEDs to 0
// No need to setup Breath registers to PWM as that is the default.
for (int i = 0x00; i <= 0xBF; i++) {
- IS31FL3733_write_register(bus, addr, i, 0x00);
+ is31fl3733_write_register(bus, addr, i, 0x00);
}
// Unlock the command register.
- IS31FL3733_write_register(bus, addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+ is31fl3733_write_register(bus, addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
// Select PG3
- IS31FL3733_write_register(bus, addr, ISSI_COMMANDREGISTER, ISSI_PAGE_FUNCTION);
+ is31fl3733_write_register(bus, addr, ISSI_COMMANDREGISTER, ISSI_PAGE_FUNCTION);
// Set global current to maximum.
- IS31FL3733_write_register(bus, addr, ISSI_REG_GLOBALCURRENT, 0xFF);
+ is31fl3733_write_register(bus, addr, ISSI_REG_GLOBALCURRENT, 0xFF);
// Disable software shutdown.
- IS31FL3733_write_register(bus, addr, ISSI_REG_CONFIGURATION, (sync << 6) | 0x01);
+ is31fl3733_write_register(bus, addr, ISSI_REG_CONFIGURATION, (sync << 6) | 0x01);
// Wait 10ms to ensure the device has woken up.
wait_ms(10);
}
-void IS31FL3733_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
+void is31fl3733_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
if (index >= 0 && index < RGB_MATRIX_LED_COUNT) {
is31_led led = g_is31_leds[index];
@@ -170,13 +170,13 @@ void IS31FL3733_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
}
}
-void IS31FL3733_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
+void is31fl3733_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
- IS31FL3733_set_color(i, red, green, blue);
+ is31fl3733_set_color(i, red, green, blue);
}
}
-void IS31FL3733_set_led_control_register(uint8_t index, bool red, bool green, bool blue) {
+void is31fl3733_set_led_control_register(uint8_t index, bool red, bool green, bool blue) {
is31_led led = g_is31_leds[index];
uint8_t control_register_r = led.r / 8;
@@ -205,28 +205,28 @@ void IS31FL3733_set_led_control_register(uint8_t index, bool red, bool green, bo
g_led_control_registers_update_required[led.driver] = true;
}
-void IS31FL3733_update_pwm_buffers(uint8_t addr, uint8_t index) {
+void is31fl3733_update_pwm_buffers(uint8_t addr, uint8_t index) {
if (g_pwm_buffer_update_required[index]) {
// Firstly we need to unlock the command register and select PG1.
- IS31FL3733_write_register(index, addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
- IS31FL3733_write_register(index, addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM);
+ is31fl3733_write_register(index, addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+ is31fl3733_write_register(index, addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM);
// If any of the transactions fail we risk writing dirty PG0,
// refresh page 0 just in case.
- if (!IS31FL3733_write_pwm_buffer(index, addr, g_pwm_buffer[index])) {
+ if (!is31fl3733_write_pwm_buffer(index, addr, g_pwm_buffer[index])) {
g_led_control_registers_update_required[index] = true;
}
}
g_pwm_buffer_update_required[index] = false;
}
-void IS31FL3733_update_led_control_registers(uint8_t addr, uint8_t index) {
+void is31fl3733_update_led_control_registers(uint8_t addr, uint8_t index) {
if (g_led_control_registers_update_required[index]) {
// Firstly we need to unlock the command register and select PG0
- IS31FL3733_write_register(index, addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
- IS31FL3733_write_register(index, addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
+ is31fl3733_write_register(index, addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+ is31fl3733_write_register(index, addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
for (int i = 0; i < 24; i++) {
- IS31FL3733_write_register(index, addr, i, g_led_control_registers[index][i]);
+ is31fl3733_write_register(index, addr, i, g_led_control_registers[index][i]);
}
}
g_led_control_registers_update_required[index] = false;
diff --git a/keyboards/input_club/k_type/is31fl3733-dual.h b/keyboards/input_club/k_type/is31fl3733-dual.h
index 16586714b8..1becefbf93 100644
--- a/keyboards/input_club/k_type/is31fl3733-dual.h
+++ b/keyboards/input_club/k_type/is31fl3733-dual.h
@@ -31,21 +31,21 @@ typedef struct is31_led {
extern const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT];
-void IS31FL3733_init(uint8_t bus, uint8_t addr, uint8_t sync);
-bool IS31FL3733_write_register(uint8_t index, uint8_t addr, uint8_t reg, uint8_t data);
-bool IS31FL3733_write_pwm_buffer(uint8_t index, uint8_t addr, uint8_t *pwm_buffer);
+void is31fl3733_init(uint8_t bus, uint8_t addr, uint8_t sync);
+bool is31fl3733_write_register(uint8_t index, uint8_t addr, uint8_t reg, uint8_t data);
+bool is31fl3733_write_pwm_buffer(uint8_t index, uint8_t addr, uint8_t *pwm_buffer);
-void IS31FL3733_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
-void IS31FL3733_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
+void is31fl3733_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
+void is31fl3733_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
-void IS31FL3733_set_led_control_register(uint8_t index, bool red, bool green, bool blue);
+void is31fl3733_set_led_control_register(uint8_t index, bool red, bool green, bool blue);
// This should not be called from an interrupt
// (eg. from a timer interrupt).
// Call this while idle (in between matrix scans).
// If the buffer is dirty, it will update the driver with the buffer.
-void IS31FL3733_update_pwm_buffers(uint8_t addr, uint8_t index); // index is the driver index
-void IS31FL3733_update_led_control_registers(uint8_t addr, uint8_t index);
+void is31fl3733_update_pwm_buffers(uint8_t addr, uint8_t index); // index is the driver index
+void is31fl3733_update_led_control_registers(uint8_t addr, uint8_t index);
#define A_1 0x00
#define A_2 0x01
diff --git a/keyboards/input_club/k_type/k_type-rgbdriver.c b/keyboards/input_club/k_type/k_type-rgbdriver.c
index e663c224c4..dc5d4abd67 100644
--- a/keyboards/input_club/k_type/k_type-rgbdriver.c
+++ b/keyboards/input_club/k_type/k_type-rgbdriver.c
@@ -19,39 +19,38 @@
#include "rgb_matrix.h"
#include "i2c_master.h"
#include "is31fl3733-dual.h"
-
-
+#include "gpio.h"
static void init(void) {
i2c_init(&I2CD1, I2C1_SCL_PIN, I2C1_SDA_PIN);
- IS31FL3733_init(0, DRIVER_ADDR_1, 0);
+ is31fl3733_init(0, DRIVER_ADDR_1, 0);
# ifdef USE_I2C2
i2c_init(&I2CD2, I2C2_SCL_PIN, I2C2_SDA_PIN);
- IS31FL3733_init(1, DRIVER_ADDR_2, 0);
+ is31fl3733_init(1, DRIVER_ADDR_2, 0);
# endif
for (int index = 0; index < RGB_MATRIX_LED_COUNT; index++) {
bool enabled = true;
// This only caches it for later
- IS31FL3733_set_led_control_register(index, enabled, enabled, enabled);
+ is31fl3733_set_led_control_register(index, enabled, enabled, enabled);
}
- IS31FL3733_update_led_control_registers(DRIVER_ADDR_1, 0);
+ is31fl3733_update_led_control_registers(DRIVER_ADDR_1, 0);
# ifdef USE_I2C2
- IS31FL3733_update_led_control_registers(DRIVER_ADDR_2, 1);
+ is31fl3733_update_led_control_registers(DRIVER_ADDR_2, 1);
# endif
}
static void flush(void) {
- IS31FL3733_update_pwm_buffers(DRIVER_ADDR_1, 0);
+ is31fl3733_update_pwm_buffers(DRIVER_ADDR_1, 0);
# ifdef USE_I2C2
- IS31FL3733_update_pwm_buffers(DRIVER_ADDR_2, 1);
+ is31fl3733_update_pwm_buffers(DRIVER_ADDR_2, 1);
# endif
}
const rgb_matrix_driver_t rgb_matrix_driver = {
.init = init,
.flush = flush,
- .set_color = IS31FL3733_set_color,
- .set_color_all = IS31FL3733_set_color_all,
+ .set_color = is31fl3733_set_color,
+ .set_color_all = is31fl3733_set_color_all,
};
#endif
diff --git a/keyboards/input_club/k_type/keymaps/default/keymap.c b/keyboards/input_club/k_type/keymaps/default/keymap.c
index 790bd93290..452791b13a 100644
--- a/keyboards/input_club/k_type/keymaps/default/keymap.c
+++ b/keyboards/input_club/k_type/keymaps/default/keymap.c
@@ -1,3 +1,6 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/input_club/k_type/rules.mk b/keyboards/input_club/k_type/rules.mk
index 450eb9a023..d7776bb755 100644
--- a/keyboards/input_club/k_type/rules.mk
+++ b/keyboards/input_club/k_type/rules.mk
@@ -18,5 +18,3 @@ RGB_MATRIX_ENABLE = no
SRC += k_type-rgbdriver.c
QUANTUM_LIB_SRC += i2c_master.c is31fl3733-dual.c
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-04 11:18:38 +0000