aboutsummaryrefslogtreecommitdiff
path: root/keyboards/mechlovin/olly
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/mechlovin/olly')
-rw-r--r--keyboards/mechlovin/olly/bb/bb.c20
-rw-r--r--keyboards/mechlovin/olly/bb/keyboard.json (renamed from keyboards/mechlovin/olly/bb/info.json)7
-rw-r--r--keyboards/mechlovin/olly/bb/matrix.c304
-rw-r--r--keyboards/mechlovin/olly/bb/rules.mk13
-rw-r--r--keyboards/mechlovin/olly/jf/info.json9
-rw-r--r--keyboards/mechlovin/olly/jf/rev1/keyboard.json (renamed from keyboards/mechlovin/olly/jf/rev1/info.json)6
-rw-r--r--keyboards/mechlovin/olly/jf/rev1/matrix.c323
-rw-r--r--keyboards/mechlovin/olly/jf/rev1/rev1.c26
-rw-r--r--keyboards/mechlovin/olly/jf/rev2/keyboard.json (renamed from keyboards/mechlovin/olly/jf/rev2/info.json)10
-rw-r--r--keyboards/mechlovin/olly/jf/rev2/rules.mk1
-rw-r--r--keyboards/mechlovin/olly/octagon/halconf.h2
-rw-r--r--keyboards/mechlovin/olly/octagon/keyboard.json (renamed from keyboards/mechlovin/olly/octagon/info.json)17
-rw-r--r--keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c9
-rw-r--r--keyboards/mechlovin/olly/octagon/keymaps/default/readme.md1
-rw-r--r--keyboards/mechlovin/olly/octagon/keymaps/via/keymap.c33
-rw-r--r--keyboards/mechlovin/olly/octagon/mcuconf.h1
-rw-r--r--keyboards/mechlovin/olly/octagon/octagon.c53
-rw-r--r--keyboards/mechlovin/olly/octagon/readme.md4
-rw-r--r--keyboards/mechlovin/olly/octagon/rules.mk14
-rw-r--r--keyboards/mechlovin/olly/orion/keyboard.json (renamed from keyboards/mechlovin/olly/orion/info.json)9
-rw-r--r--keyboards/mechlovin/olly/orion/orion.c20
-rw-r--r--keyboards/mechlovin/olly/orion/rules.mk13
22 files changed, 415 insertions, 480 deletions
diff --git a/keyboards/mechlovin/olly/bb/bb.c b/keyboards/mechlovin/olly/bb/bb.c
index dac77ff623..f9dcf211a1 100644
--- a/keyboards/mechlovin/olly/bb/bb.c
+++ b/keyboards/mechlovin/olly/bb/bb.c
@@ -17,19 +17,19 @@
#include "quantum.h"
void led_init_ports(void) {
- setPinOutput(C0);
- setPinOutput(D0);
- setPinOutput(D1);
- setPinOutput(C1);
- setPinOutput(C6);
+ gpio_set_pin_output(C0);
+ gpio_set_pin_output(D0);
+ gpio_set_pin_output(D1);
+ gpio_set_pin_output(C1);
+ gpio_set_pin_output(C6);
}
__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
- writePin(D1, layer_state_cmp(state, 1));
- writePin(D0, layer_state_cmp(state, 2));
- writePin(C1, layer_state_cmp(state, 3));
- writePin(C0, layer_state_cmp(state, 4));
- writePin(C6, layer_state_cmp(state, 5));
+ gpio_write_pin(D1, layer_state_cmp(state, 1));
+ gpio_write_pin(D0, layer_state_cmp(state, 2));
+ gpio_write_pin(C1, layer_state_cmp(state, 3));
+ gpio_write_pin(C0, layer_state_cmp(state, 4));
+ gpio_write_pin(C6, layer_state_cmp(state, 5));
return state;
}
diff --git a/keyboards/mechlovin/olly/bb/info.json b/keyboards/mechlovin/olly/bb/keyboard.json
index fddb893113..ac08e94c3c 100644
--- a/keyboards/mechlovin/olly/bb/info.json
+++ b/keyboards/mechlovin/olly/bb/keyboard.json
@@ -8,6 +8,13 @@
"pid": "0xD181",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "backlight": true,
+ "rgblight": true
+ },
"backlight": {
"pin": "D4",
"breathing": true
diff --git a/keyboards/mechlovin/olly/bb/matrix.c b/keyboards/mechlovin/olly/bb/matrix.c
index e045299bae..ecb6cf9e74 100644
--- a/keyboards/mechlovin/olly/bb/matrix.c
+++ b/keyboards/mechlovin/olly/bb/matrix.c
@@ -67,109 +67,109 @@ static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
static void select_col(uint8_t col) {
switch (col) {
case 0:
- writePinLow(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinHigh(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(B4);
break;
case 1:
- writePinLow(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinHigh(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(B4);
break;
case 2:
- writePinLow(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinHigh(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(B4);
break;
case 3:
- writePinLow(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinHigh(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(B4);
break;
case 4:
- writePinHigh(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinHigh(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(B4);
break;
case 5:
- writePinHigh(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinHigh(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(B4);
break;
case 6:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinHigh(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(B4);
break;
case 7:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinHigh(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(B4);
break;
case 8:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinHigh(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(C7);
break;
case 9:
- writePinLow(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinHigh(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(C7);
break;
case 10:
- writePinLow(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinHigh(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(C7);
break;
case 11:
- writePinLow(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinHigh(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(C7);
break;
case 12:
- writePinLow(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinHigh(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(C7);
break;
case 13:
- writePinHigh(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinHigh(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(C7);
break;
case 14:
- writePinHigh(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinHigh(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(C7);
break;
case 15:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinHigh(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(C7);
break;
case 16:
- writePinLow(C2);
+ gpio_write_pin_low(C2);
break;
case 17:
- writePinLow(C3);
+ gpio_write_pin_low(C3);
break;
case 18:
- writePinLow(C5);
+ gpio_write_pin_low(C5);
break;
}
}
@@ -177,140 +177,140 @@ static void select_col(uint8_t col) {
static void unselect_col(uint8_t col) {
switch (col) {
case 0:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinLow(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(B4);
break;
case 1:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinLow(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(B4);
break;
case 2:
- writePinHigh(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinLow(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(B4);
break;
case 3:
- writePinHigh(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinLow(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(B4);
break;
case 4:
- writePinLow(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinLow(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(B4);
break;
case 5:
- writePinLow(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinLow(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(B4);
break;
case 6:
- writePinLow(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinLow(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(B4);
break;
case 7:
- writePinLow(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinLow(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(B4);
break;
case 8:
- writePinLow(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinLow(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(C7);
break;
case 9:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinLow(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(C7);
break;
case 10:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinLow(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(C7);
break;
case 11:
- writePinHigh(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinLow(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(C7);
break;
case 12:
- writePinHigh(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinLow(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(C7);
break;
case 13:
- writePinLow(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinLow(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(C7);
break;
case 14:
- writePinLow(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinLow(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(C7);
break;
case 15:
- writePinLow(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinLow(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(C7);
break;
case 16:
- writePinHigh(C2);
+ gpio_write_pin_high(C2);
break;
case 17:
- writePinHigh(C3);
+ gpio_write_pin_high(C3);
break;
case 18:
- writePinHigh(C5);
+ gpio_write_pin_high(C5);
break;
}
}
static void unselect_cols(void) {
//Native
- writePinHigh(C2);
- writePinHigh(C3);
- writePinHigh(C5);
+ gpio_write_pin_high(C2);
+ gpio_write_pin_high(C3);
+ gpio_write_pin_high(C5);
//Demultiplexer
- writePinLow(B4);
- writePinLow(C7);
- writePinHigh(A0);
- writePinHigh(A1);
- writePinHigh(A2);
+ gpio_write_pin_low(B4);
+ gpio_write_pin_low(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
}
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(A0);
- setPinOutput(A1);
- setPinOutput(A2);
- setPinOutput(B4);
- setPinOutput(C7);
- setPinOutput(C2);
- setPinOutput(C3);
- setPinOutput(C5);
+ gpio_set_pin_output(A0);
+ gpio_set_pin_output(A1);
+ gpio_set_pin_output(A2);
+ gpio_set_pin_output(B4);
+ gpio_set_pin_output(C7);
+ gpio_set_pin_output(C2);
+ gpio_set_pin_output(C3);
+ gpio_set_pin_output(C5);
}
static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
@@ -326,7 +326,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/olly/bb/rules.mk b/keyboards/mechlovin/olly/bb/rules.mk
index 1d15495eef..73681d1f1e 100644
--- a/keyboards/mechlovin/olly/bb/rules.mk
+++ b/keyboards/mechlovin/olly/bb/rules.mk
@@ -1,18 +1,5 @@
# Processor frequency
F_CPU = 16000000
-
-# 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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
CUSTOM_MATRIX = lite
SRC += matrix.c
diff --git a/keyboards/mechlovin/olly/jf/info.json b/keyboards/mechlovin/olly/jf/info.json
index b67551a111..315191e840 100644
--- a/keyboards/mechlovin/olly/jf/info.json
+++ b/keyboards/mechlovin/olly/jf/info.json
@@ -5,15 +5,6 @@
"usb": {
"vid": "0x4D4C"
},
- "features": {
- "nkro": false,
- "bootmagic": true,
- "command": false,
- "console": false,
- "extrakey": true,
- "mousekey": true,
- "rgblight": true
- },
"diode_direction": "ROW2COL",
"rgblight": {
"led_count": 27,
diff --git a/keyboards/mechlovin/olly/jf/rev1/info.json b/keyboards/mechlovin/olly/jf/rev1/keyboard.json
index 0b6aec094f..69f092af07 100644
--- a/keyboards/mechlovin/olly/jf/rev1/info.json
+++ b/keyboards/mechlovin/olly/jf/rev1/keyboard.json
@@ -5,7 +5,11 @@
"device_version": "0.0.1"
},
"features": {
- "backlight": true
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "backlight": true,
+ "rgblight": true
},
"matrix_pins": {
"cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
diff --git a/keyboards/mechlovin/olly/jf/rev1/matrix.c b/keyboards/mechlovin/olly/jf/rev1/matrix.c
index c01879c9a5..8d1f80ea71 100644
--- a/keyboards/mechlovin/olly/jf/rev1/matrix.c
+++ b/keyboards/mechlovin/olly/jf/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);
}
}
@@ -63,22 +60,22 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
#elif (DIODE_DIRECTION == COL2ROW)
static void select_row(uint8_t row) {
- setPinOutput(row_pins[row]);
- writePinLow(row_pins[row]);
+ gpio_set_pin_output(row_pins[row]);
+ gpio_write_pin_low(row_pins[row]);
}
-static void unselect_row(uint8_t row) { setPinInputHigh(row_pins[row]); }
+static void unselect_row(uint8_t row) { gpio_set_pin_input_high(row_pins[row]); }
static void unselect_rows(void) {
for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
- setPinInputHigh(row_pins[x]);
+ gpio_set_pin_input_high(row_pins[x]);
}
}
static void init_pins(void) {
unselect_rows();
for (uint8_t x = 0; x < MATRIX_COLS; x++) {
- setPinInputHigh(col_pins[x]);
+ gpio_set_pin_input_high(col_pins[x]);
}
}
@@ -97,7 +94,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++) {
// Select the col pin to read (active low)
- uint8_t pin_state = readPin(col_pins[col_index]);
+ uint8_t pin_state = gpio_read_pin(col_pins[col_index]);
// Populate the matrix row with the state of the col pin
current_matrix[current_row] |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
@@ -157,109 +154,109 @@ 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(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinHigh(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(B4);
break;
case 1:
- writePinLow(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinHigh(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(B4);
break;
case 2:
- writePinLow(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinHigh(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(B4);
break;
case 3:
- writePinLow(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinHigh(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(B4);
break;
case 4:
- writePinHigh(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinHigh(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(B4);
break;
case 5:
- writePinHigh(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinHigh(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(B4);
break;
case 6:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinHigh(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(B4);
break;
case 7:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinHigh(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(B4);
break;
case 8:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinHigh(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(C7);
break;
case 9:
- writePinLow(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinHigh(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(C7);
break;
case 10:
- writePinLow(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinHigh(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(C7);
break;
case 11:
- writePinLow(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinHigh(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(C7);
break;
case 12:
- writePinLow(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinHigh(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(C7);
break;
case 13:
- writePinHigh(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinHigh(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(C7);
break;
case 14:
- writePinHigh(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinHigh(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(C7);
break;
case 15:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinHigh(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(C7);
break;
case 16:
- writePinLow(C2);
+ gpio_write_pin_low(C2);
break;
case 17:
- writePinLow(C3);
+ gpio_write_pin_low(C3);
break;
case 18:
- writePinLow(C5);
+ gpio_write_pin_low(C5);
break;
}
}
@@ -267,140 +264,140 @@ static void select_col(uint8_t col) {
static void unselect_col(uint8_t col) {
switch (col) {
case 0:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinLow(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(B4);
break;
case 1:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinLow(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(B4);
break;
case 2:
- writePinHigh(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinLow(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(B4);
break;
case 3:
- writePinHigh(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinLow(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(B4);
break;
case 4:
- writePinLow(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinLow(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(B4);
break;
case 5:
- writePinLow(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinLow(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(B4);
break;
case 6:
- writePinLow(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinLow(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(B4);
break;
case 7:
- writePinLow(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinLow(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(B4);
break;
case 8:
- writePinLow(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinLow(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(C7);
break;
case 9:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinLow(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(C7);
break;
case 10:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinLow(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(C7);
break;
case 11:
- writePinHigh(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinLow(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(C7);
break;
case 12:
- writePinHigh(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinLow(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(C7);
break;
case 13:
- writePinLow(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinLow(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(C7);
break;
case 14:
- writePinLow(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinLow(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(C7);
break;
case 15:
- writePinLow(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinLow(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(C7);
break;
case 16:
- writePinHigh(C2);
+ gpio_write_pin_high(C2);
break;
case 17:
- writePinHigh(C3);
+ gpio_write_pin_high(C3);
break;
case 18:
- writePinHigh(C5);
+ gpio_write_pin_high(C5);
break;
}
}
static void unselect_cols(void) {
//Native
- writePinHigh(C2);
- writePinHigh(C3);
- writePinHigh(C5);
+ gpio_write_pin_high(C2);
+ gpio_write_pin_high(C3);
+ gpio_write_pin_high(C5);
//Demultiplexer
- writePinLow(B4);
- writePinLow(C7);
- writePinHigh(A0);
- writePinHigh(A1);
- writePinHigh(A2);
+ gpio_write_pin_low(B4);
+ gpio_write_pin_low(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
}
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(A0);
- setPinOutput(A1);
- setPinOutput(A2);
- setPinOutput(B4);
- setPinOutput(C7);
- setPinOutput(C2);
- setPinOutput(C3);
- setPinOutput(C5);
+ gpio_set_pin_output(A0);
+ gpio_set_pin_output(A1);
+ gpio_set_pin_output(A2);
+ gpio_set_pin_output(B4);
+ gpio_set_pin_output(C7);
+ gpio_set_pin_output(C2);
+ gpio_set_pin_output(C3);
+ gpio_set_pin_output(C5);
}
static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
@@ -416,7 +413,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/olly/jf/rev1/rev1.c b/keyboards/mechlovin/olly/jf/rev1/rev1.c
index 3d18d7bb5a..591c28dd44 100644
--- a/keyboards/mechlovin/olly/jf/rev1/rev1.c
+++ b/keyboards/mechlovin/olly/jf/rev1/rev1.c
@@ -18,22 +18,22 @@
void led_init_ports(void) {
- setPinOutput(C0);
- setPinOutput(D0);
- setPinOutput(D1);
- setPinOutput(C1);
- setPinOutput(C6);
- setPinOutput(B0);
- setPinOutput(B1);
- setPinOutput(B2);
+ gpio_set_pin_output(C0);
+ gpio_set_pin_output(D0);
+ gpio_set_pin_output(D1);
+ gpio_set_pin_output(C1);
+ gpio_set_pin_output(C6);
+ gpio_set_pin_output(B0);
+ gpio_set_pin_output(B1);
+ gpio_set_pin_output(B2);
}
layer_state_t layer_state_set_user(layer_state_t state) {
- writePin(D1, layer_state_cmp(state, 1));
- writePin(D0, layer_state_cmp(state, 2));
- writePin(C1, layer_state_cmp(state, 3));
- writePin(C0, layer_state_cmp(state, 4));
- writePin(C6, layer_state_cmp(state, 5));
+ gpio_write_pin(D1, layer_state_cmp(state, 1));
+ gpio_write_pin(D0, layer_state_cmp(state, 2));
+ gpio_write_pin(C1, layer_state_cmp(state, 3));
+ gpio_write_pin(C0, layer_state_cmp(state, 4));
+ gpio_write_pin(C6, layer_state_cmp(state, 5));
return state;
}
diff --git a/keyboards/mechlovin/olly/jf/rev2/info.json b/keyboards/mechlovin/olly/jf/rev2/keyboard.json
index 600bf8a3af..3771188638 100644
--- a/keyboards/mechlovin/olly/jf/rev2/info.json
+++ b/keyboards/mechlovin/olly/jf/rev2/keyboard.json
@@ -7,10 +7,14 @@
}
},
"features": {
- "command": true,
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
"console": true,
+ "command": true,
+ "nkro": true,
"led_matrix": true,
- "nkro": true
+ "rgblight": true
},
"led_matrix": {
"animations": {
@@ -704,4 +708,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/keyboards/mechlovin/olly/jf/rev2/rules.mk b/keyboards/mechlovin/olly/jf/rev2/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/mechlovin/olly/jf/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/mechlovin/olly/octagon/halconf.h b/keyboards/mechlovin/olly/octagon/halconf.h
index 3635a5c4a2..55add1de63 100644
--- a/keyboards/mechlovin/olly/octagon/halconf.h
+++ b/keyboards/mechlovin/olly/octagon/halconf.h
@@ -20,6 +20,4 @@
#define HAL_USE_SPI TRUE
-
#include_next <halconf.h>
-
diff --git a/keyboards/mechlovin/olly/octagon/info.json b/keyboards/mechlovin/olly/octagon/keyboard.json
index 3ef290d351..81b78b0b1c 100644
--- a/keyboards/mechlovin/olly/octagon/info.json
+++ b/keyboards/mechlovin/olly/octagon/keyboard.json
@@ -8,20 +8,25 @@
"pid": "0xD750",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "led_matrix": true,
+ "rgblight": true
+ },
+ "build": {
+ "lto": true
+ },
"rgblight": {
"saturation_steps": 8,
"brightness_steps": 8,
"led_count": 26,
"animations": {
"breathing": true,
- "rainbow_mood": true,
"rainbow_swirl": true,
- "snake": true,
- "knight": true,
- "christmas": true,
"static_gradient": true,
- "rgb_test": true,
- "alternating": true,
"twinkle": true
}
},
diff --git a/keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c b/keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c
index fcb4929654..353f5f5d6d 100644
--- a/keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c
@@ -15,16 +15,13 @@
*/
#include QMK_KEYBOARD_H
-#define LT1_CAP LT(1, KC_CAPS)
-
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_split_bs(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_PAUS, KC_DEL,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_HOME,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
- LT1_CAP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN,
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_END,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
- ),
-
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, _______, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ )
};
diff --git a/keyboards/mechlovin/olly/octagon/keymaps/default/readme.md b/keyboards/mechlovin/olly/octagon/keymaps/default/readme.md
deleted file mode 100644
index 17d8ba9e07..0000000000
--- a/keyboards/mechlovin/olly/octagon/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for octagon \ No newline at end of file
diff --git a/keyboards/mechlovin/olly/octagon/keymaps/via/keymap.c b/keyboards/mechlovin/olly/octagon/keymaps/via/keymap.c
index 2de37e94d3..353f5f5d6d 100644
--- a/keyboards/mechlovin/olly/octagon/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/olly/octagon/keymaps/via/keymap.c
@@ -15,40 +15,13 @@
*/
#include QMK_KEYBOARD_H
-#define LT1_CAP LT(1, KC_CAPS)
-
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_split_bs(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_PAUS, KC_DEL,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_HOME,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
- LT1_CAP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN,
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_END,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
- ),
- [1] = LAYOUT_split_bs(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
- ),
- [1] = LAYOUT_split_bs(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
- ),
- [1] = LAYOUT_split_bs(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
- ),
-
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, _______, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ )
};
diff --git a/keyboards/mechlovin/olly/octagon/mcuconf.h b/keyboards/mechlovin/olly/octagon/mcuconf.h
index 607305e567..6e4987337d 100644
--- a/keyboards/mechlovin/olly/octagon/mcuconf.h
+++ b/keyboards/mechlovin/olly/octagon/mcuconf.h
@@ -19,7 +19,6 @@
#include_next <mcuconf.h>
-
#undef STM32_SPI_USE_SPI1
#define STM32_SPI_USE_SPI1 TRUE
diff --git a/keyboards/mechlovin/olly/octagon/octagon.c b/keyboards/mechlovin/olly/octagon/octagon.c
index 185ee32a3e..c89565168b 100644
--- a/keyboards/mechlovin/olly/octagon/octagon.c
+++ b/keyboards/mechlovin/olly/octagon/octagon.c
@@ -55,12 +55,13 @@ led_config_t g_led_config = {
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- }
+ }
};
-
bool led_matrix_indicators_kb(void) {
- if (!led_matrix_indicators_user()) { return false; }
+ if (!led_matrix_indicators_user()) {
+ return false;
+ }
if (host_keyboard_led_state().caps_lock) {
led_matrix_set_value(87, 0xFF);
led_matrix_set_value(47, 0xFF);
@@ -80,33 +81,25 @@ bool led_matrix_indicators_kb(void) {
return true;
}
-
layer_state_t layer_state_set_kb(layer_state_t state) {
- // if on layer 1, turn on L1 LED, otherwise off.
- if (get_highest_layer(state) == 0) {
- led_matrix_set_value(90, 0xFF);
- } else {
- led_matrix_set_value(90, 0x00);
- }
- // if on layer 2, turn on L2 LED, otherwise off.
- if (get_highest_layer(state) == 1) {
- led_matrix_set_value(91, 0xFF);
- } else {
- led_matrix_set_value(91, 0x00);
- }
-
- // if on layer 3, turn on L3 LED, otherwise off.
- if (get_highest_layer(state) == 2) {
- led_matrix_set_value(92, 0xFF);
- } else {
- led_matrix_set_value(92, 0x00);
- }
-
- // if on layer 4, turn on L4 LED, otherwise off.
- if (get_highest_layer(state) == 3) {
- led_matrix_set_value(93, 0xFF);
- } else {
- led_matrix_set_value(93, 0x00);
+ switch (get_highest_layer(state)) {
+ case 0:
+ led_matrix_set_value(90, 0xFF);
+ break;
+ case 1:
+ led_matrix_set_value(91, 0xFF);
+ break;
+ case 2:
+ led_matrix_set_value(92, 0xFF);
+ break;
+ case 3:
+ led_matrix_set_value(93, 0xFF);
+ break;
+ default:
+ led_matrix_set_value(90, 0x00);
+ led_matrix_set_value(91, 0x00);
+ led_matrix_set_value(92, 0x00);
+ led_matrix_set_value(93, 0x00);
}
return layer_state_set_user(state);
-} \ No newline at end of file
+}
diff --git a/keyboards/mechlovin/olly/octagon/readme.md b/keyboards/mechlovin/olly/octagon/readme.md
index 6f1833a571..5bf144ff5b 100644
--- a/keyboards/mechlovin/olly/octagon/readme.md
+++ b/keyboards/mechlovin/olly/octagon/readme.md
@@ -1,6 +1,6 @@
# Olly Octagon
-![Olly Octagon](https://i.imgur.com/lDMnyS4l.png)
+![Olly Octagon](https://i.imgur.com/lDMnyS4lh.png)
A replacement PCB for Duck Octagon 75% keyboard.
@@ -24,5 +24,5 @@ Enter the bootloader in 3 ways:
* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (Escape) and plug in the keyboard
* **Bootloader reset**: Hold down the key at (0,14) in the matrix (Backspace) and plug in the keyboard
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
* **Hardware reset**: Press reset button (located on the bottom side of the PCB)
diff --git a/keyboards/mechlovin/olly/octagon/rules.mk b/keyboards/mechlovin/olly/octagon/rules.mk
deleted file mode 100644
index 97303c7e2f..0000000000
--- a/keyboards/mechlovin/olly/octagon/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-LED_MATRIX_ENABLE = yes
-RGBLIGHT_ENABLE = yes \ No newline at end of file
diff --git a/keyboards/mechlovin/olly/orion/info.json b/keyboards/mechlovin/olly/orion/keyboard.json
index 0c0ee86c95..2780e21949 100644
--- a/keyboards/mechlovin/olly/orion/info.json
+++ b/keyboards/mechlovin/olly/orion/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0xD870",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["B14", "B13", "B12", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "A15", "B3", "B4"],
"rows": ["A8", "A9", "A10", "B11", "C13", "C14"]
diff --git a/keyboards/mechlovin/olly/orion/orion.c b/keyboards/mechlovin/olly/orion/orion.c
index 9fc89a6d02..4dcc15cf77 100644
--- a/keyboards/mechlovin/olly/orion/orion.c
+++ b/keyboards/mechlovin/olly/orion/orion.c
@@ -22,20 +22,20 @@ void board_init(void) {
}
void keyboard_pre_init_kb(void) {
- setPinOutput(B5);
- setPinOutput(B6);
- setPinOutput(B7);
- setPinOutput(B8);
- setPinOutput(B9);
+ gpio_set_pin_output(B5);
+ gpio_set_pin_output(B6);
+ gpio_set_pin_output(B7);
+ gpio_set_pin_output(B8);
+ gpio_set_pin_output(B9);
keyboard_pre_init_user();
}
layer_state_t layer_state_set_kb(layer_state_t state) {
state = layer_state_set_user(state);
- writePin(B7, layer_state_cmp(state, 0));
- writePin(B6, layer_state_cmp(state, 1));
- writePin(B5, layer_state_cmp(state, 2));
- writePin(B8, layer_state_cmp(state, 3));
- writePin(B9, layer_state_cmp(state, 4));
+ gpio_write_pin(B7, layer_state_cmp(state, 0));
+ gpio_write_pin(B6, layer_state_cmp(state, 1));
+ gpio_write_pin(B5, layer_state_cmp(state, 2));
+ gpio_write_pin(B8, layer_state_cmp(state, 3));
+ gpio_write_pin(B9, layer_state_cmp(state, 4));
return state;
}
diff --git a/keyboards/mechlovin/olly/orion/rules.mk b/keyboards/mechlovin/olly/orion/rules.mk
deleted file mode 100644
index ef83f572cc..0000000000
--- a/keyboards/mechlovin/olly/orion/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-