summaryrefslogtreecommitdiff
path: root/keyboards/handwired/jscotto
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/handwired/jscotto')
-rw-r--r--keyboards/handwired/jscotto/scotto36/keymaps/default/keymap.c8
-rw-r--r--keyboards/handwired/jscotto/scotto40/keymaps/default/keymap.c6
-rw-r--r--keyboards/handwired/jscotto/scotto9/info.json4
-rw-r--r--keyboards/handwired/jscotto/scottocmd/config.h4
-rw-r--r--keyboards/handwired/jscotto/scottocmd/info.json3
-rw-r--r--keyboards/handwired/jscotto/scottocmd/keymaps/default/keymap.c8
-rw-r--r--keyboards/handwired/jscotto/scottostarter/info.json4
7 files changed, 18 insertions, 19 deletions
diff --git a/keyboards/handwired/jscotto/scotto36/keymaps/default/keymap.c b/keyboards/handwired/jscotto/scotto36/keymaps/default/keymap.c
index cd9b1599a5..ad8451ac09 100644
--- a/keyboards/handwired/jscotto/scotto36/keymaps/default/keymap.c
+++ b/keyboards/handwired/jscotto/scotto36/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ enum {
TD_ESC_WINDOWS_EMOJI
};
-void td_esc_spotlight_emoji (qk_tap_dance_state_t *state, void *user_data) {
+void td_esc_spotlight_emoji (tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
tap_code(KC_ESC);
} else if (state->count == 2) {
@@ -36,7 +36,7 @@ void td_esc_spotlight_emoji (qk_tap_dance_state_t *state, void *user_data) {
}
}
-void td_esc_windows_emoji (qk_tap_dance_state_t *state, void *user_data) {
+void td_esc_windows_emoji (tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
tap_code(KC_ESC);
} else if (state->count == 2) {
@@ -47,7 +47,7 @@ void td_esc_windows_emoji (qk_tap_dance_state_t *state, void *user_data) {
};
// Tap Dance definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[TD_ESC_SPOTLIGHT_EMOJI] = ACTION_TAP_DANCE_FN(td_esc_spotlight_emoji),
[TD_ESC_WINDOWS_EMOJI] = ACTION_TAP_DANCE_FN(td_esc_windows_emoji)
};
@@ -216,7 +216,7 @@ static void render_animation(void) {
}
// Draw to OLED
-bool oled_task_user() {
+bool oled_task_user(void) {
// Render Bongo Cat
render_animation();
diff --git a/keyboards/handwired/jscotto/scotto40/keymaps/default/keymap.c b/keyboards/handwired/jscotto/scotto40/keymaps/default/keymap.c
index adfcdc559c..ba5f7bc7a8 100644
--- a/keyboards/handwired/jscotto/scotto40/keymaps/default/keymap.c
+++ b/keyboards/handwired/jscotto/scotto40/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ enum {
TD_ESC_WINDOWS_EMOJI
};
-void td_esc_spotlight_emoji (qk_tap_dance_state_t *state, void *user_data) {
+void td_esc_spotlight_emoji (tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
tap_code(KC_ESC);
} else if (state->count == 2) {
@@ -33,7 +33,7 @@ void td_esc_spotlight_emoji (qk_tap_dance_state_t *state, void *user_data) {
}
}
-void td_esc_windows_emoji (qk_tap_dance_state_t *state, void *user_data) {
+void td_esc_windows_emoji (tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
tap_code(KC_ESC);
} else if (state->count == 2) {
@@ -44,7 +44,7 @@ void td_esc_windows_emoji (qk_tap_dance_state_t *state, void *user_data) {
};
// Tap Dance definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[TD_ESC_SPOTLIGHT_EMOJI] = ACTION_TAP_DANCE_FN(td_esc_spotlight_emoji),
[TD_ESC_WINDOWS_EMOJI] = ACTION_TAP_DANCE_FN(td_esc_windows_emoji)
};
diff --git a/keyboards/handwired/jscotto/scotto9/info.json b/keyboards/handwired/jscotto/scotto9/info.json
index 09ae9eea77..d29ccc3fd1 100644
--- a/keyboards/handwired/jscotto/scotto9/info.json
+++ b/keyboards/handwired/jscotto/scotto9/info.json
@@ -31,12 +31,12 @@
"layout": [
{ "matrix": [0, 0], "x": 0, "y": 0 },
{ "matrix": [0, 1], "x": 1, "y": 0 },
- { "matrix": [0, 2], "x": 2, "y": 0 }
+ { "matrix": [0, 2], "x": 2, "y": 0 },
// Row 2
{ "matrix": [1, 0], "x": 0, "y": 1 },
{ "matrix": [1, 1], "x": 1, "y": 1 },
- { "matrix": [1, 2], "x": 2, "y": 1 }
+ { "matrix": [1, 2], "x": 2, "y": 1 },
// Row 3
{ "matrix": [2, 0], "x": 0, "y": 2 },
diff --git a/keyboards/handwired/jscotto/scottocmd/config.h b/keyboards/handwired/jscotto/scottocmd/config.h
index db72806f86..a168f0ef21 100644
--- a/keyboards/handwired/jscotto/scottocmd/config.h
+++ b/keyboards/handwired/jscotto/scottocmd/config.h
@@ -17,9 +17,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// Define tab key for boot magic
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 0
-
// OLED
#define OLED_DISPLAY_128X64 \ No newline at end of file
diff --git a/keyboards/handwired/jscotto/scottocmd/info.json b/keyboards/handwired/jscotto/scottocmd/info.json
index b2040fb7ab..51bf76595d 100644
--- a/keyboards/handwired/jscotto/scottocmd/info.json
+++ b/keyboards/handwired/jscotto/scottocmd/info.json
@@ -38,6 +38,9 @@
"pid": "0x0000",
"vid": "0xFEED"
},
+ "bootmagic": {
+ "matrix": [1, 0]
+ },
"layouts": {
"LAYOUT_ortho_4_3x10_4": {
"layout": [
diff --git a/keyboards/handwired/jscotto/scottocmd/keymaps/default/keymap.c b/keyboards/handwired/jscotto/scottocmd/keymaps/default/keymap.c
index 398178bf5b..b1c77ae944 100644
--- a/keyboards/handwired/jscotto/scottocmd/keymaps/default/keymap.c
+++ b/keyboards/handwired/jscotto/scottocmd/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ enum {
TD_ESC_WINDOWS_EMOJI
};
-void td_esc_spotlight_emoji (qk_tap_dance_state_t *state, void *user_data) {
+void td_esc_spotlight_emoji (tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
tap_code(KC_ESC);
} else if (state->count == 2) {
@@ -36,7 +36,7 @@ void td_esc_spotlight_emoji (qk_tap_dance_state_t *state, void *user_data) {
}
}
-void td_esc_windows_emoji (qk_tap_dance_state_t *state, void *user_data) {
+void td_esc_windows_emoji (tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
tap_code(KC_ESC);
} else if (state->count == 2) {
@@ -47,7 +47,7 @@ void td_esc_windows_emoji (qk_tap_dance_state_t *state, void *user_data) {
};
// Tap Dance definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[TD_ESC_SPOTLIGHT_EMOJI] = ACTION_TAP_DANCE_FN(td_esc_spotlight_emoji),
[TD_ESC_WINDOWS_EMOJI] = ACTION_TAP_DANCE_FN(td_esc_windows_emoji)
};
@@ -349,7 +349,7 @@ static void render_animation(void) {
}
// Draw to OLED
-bool oled_task_user() {
+bool oled_task_user(void) {
// Caps lock text
led_t led_state = host_keyboard_led_state();
oled_set_cursor(0,1);
diff --git a/keyboards/handwired/jscotto/scottostarter/info.json b/keyboards/handwired/jscotto/scottostarter/info.json
index 5bc3c14cc7..08bccff0d3 100644
--- a/keyboards/handwired/jscotto/scottostarter/info.json
+++ b/keyboards/handwired/jscotto/scottostarter/info.json
@@ -87,8 +87,8 @@
{ "matrix": [4, 2], "x": 2, "y": 4},
{ "matrix": [4, 4], "x": 4, "y": 4},
{ "matrix": [4, 7], "x": 7, "y": 4},
- { "matrix": [4, 8], "x": 8, "y": 4 }
- { "matrix": [4, 9], "x": 9, "y": 4 }
+ { "matrix": [4, 8], "x": 8, "y": 4 },
+ { "matrix": [4, 9], "x": 9, "y": 4 },
{ "matrix": [4, 10], "x": 10, "y": 4 }
]
}