diff options
Diffstat (limited to 'keyboards/mechlovin/adelais')
23 files changed, 228 insertions, 183 deletions
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/keyboard.json index af68bb8457..01232b07e8 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev1/keyboard.json @@ -3,6 +3,15 @@ "usb": { "pid": "0xAEC1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "rgb_matrix": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk deleted file mode 100644 index aad92997d0..0000000000 --- a/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/keyboard.json index fb88cb359d..a8633af5da 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/keyboard.json @@ -3,6 +3,17 @@ "usb": { "pid": "0xAEC2" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "rgblight": true, + "rgb_matrix": true, + "encoder": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk deleted file mode 100644 index e79b2862e6..0000000000 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -RGB_MATRIX_ENABLE = yes -RGBLIGHT_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/keyboard.json index 62acf349c0..628eb404a5 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev3/keyboard.json @@ -3,6 +3,17 @@ "usb": { "pid": "0xAEC3" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "rgblight": true, + "rgb_matrix": true, + "encoder": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk deleted file mode 100644 index e144301381..0000000000 --- a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk +++ /dev/null @@ -1,8 +0,0 @@ -# Build Options -# change yes to no to disable -# -RGB_MATRIX_ENABLE = yes -RGBLIGHT_ENABLE = yes -ENCODER_ENABLE = yes -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration diff --git a/keyboards/mechlovin/adelais/rgb_led/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rules.mk index 8a9bdd433d..18047f12c7 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rules.mk +++ b/keyboards/mechlovin/adelais/rgb_led/rules.mk @@ -1,3 +1 @@ - - -DEFAULT_FOLDER = mechlovin/adelais/rgb_led/rev1
\ No newline at end of file +DEFAULT_FOLDER = mechlovin/adelais/rgb_led/rev1 diff --git a/keyboards/mechlovin/adelais/rules.mk b/keyboards/mechlovin/adelais/rules.mk index 264ea93322..a1d2ba038d 100644 --- a/keyboards/mechlovin/adelais/rules.mk +++ b/keyboards/mechlovin/adelais/rules.mk @@ -1,12 +1 @@ -# 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 = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -AUDIO_ENABLE = no # Audio output - DEFAULT_FOLDER = mechlovin/adelais/standard_led/arm/rev2 diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json index 9a2a280c10..53005dfa33 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json @@ -2,6 +2,16 @@ "usb": { "pid": "0xAD01" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "processor": "STM32F303", "board": "QMK_PROTON_C", "bootloader": "stm32-dfu", diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev2/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev2/rules.mk +++ /dev/null diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev3/keyboard.json index 46907dc7a9..1129500790 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev3/keyboard.json @@ -2,6 +2,17 @@ "usb": { "pid": "0xAD02" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true, + "encoder": true + }, "encoder": { "rotary": [ {"pin_a": "A6", "pin_b": "A5"}, diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev3/rules.mk deleted file mode 100644 index 5af1ba8536..0000000000 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -ENCODER_ENABLE = yes diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/info.json deleted file mode 100644 index cf993be247..0000000000 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/info.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "processor": "STM32F103", - "bootloader": "stm32duino" -} diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json new file mode 100644 index 0000000000..f6b79e35d0 --- /dev/null +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json @@ -0,0 +1,15 @@ +{ + "processor": "STM32F103", + "bootloader": "stm32duino", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true, + "encoder": true + } +} diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk +++ /dev/null diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk index 257dd3bf57..d348ae660f 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk @@ -1,3 +1 @@ -ENCODER_ENABLE = yes - DEFAULT_FOLDER = mechlovin/adelais/standard_led/arm/rev4/stm32f303 diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/info.json deleted file mode 100644 index 774c3dcf31..0000000000 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "processor": "STM32F303", - "board": "QMK_PROTON_C", - "bootloader": "stm32-dfu" -} diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json new file mode 100644 index 0000000000..9e9748fa93 --- /dev/null +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json @@ -0,0 +1,16 @@ +{ + "processor": "STM32F303", + "board": "QMK_PROTON_C", + "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true, + "encoder": true + } +} diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk +++ /dev/null diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json b/keyboards/mechlovin/adelais/standard_led/avr/rev1/keyboard.json index 95aac7b0d4..3758a8f085 100644 --- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json +++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/keyboard.json @@ -3,6 +3,16 @@ "usb": { "pid": "0xAD04" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "backlight": true, + "rgblight": true + }, "encoder": { "rotary": [ {"pin_a": "D3", "pin_b": "D2"}, diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/matrix.c b/keyboards/mechlovin/adelais/standard_led/avr/rev1/matrix.c index 37046790fe..c7807bbc90 100644 --- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/matrix.c +++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/matrix.c @@ -16,13 +16,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <stdint.h> -#include <stdbool.h> #include "wait.h" #include "util.h" #include "matrix.h" #include "debounce.h" -#include "quantum.h" #ifdef DIRECT_PINS static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS; @@ -40,7 +37,7 @@ static void init_pins(void) { for (int col = 0; col < MATRIX_COLS; col++) { pin_t pin = direct_pins[row][col]; if (pin != NO_PIN) { - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } } @@ -53,7 +50,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { pin_t pin = direct_pins[current_row][col_index]; if (pin != NO_PIN) { - current_matrix[current_row] |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index); + current_matrix[current_row] |= gpio_read_pin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index); } } @@ -100,94 +97,94 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) static void select_col(uint8_t col) { switch (col) { case 0: - writePinLow(F4); - writePinLow(F1); - writePinHigh(F0); - writePinHigh(F5); + gpio_write_pin_low(F4); + gpio_write_pin_low(F1); + gpio_write_pin_high(F0); + gpio_write_pin_high(F5); break; case 1: - writePinLow(F4); - writePinHigh(F1); - writePinLow(F0); - writePinHigh(F5); + gpio_write_pin_low(F4); + gpio_write_pin_high(F1); + gpio_write_pin_low(F0); + gpio_write_pin_high(F5); break; case 2: - writePinLow(F4); - writePinHigh(F1); - writePinHigh(F0); - writePinHigh(F5); + gpio_write_pin_low(F4); + gpio_write_pin_high(F1); + gpio_write_pin_high(F0); + gpio_write_pin_high(F5); break; case 3: - writePinHigh(F4); - writePinLow(F1); - writePinLow(F0); - writePinHigh(F5); + gpio_write_pin_high(F4); + gpio_write_pin_low(F1); + gpio_write_pin_low(F0); + gpio_write_pin_high(F5); break; case 4: - writePinHigh(F4); - writePinLow(F1); - writePinHigh(F0); - writePinHigh(F5); + gpio_write_pin_high(F4); + gpio_write_pin_low(F1); + gpio_write_pin_high(F0); + gpio_write_pin_high(F5); break; case 5: - writePinHigh(F4); - writePinHigh(F1); - writePinHigh(F0); - writePinHigh(F5); + gpio_write_pin_high(F4); + gpio_write_pin_high(F1); + gpio_write_pin_high(F0); + gpio_write_pin_high(F5); break; case 6: - writePinHigh(F4); - writePinHigh(F1); - writePinHigh(F0); - writePinHigh(F6); + gpio_write_pin_high(F4); + gpio_write_pin_high(F1); + gpio_write_pin_high(F0); + gpio_write_pin_high(F6); break; case 7: - writePinLow(F4); - writePinLow(F1); - writePinLow(F0); - writePinHigh(F6); + gpio_write_pin_low(F4); + gpio_write_pin_low(F1); + gpio_write_pin_low(F0); + gpio_write_pin_high(F6); break; case 8: - writePinLow(F4); - writePinLow(F1); - writePinHigh(F0); - writePinHigh(F6); + gpio_write_pin_low(F4); + gpio_write_pin_low(F1); + gpio_write_pin_high(F0); + gpio_write_pin_high(F6); break; case 9: - writePinLow(F4); - writePinHigh(F1); - writePinLow(F0); - writePinHigh(F6); + gpio_write_pin_low(F4); + gpio_write_pin_high(F1); + gpio_write_pin_low(F0); + gpio_write_pin_high(F6); break; case 10: - writePinLow(F4); - writePinHigh(F1); - writePinHigh(F0); - writePinHigh(F6); + gpio_write_pin_low(F4); + gpio_write_pin_high(F1); + gpio_write_pin_high(F0); + gpio_write_pin_high(F6); break; case 11: - writePinHigh(F4); - writePinLow(F1); - writePinLow(F0); - writePinHigh(F6); + gpio_write_pin_high(F4); + gpio_write_pin_low(F1); + gpio_write_pin_low(F0); + gpio_write_pin_high(F6); break; case 12: - writePinHigh(F4); - writePinLow(F1); - writePinHigh(F0); - writePinHigh(F6); + gpio_write_pin_high(F4); + gpio_write_pin_low(F1); + gpio_write_pin_high(F0); + gpio_write_pin_high(F6); break; case 13: - writePinHigh(F4); - writePinHigh(F1); - writePinLow(F0); - writePinHigh(F6); + gpio_write_pin_high(F4); + gpio_write_pin_high(F1); + gpio_write_pin_low(F0); + gpio_write_pin_high(F6); break; case 14: - writePinLow(F4); - writePinLow(F1); - writePinLow(F0); - writePinHigh(F5); + gpio_write_pin_low(F4); + gpio_write_pin_low(F1); + gpio_write_pin_low(F0); + gpio_write_pin_high(F5); break; } } @@ -195,94 +192,94 @@ static void select_col(uint8_t col) { static void unselect_col(uint8_t col) { switch (col) { case 0: - writePinHigh(F4); - writePinHigh(F1); - writePinLow(F0); - writePinLow(F5); + gpio_write_pin_high(F4); + gpio_write_pin_high(F1); + gpio_write_pin_low(F0); + gpio_write_pin_low(F5); break; case 1: - writePinHigh(F4); - writePinLow(F1); - writePinHigh(F0); - writePinLow(F5); + gpio_write_pin_high(F4); + gpio_write_pin_low(F1); + gpio_write_pin_high(F0); + gpio_write_pin_low(F5); break; case 2: - writePinHigh(F4); - writePinLow(F1); - writePinLow(F0); - writePinLow(F5); + gpio_write_pin_high(F4); + gpio_write_pin_low(F1); + gpio_write_pin_low(F0); + gpio_write_pin_low(F5); break; case 3: - writePinLow(F4); - writePinHigh(F1); - writePinHigh(F0); - writePinLow(F5); + gpio_write_pin_low(F4); + gpio_write_pin_high(F1); + gpio_write_pin_high(F0); + gpio_write_pin_low(F5); break; case 4: - writePinLow(F4); - writePinHigh(F1); - writePinLow(F0); - writePinLow(F5); + gpio_write_pin_low(F4); + gpio_write_pin_high(F1); + gpio_write_pin_low(F0); + gpio_write_pin_low(F5); break; case 5: - writePinLow(F4); - writePinLow(F1); - writePinLow(F0); - writePinLow(F5); + gpio_write_pin_low(F4); + gpio_write_pin_low(F1); + gpio_write_pin_low(F0); + gpio_write_pin_low(F5); break; case 6: - writePinLow(F4); - writePinLow(F1); - writePinLow(F0); - writePinLow(F6); + gpio_write_pin_low(F4); + gpio_write_pin_low(F1); + gpio_write_pin_low(F0); + gpio_write_pin_low(F6); break; case 7: - writePinHigh(F4); - writePinHigh(F1); - writePinHigh(F0); - writePinLow(F6); + gpio_write_pin_high(F4); + gpio_write_pin_high(F1); + gpio_write_pin_high(F0); + gpio_write_pin_low(F6); break; case 8: - writePinHigh(F4); - writePinHigh(F1); - writePinLow(F0); - writePinLow(F6); + gpio_write_pin_high(F4); + gpio_write_pin_high(F1); + gpio_write_pin_low(F0); + gpio_write_pin_low(F6); break; case 9: - writePinHigh(F4); - writePinLow(F1); - writePinHigh(F0); - writePinLow(F6); + gpio_write_pin_high(F4); + gpio_write_pin_low(F1); + gpio_write_pin_high(F0); + gpio_write_pin_low(F6); break; case 10: - writePinHigh(F4); - writePinLow(F1); - writePinLow(F0); - writePinLow(F6); + gpio_write_pin_high(F4); + gpio_write_pin_low(F1); + gpio_write_pin_low(F0); + gpio_write_pin_low(F6); break; case 11: - writePinLow(F4); - writePinHigh(F1); - writePinHigh(F0); - writePinLow(F6); + gpio_write_pin_low(F4); + gpio_write_pin_high(F1); + gpio_write_pin_high(F0); + gpio_write_pin_low(F6); break; case 12: - writePinLow(F4); - writePinHigh(F1); - writePinLow(F0); - writePinLow(F6); + gpio_write_pin_low(F4); + gpio_write_pin_high(F1); + gpio_write_pin_low(F0); + gpio_write_pin_low(F6); break; case 13: - writePinLow(F4); - writePinLow(F1); - writePinHigh(F0); - writePinLow(F6); + gpio_write_pin_low(F4); + gpio_write_pin_low(F1); + gpio_write_pin_high(F0); + gpio_write_pin_low(F6); break; case 14: - writePinHigh(F4); - writePinHigh(F1); - writePinHigh(F0); - writePinLow(F5); + gpio_write_pin_high(F4); + gpio_write_pin_high(F1); + gpio_write_pin_high(F0); + gpio_write_pin_low(F5); break; } } @@ -290,23 +287,23 @@ static void unselect_col(uint8_t col) { static void unselect_cols(void) { //Demultiplexer - writePinHigh(F0); - writePinHigh(F1); - writePinHigh(F4); - writePinLow(F5); - writePinLow(F6); + gpio_write_pin_high(F0); + gpio_write_pin_high(F1); + gpio_write_pin_high(F4); + gpio_write_pin_low(F5); + gpio_write_pin_low(F6); } static void init_pins(void) { unselect_cols(); for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } - setPinOutput(F0); - setPinOutput(F1); - setPinOutput(F4); - setPinOutput(F5); - setPinOutput(F6); + gpio_set_pin_output(F0); + gpio_set_pin_output(F1); + gpio_set_pin_output(F4); + gpio_set_pin_output(F5); + gpio_set_pin_output(F6); } static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) { @@ -322,7 +319,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) matrix_row_t last_row_value = current_matrix[row_index]; // Check row pin state - if (readPin(row_pins[row_index]) == 0) { + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col); } else { diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk b/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk index c807f2ad09..179d02c3c6 100644 --- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk +++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk @@ -1,7 +1,3 @@ -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow CUSTOM_MATRIX = lite SRC += matrix.c diff --git a/keyboards/mechlovin/adelais/standard_led/rules.mk b/keyboards/mechlovin/adelais/standard_led/rules.mk index 271c6a9179..a1d2ba038d 100644 --- a/keyboards/mechlovin/adelais/standard_led/rules.mk +++ b/keyboards/mechlovin/adelais/standard_led/rules.mk @@ -1,5 +1 @@ - -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow DEFAULT_FOLDER = mechlovin/adelais/standard_led/arm/rev2 |