summaryrefslogtreecommitdiff
path: root/keyboards/converter/m0110_usb
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/converter/m0110_usb')
-rw-r--r--keyboards/converter/m0110_usb/info.json2
-rw-r--r--keyboards/converter/m0110_usb/keymaps/zyber/keymap.c16
-rw-r--r--keyboards/converter/m0110_usb/m0110.c12
-rw-r--r--keyboards/converter/m0110_usb/matrix.c4
-rw-r--r--keyboards/converter/m0110_usb/rules.mk6
5 files changed, 18 insertions, 22 deletions
diff --git a/keyboards/converter/m0110_usb/info.json b/keyboards/converter/m0110_usb/info.json
index f1db7083de..86aae250df 100644
--- a/keyboards/converter/m0110_usb/info.json
+++ b/keyboards/converter/m0110_usb/info.json
@@ -8,6 +8,8 @@
"pid": "0x0110",
"device_version": "1.0.1"
},
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
"layouts": {
"LAYOUT_ansi": {
"layout": [
diff --git a/keyboards/converter/m0110_usb/keymaps/zyber/keymap.c b/keyboards/converter/m0110_usb/keymaps/zyber/keymap.c
index 15ed043aa6..c3b85313ce 100644
--- a/keyboards/converter/m0110_usb/keymaps/zyber/keymap.c
+++ b/keyboards/converter/m0110_usb/keymaps/zyber/keymap.c
@@ -33,10 +33,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[0] = LAYOUT_iso(
- QK_GESC, 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_NUM, KC_EQL, KC_PSLS, KC_PAST, \
- 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_ENT, KC_P7, KC_P8, KC_P9, KC_PMNS, \
- CTRL_C_UP, 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_P4, KC_P5, KC_P6, KC_PPLS, \
- 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_P1, KC_P2, KC_P3, KC_PENT, \
+ QK_GESC, 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_NUM, KC_EQL, KC_PSLS, KC_PAST,
+ 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_ENT, KC_P7, KC_P8, KC_P9, KC_PMNS,
+ CTRL_C_UP, 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_P4, KC_P5, KC_P6, KC_PPLS,
+ 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_P1, KC_P2, KC_P3, KC_PENT,
KC_LALT, KC_LGUI, KC_SPC, MO(1), LT(1, KC_BSLS), KC_DOWN),
@@ -68,9 +68,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[1] = LAYOUT_iso(
- QK_BOOT, 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_DEL, _______, _______, _______, _______, \
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
- _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, \
- _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, \
+ QK_BOOT, 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_DEL, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______),
};
diff --git a/keyboards/converter/m0110_usb/m0110.c b/keyboards/converter/m0110_usb/m0110.c
index 64f2fa50ab..f3097fb465 100644
--- a/keyboards/converter/m0110_usb/m0110.c
+++ b/keyboards/converter/m0110_usb/m0110.c
@@ -318,31 +318,31 @@ static inline uint8_t instant(void) {
return data;
}
-static inline void clock_lo() {
+static inline void clock_lo(void) {
M0110_CLOCK_PORT &= ~(1 << M0110_CLOCK_BIT);
M0110_CLOCK_DDR |= (1 << M0110_CLOCK_BIT);
}
-static inline void clock_hi() {
+static inline void clock_hi(void) {
/* input with pull up */
M0110_CLOCK_DDR &= ~(1 << M0110_CLOCK_BIT);
M0110_CLOCK_PORT |= (1 << M0110_CLOCK_BIT);
}
-static inline bool clock_in() {
+static inline bool clock_in(void) {
M0110_CLOCK_DDR &= ~(1 << M0110_CLOCK_BIT);
M0110_CLOCK_PORT |= (1 << M0110_CLOCK_BIT);
_delay_us(1);
return M0110_CLOCK_PIN & (1 << M0110_CLOCK_BIT);
}
-static inline void data_lo() {
+static inline void data_lo(void) {
M0110_DATA_PORT &= ~(1 << M0110_DATA_BIT);
M0110_DATA_DDR |= (1 << M0110_DATA_BIT);
}
-static inline void data_hi() {
+static inline void data_hi(void) {
/* input with pull up */
M0110_DATA_DDR &= ~(1 << M0110_DATA_BIT);
M0110_DATA_PORT |= (1 << M0110_DATA_BIT);
}
-static inline bool data_in() {
+static inline bool data_in(void) {
M0110_DATA_DDR &= ~(1 << M0110_DATA_BIT);
M0110_DATA_PORT |= (1 << M0110_DATA_BIT);
_delay_us(1);
diff --git a/keyboards/converter/m0110_usb/matrix.c b/keyboards/converter/m0110_usb/matrix.c
index daba7a138a..6c39d4b6b0 100644
--- a/keyboards/converter/m0110_usb/matrix.c
+++ b/keyboards/converter/m0110_usb/matrix.c
@@ -72,7 +72,7 @@ void matrix_init(void)
for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0x00;
matrix = _matrix0;
- matrix_init_quantum();
+ matrix_init_kb();
return;
}
@@ -96,7 +96,7 @@ uint8_t matrix_scan(void)
print("["); print_hex8(key); print("]\n");
}
- matrix_scan_quantum();
+ matrix_scan_kb();
return 1;
}
diff --git a/keyboards/converter/m0110_usb/rules.mk b/keyboards/converter/m0110_usb/rules.mk
index 20733dcd72..a9dc1a9e49 100644
--- a/keyboards/converter/m0110_usb/rules.mk
+++ b/keyboards/converter/m0110_usb/rules.mk
@@ -1,12 +1,6 @@
-# MCU name
-MCU = atmega32u4
-
# Processor frequency
F_CPU = 8000000
-# Bootloader selection
-BOOTLOADER = caterina
-
# Build Options
# change yes to no to disable
#