diff options
Diffstat (limited to 'keyboards/cipulot')
-rw-r--r-- | keyboards/cipulot/60xt/keyboard.json (renamed from keyboards/cipulot/60xt/info.json) | 0 | ||||
-rw-r--r-- | keyboards/cipulot/60xt/rules.mk | 0 | ||||
-rw-r--r-- | keyboards/cipulot/chroma/keyboard.json (renamed from keyboards/cipulot/chroma/info.json) | 0 | ||||
-rw-r--r-- | keyboards/cipulot/chroma/rules.mk | 0 | ||||
-rw-r--r-- | keyboards/cipulot/common/ec_board.c | 2 | ||||
-rw-r--r-- | keyboards/cipulot/common/ec_switch_matrix.c | 38 | ||||
-rw-r--r-- | keyboards/cipulot/ec_23u/keyboard.json (renamed from keyboards/cipulot/ec_23u/info.json) | 0 | ||||
-rw-r--r-- | keyboards/cipulot/ec_60/keyboard.json (renamed from keyboards/cipulot/ec_60/info.json) | 0 | ||||
-rw-r--r-- | keyboards/cipulot/ec_660c/keyboard.json (renamed from keyboards/cipulot/ec_660c/info.json) | 0 | ||||
-rw-r--r-- | keyboards/cipulot/ec_980c/keyboard.json (renamed from keyboards/cipulot/ec_980c/info.json) | 0 | ||||
-rw-r--r-- | keyboards/cipulot/ec_alveus/1_0_0/keyboard.json (renamed from keyboards/cipulot/ec_alveus/1_0_0/info.json) | 0 | ||||
-rw-r--r-- | keyboards/cipulot/ec_alveus/1_2_0/keyboard.json (renamed from keyboards/cipulot/ec_alveus/1_2_0/info.json) | 0 | ||||
-rw-r--r-- | keyboards/cipulot/ec_dolice/keyboard.json (renamed from keyboards/cipulot/ec_dolice/info.json) | 0 | ||||
-rw-r--r-- | keyboards/cipulot/ec_menhir/keyboard.json (renamed from keyboards/cipulot/ec_menhir/info.json) | 0 | ||||
-rw-r--r-- | keyboards/cipulot/ec_pro2/keyboard.json (renamed from keyboards/cipulot/ec_pro2/info.json) | 0 | ||||
-rw-r--r-- | keyboards/cipulot/ec_prox/ansi_iso/keyboard.json (renamed from keyboards/cipulot/ec_prox/ansi_iso/info.json) | 0 | ||||
-rw-r--r-- | keyboards/cipulot/ec_prox/jis/keyboard.json (renamed from keyboards/cipulot/ec_prox/jis/info.json) | 0 | ||||
-rw-r--r-- | keyboards/cipulot/ec_theca/keyboard.json (renamed from keyboards/cipulot/ec_theca/info.json) | 0 | ||||
-rw-r--r-- | keyboards/cipulot/ec_tkl/keyboard.json (renamed from keyboards/cipulot/ec_tkl/info.json) | 0 | ||||
-rw-r--r-- | keyboards/cipulot/ec_typeb/keyboard.json (renamed from keyboards/cipulot/ec_typeb/info.json) | 0 | ||||
-rw-r--r-- | keyboards/cipulot/ec_typek/ec_typek.c | 12 | ||||
-rw-r--r-- | keyboards/cipulot/ec_typek/keyboard.json (renamed from keyboards/cipulot/ec_typek/info.json) | 0 | ||||
-rw-r--r-- | keyboards/cipulot/ec_vero/keyboard.json (renamed from keyboards/cipulot/ec_vero/info.json) | 0 | ||||
-rw-r--r-- | keyboards/cipulot/ec_virgo/keyboard.json (renamed from keyboards/cipulot/ec_virgo/info.json) | 0 | ||||
-rw-r--r-- | keyboards/cipulot/kallos/keyboard.json (renamed from keyboards/cipulot/kallos/info.json) | 12 | ||||
-rw-r--r-- | keyboards/cipulot/kallos/rules.mk | 13 | ||||
-rw-r--r-- | keyboards/cipulot/kawayo/keyboard.json (renamed from keyboards/cipulot/kawayo/info.json) | 11 | ||||
-rw-r--r-- | keyboards/cipulot/kawayo/rules.mk | 14 | ||||
-rw-r--r-- | keyboards/cipulot/mnk_60_ec/keyboard.json (renamed from keyboards/cipulot/mnk_60_ec/info.json) | 0 | ||||
-rw-r--r-- | keyboards/cipulot/mnk_65_ec/keyboard.json (renamed from keyboards/cipulot/mnk_65_ec/info.json) | 0 | ||||
-rw-r--r-- | keyboards/cipulot/rf_r1_8_9xu/keyboard.json (renamed from keyboards/cipulot/rf_r1_8_9xu/info.json) | 0 |
31 files changed, 48 insertions, 54 deletions
diff --git a/keyboards/cipulot/60xt/info.json b/keyboards/cipulot/60xt/keyboard.json index 606e6b3363..606e6b3363 100644 --- a/keyboards/cipulot/60xt/info.json +++ b/keyboards/cipulot/60xt/keyboard.json diff --git a/keyboards/cipulot/60xt/rules.mk b/keyboards/cipulot/60xt/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/cipulot/60xt/rules.mk +++ /dev/null diff --git a/keyboards/cipulot/chroma/info.json b/keyboards/cipulot/chroma/keyboard.json index 5d418fdce1..5d418fdce1 100644 --- a/keyboards/cipulot/chroma/info.json +++ b/keyboards/cipulot/chroma/keyboard.json diff --git a/keyboards/cipulot/chroma/rules.mk b/keyboards/cipulot/chroma/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/cipulot/chroma/rules.mk +++ /dev/null diff --git a/keyboards/cipulot/common/ec_board.c b/keyboards/cipulot/common/ec_board.c index 2225d6da63..d9ba197589 100644 --- a/keyboards/cipulot/common/ec_board.c +++ b/keyboards/cipulot/common/ec_board.c @@ -15,7 +15,7 @@ */ #include "ec_switch_matrix.h" -#include "quantum.h" +#include "keyboard.h" void eeconfig_init_kb(void) { // Default values diff --git a/keyboards/cipulot/common/ec_switch_matrix.c b/keyboards/cipulot/common/ec_switch_matrix.c index 845ef99d22..33123bd236 100644 --- a/keyboards/cipulot/common/ec_switch_matrix.c +++ b/keyboards/cipulot/common/ec_switch_matrix.c @@ -54,19 +54,19 @@ static adc_mux adcMux; void init_row(void) { // Set all row pins as output and low for (uint8_t idx = 0; idx < MATRIX_ROWS; idx++) { - setPinOutput(row_pins[idx]); - writePinLow(row_pins[idx]); + gpio_set_pin_output(row_pins[idx]); + gpio_write_pin_low(row_pins[idx]); } } // Initialize the multiplexers void init_amux(void) { for (uint8_t idx = 0; idx < AMUX_COUNT; idx++) { - setPinOutput(amux_en_pins[idx]); - writePinLow(amux_en_pins[idx]); + gpio_set_pin_output(amux_en_pins[idx]); + gpio_write_pin_low(amux_en_pins[idx]); } for (uint8_t idx = 0; idx < AMUX_SEL_PINS_COUNT; idx++) { - setPinOutput(amux_sel_pins[idx]); + gpio_set_pin_output(amux_sel_pins[idx]); } } @@ -75,13 +75,13 @@ void select_amux_channel(uint8_t channel, uint8_t col) { // Get the channel for the specified multiplexer uint8_t ch = amux_n_col_channels[channel][col]; // momentarily disable specified multiplexer - writePinHigh(amux_en_pins[channel]); + gpio_write_pin_high(amux_en_pins[channel]); // Select the multiplexer channel for (uint8_t i = 0; i < AMUX_SEL_PINS_COUNT; i++) { - writePin(amux_sel_pins[i], ch & (1 << i)); + gpio_write_pin(amux_sel_pins[i], ch & (1 << i)); } // re enable specified multiplexer - writePinLow(amux_en_pins[channel]); + gpio_write_pin_low(amux_en_pins[channel]); } // Disable all the unused multiplexers @@ -89,28 +89,28 @@ void disable_unused_amux(uint8_t channel) { // disable all the other multiplexers apart from the current selected one for (uint8_t idx = 0; idx < AMUX_COUNT; idx++) { if (idx != channel) { - writePinHigh(amux_en_pins[idx]); + gpio_write_pin_high(amux_en_pins[idx]); } } } // Discharge the peak hold capacitor void discharge_capacitor(void) { #ifdef OPEN_DRAIN_SUPPORT - writePinLow(DISCHARGE_PIN); + gpio_write_pin_low(DISCHARGE_PIN); #else - writePinLow(DISCHARGE_PIN); - setPinOutput(DISCHARGE_PIN); + gpio_write_pin_low(DISCHARGE_PIN); + gpio_set_pin_output(DISCHARGE_PIN); #endif } // Charge the peak hold capacitor void charge_capacitor(uint8_t row) { #ifdef OPEN_DRAIN_SUPPORT - writePinHigh(DISCHARGE_PIN); + gpio_write_pin_high(DISCHARGE_PIN); #else - setPinInput(DISCHARGE_PIN); + gpio_set_pin_input(DISCHARGE_PIN); #endif - writePinHigh(row_pins[row]); + gpio_write_pin_high(row_pins[row]); } // Initialize the peripherals pins @@ -123,11 +123,11 @@ int ec_init(void) { adc_read(adcMux); // Initialize discharge pin as discharge mode - writePinLow(DISCHARGE_PIN); + gpio_write_pin_low(DISCHARGE_PIN); #ifdef OPEN_DRAIN_SUPPORT - setPinOutputOpenDrain(DISCHARGE_PIN); + gpio_set_pin_output_open_drain(DISCHARGE_PIN); #else - setPinOutput(DISCHARGE_PIN); + gpio_set_pin_output(DISCHARGE_PIN); #endif // Initialize drive lines @@ -212,7 +212,7 @@ uint16_t ec_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) { select_amux_channel(channel, col); // Set the row pin to low state to avoid ghosting - writePinLow(row_pins[row]); + gpio_write_pin_low(row_pins[row]); ATOMIC_BLOCK_FORCEON { // Set the row pin to high state and have capacitor charge diff --git a/keyboards/cipulot/ec_23u/info.json b/keyboards/cipulot/ec_23u/keyboard.json index 17aa5eb6e7..17aa5eb6e7 100644 --- a/keyboards/cipulot/ec_23u/info.json +++ b/keyboards/cipulot/ec_23u/keyboard.json diff --git a/keyboards/cipulot/ec_60/info.json b/keyboards/cipulot/ec_60/keyboard.json index 860594f611..860594f611 100644 --- a/keyboards/cipulot/ec_60/info.json +++ b/keyboards/cipulot/ec_60/keyboard.json diff --git a/keyboards/cipulot/ec_660c/info.json b/keyboards/cipulot/ec_660c/keyboard.json index 32ac397b6b..32ac397b6b 100644 --- a/keyboards/cipulot/ec_660c/info.json +++ b/keyboards/cipulot/ec_660c/keyboard.json diff --git a/keyboards/cipulot/ec_980c/info.json b/keyboards/cipulot/ec_980c/keyboard.json index 6d3cb22719..6d3cb22719 100644 --- a/keyboards/cipulot/ec_980c/info.json +++ b/keyboards/cipulot/ec_980c/keyboard.json diff --git a/keyboards/cipulot/ec_alveus/1_0_0/info.json b/keyboards/cipulot/ec_alveus/1_0_0/keyboard.json index cffd3ade58..cffd3ade58 100644 --- a/keyboards/cipulot/ec_alveus/1_0_0/info.json +++ b/keyboards/cipulot/ec_alveus/1_0_0/keyboard.json diff --git a/keyboards/cipulot/ec_alveus/1_2_0/info.json b/keyboards/cipulot/ec_alveus/1_2_0/keyboard.json index da212f8341..da212f8341 100644 --- a/keyboards/cipulot/ec_alveus/1_2_0/info.json +++ b/keyboards/cipulot/ec_alveus/1_2_0/keyboard.json diff --git a/keyboards/cipulot/ec_dolice/info.json b/keyboards/cipulot/ec_dolice/keyboard.json index e81422e2c5..e81422e2c5 100644 --- a/keyboards/cipulot/ec_dolice/info.json +++ b/keyboards/cipulot/ec_dolice/keyboard.json diff --git a/keyboards/cipulot/ec_menhir/info.json b/keyboards/cipulot/ec_menhir/keyboard.json index 4cc6a84525..4cc6a84525 100644 --- a/keyboards/cipulot/ec_menhir/info.json +++ b/keyboards/cipulot/ec_menhir/keyboard.json diff --git a/keyboards/cipulot/ec_pro2/info.json b/keyboards/cipulot/ec_pro2/keyboard.json index 2e05cff3c1..2e05cff3c1 100644 --- a/keyboards/cipulot/ec_pro2/info.json +++ b/keyboards/cipulot/ec_pro2/keyboard.json diff --git a/keyboards/cipulot/ec_prox/ansi_iso/info.json b/keyboards/cipulot/ec_prox/ansi_iso/keyboard.json index 9a68d8b0bf..9a68d8b0bf 100644 --- a/keyboards/cipulot/ec_prox/ansi_iso/info.json +++ b/keyboards/cipulot/ec_prox/ansi_iso/keyboard.json diff --git a/keyboards/cipulot/ec_prox/jis/info.json b/keyboards/cipulot/ec_prox/jis/keyboard.json index 4c92f8c673..4c92f8c673 100644 --- a/keyboards/cipulot/ec_prox/jis/info.json +++ b/keyboards/cipulot/ec_prox/jis/keyboard.json diff --git a/keyboards/cipulot/ec_theca/info.json b/keyboards/cipulot/ec_theca/keyboard.json index a438e40180..a438e40180 100644 --- a/keyboards/cipulot/ec_theca/info.json +++ b/keyboards/cipulot/ec_theca/keyboard.json diff --git a/keyboards/cipulot/ec_tkl/info.json b/keyboards/cipulot/ec_tkl/keyboard.json index 0c56fb838d..0c56fb838d 100644 --- a/keyboards/cipulot/ec_tkl/info.json +++ b/keyboards/cipulot/ec_tkl/keyboard.json diff --git a/keyboards/cipulot/ec_typeb/info.json b/keyboards/cipulot/ec_typeb/keyboard.json index 2036632af5..2036632af5 100644 --- a/keyboards/cipulot/ec_typeb/info.json +++ b/keyboards/cipulot/ec_typeb/keyboard.json diff --git a/keyboards/cipulot/ec_typek/ec_typek.c b/keyboards/cipulot/ec_typek/ec_typek.c index 035c90303c..7c3874d6b3 100644 --- a/keyboards/cipulot/ec_typek/ec_typek.c +++ b/keyboards/cipulot/ec_typek/ec_typek.c @@ -101,19 +101,19 @@ layer_state_t layer_state_set_user(layer_state_t state) { */ bool indicators_callback(void) { if ((eeprom_ec_config.num.enabled) && (host_keyboard_led_state().num_lock)) - sethsv(eeprom_ec_config.num.h, eeprom_ec_config.num.s, eeprom_ec_config.num.v, (rgb_led_t *)&led[NUM_INDICATOR_INDEX]); + rgblight_sethsv_at(eeprom_ec_config.num.h, eeprom_ec_config.num.s, eeprom_ec_config.num.v, NUM_INDICATOR_INDEX); else - sethsv(0, 0, 0, (rgb_led_t *)&led[NUM_INDICATOR_INDEX]); + rgblight_sethsv_at(0, 0, 0, NUM_INDICATOR_INDEX); if ((eeprom_ec_config.caps.enabled) && (host_keyboard_led_state().caps_lock)) - sethsv(eeprom_ec_config.caps.h, eeprom_ec_config.caps.s, eeprom_ec_config.caps.v, (rgb_led_t *)&led[CAPS_INDICATOR_INDEX]); + rgblight_sethsv_at(eeprom_ec_config.caps.h, eeprom_ec_config.caps.s, eeprom_ec_config.caps.v, CAPS_INDICATOR_INDEX); else - sethsv(0, 0, 0, (rgb_led_t *)&led[CAPS_INDICATOR_INDEX]); + rgblight_sethsv_at(0, 0, 0, CAPS_INDICATOR_INDEX); if ((eeprom_ec_config.scroll.enabled) && (host_keyboard_led_state().scroll_lock)) - sethsv(eeprom_ec_config.scroll.h, eeprom_ec_config.scroll.s, eeprom_ec_config.scroll.v, (rgb_led_t *)&led[SCROLL_INDICATOR_INDEX]); + rgblight_sethsv_at(eeprom_ec_config.scroll.h, eeprom_ec_config.scroll.s, eeprom_ec_config.scroll.v, SCROLL_INDICATOR_INDEX); else - sethsv(0, 0, 0, (rgb_led_t *)&led[SCROLL_INDICATOR_INDEX]); + rgblight_sethsv_at(0, 0, 0, SCROLL_INDICATOR_INDEX); return true; } diff --git a/keyboards/cipulot/ec_typek/info.json b/keyboards/cipulot/ec_typek/keyboard.json index e4642ee555..e4642ee555 100644 --- a/keyboards/cipulot/ec_typek/info.json +++ b/keyboards/cipulot/ec_typek/keyboard.json diff --git a/keyboards/cipulot/ec_vero/info.json b/keyboards/cipulot/ec_vero/keyboard.json index a2cc1e4a07..a2cc1e4a07 100644 --- a/keyboards/cipulot/ec_vero/info.json +++ b/keyboards/cipulot/ec_vero/keyboard.json diff --git a/keyboards/cipulot/ec_virgo/info.json b/keyboards/cipulot/ec_virgo/keyboard.json index 6b37880181..6b37880181 100644 --- a/keyboards/cipulot/ec_virgo/info.json +++ b/keyboards/cipulot/ec_virgo/keyboard.json diff --git a/keyboards/cipulot/kallos/info.json b/keyboards/cipulot/kallos/keyboard.json index 77330c2a66..731b37fda9 100644 --- a/keyboards/cipulot/kallos/info.json +++ b/keyboards/cipulot/kallos/keyboard.json @@ -26,6 +26,18 @@ "ws2812": { "pin": "D0" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F5", "F6", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "F7", "D2", "D1", "B7"], "rows": ["B3", "B2", "F0", "C7", "F4", "F1"] diff --git a/keyboards/cipulot/kallos/rules.mk b/keyboards/cipulot/kallos/rules.mk deleted file mode 100644 index f574845eef..0000000000 --- a/keyboards/cipulot/kallos/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/cipulot/kawayo/info.json b/keyboards/cipulot/kawayo/keyboard.json index 93c362d664..4e235e4e4a 100644 --- a/keyboards/cipulot/kawayo/info.json +++ b/keyboards/cipulot/kawayo/keyboard.json @@ -6,7 +6,10 @@ "usb": { "vid": "0x6369", "pid": "0x6B7F", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "matrix_pins": { "cols": ["B10", "A0", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A4", "A3", "A2", "A1"], @@ -21,6 +24,12 @@ "diode_direction": "COL2ROW", "processor": "STM32F411", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs" }, diff --git a/keyboards/cipulot/kawayo/rules.mk b/keyboards/cipulot/kawayo/rules.mk deleted file mode 100644 index fbab9885cd..0000000000 --- a/keyboards/cipulot/kawayo/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -KEYBOARD_SHARED_EP = yes - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/cipulot/mnk_60_ec/info.json b/keyboards/cipulot/mnk_60_ec/keyboard.json index 802e216f67..802e216f67 100644 --- a/keyboards/cipulot/mnk_60_ec/info.json +++ b/keyboards/cipulot/mnk_60_ec/keyboard.json diff --git a/keyboards/cipulot/mnk_65_ec/info.json b/keyboards/cipulot/mnk_65_ec/keyboard.json index 5427601f76..5427601f76 100644 --- a/keyboards/cipulot/mnk_65_ec/info.json +++ b/keyboards/cipulot/mnk_65_ec/keyboard.json diff --git a/keyboards/cipulot/rf_r1_8_9xu/info.json b/keyboards/cipulot/rf_r1_8_9xu/keyboard.json index 4c1a0e4384..4c1a0e4384 100644 --- a/keyboards/cipulot/rf_r1_8_9xu/info.json +++ b/keyboards/cipulot/rf_r1_8_9xu/keyboard.json |