aboutsummaryrefslogtreecommitdiff
path: root/keyboards/mechlovin/olly/jf
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/mechlovin/olly/jf')
-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
6 files changed, 185 insertions, 190 deletions
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