summaryrefslogtreecommitdiff
path: root/keyboards/spaceman
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/spaceman')
-rw-r--r--keyboards/spaceman/2_milk/config.h1
-rw-r--r--keyboards/spaceman/2_milk/info.json2
-rw-r--r--keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/keymap.c6
-rw-r--r--keyboards/spaceman/2_milk/keymaps/emoji/keymap.c6
-rw-r--r--keyboards/spaceman/2_milk/keymaps/encg/keymap.c2
-rw-r--r--keyboards/spaceman/2_milk/rules.mk6
-rw-r--r--keyboards/spaceman/pancake/rev1/config.h1
-rw-r--r--keyboards/spaceman/pancake/rev1/feather/config.h1
-rw-r--r--keyboards/spaceman/pancake/rev1/feather/rules.mk8
-rw-r--r--keyboards/spaceman/pancake/rev1/info.json3
-rw-r--r--keyboards/spaceman/pancake/rev1/promicro/config.h1
-rw-r--r--keyboards/spaceman/pancake/rev1/promicro/rules.mk8
-rw-r--r--keyboards/spaceman/pancake/rev2/config.h1
-rw-r--r--keyboards/spaceman/pancake/rev2/info.json3
-rw-r--r--keyboards/spaceman/pancake/rev2/rules.mk8
-rw-r--r--keyboards/spaceman/yun65/config.h1
-rw-r--r--keyboards/spaceman/yun65/info.json2
-rw-r--r--keyboards/spaceman/yun65/rules.mk6
18 files changed, 17 insertions, 49 deletions
diff --git a/keyboards/spaceman/2_milk/config.h b/keyboards/spaceman/2_milk/config.h
index 2a4b2889d0..e631c03dff 100644
--- a/keyboards/spaceman/2_milk/config.h
+++ b/keyboards/spaceman/2_milk/config.h
@@ -14,7 +14,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 2
diff --git a/keyboards/spaceman/2_milk/info.json b/keyboards/spaceman/2_milk/info.json
index 8cdf474517..c7e4c944c7 100644
--- a/keyboards/spaceman/2_milk/info.json
+++ b/keyboards/spaceman/2_milk/info.json
@@ -8,6 +8,8 @@
"pid": "0x3225",
"device_version": "0.0.1"
},
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [ {"x": 0, "y": 0 }, {"x": 0, "y": 1 }]
diff --git a/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/keymap.c b/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/keymap.c
index 6f21c630bf..93c0f0eee3 100644
--- a/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/keymap.c
+++ b/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/keymap.c
@@ -8,7 +8,7 @@ enum tapdance_keycodes {
TD_KEY_2
};
-void dance_key_one(qk_tap_dance_state_t *state, void *user_data) {
+void dance_key_one(tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
/* Copy for Mac. */
/* Windows & Linux use Ctrl+C: tap_code16(C(KC_C)) */
@@ -26,7 +26,7 @@ void dance_key_one(qk_tap_dance_state_t *state, void *user_data) {
}
}
-void dance_key_two(qk_tap_dance_state_t *state, void *user_data) {
+void dance_key_two(tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
/* Paste for Mac. */
/* Windows & Linux use Ctrl+V: tap_code16(C(KC_V)) */
@@ -45,7 +45,7 @@ void dance_key_two(qk_tap_dance_state_t *state, void *user_data) {
}
}
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[TD_KEY_1] = ACTION_TAP_DANCE_FN(dance_key_one),
[TD_KEY_2] = ACTION_TAP_DANCE_FN(dance_key_two)
};
diff --git a/keyboards/spaceman/2_milk/keymaps/emoji/keymap.c b/keyboards/spaceman/2_milk/keymaps/emoji/keymap.c
index 9deb2ddaf0..8859573ce5 100644
--- a/keyboards/spaceman/2_milk/keymaps/emoji/keymap.c
+++ b/keyboards/spaceman/2_milk/keymaps/emoji/keymap.c
@@ -5,7 +5,7 @@ enum tapdance_keycodes {
TD_KEY_2,
};
-void dance_key_one (qk_tap_dance_state_t *state, void *user_data) {
+void dance_key_one (tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
send_unicode_string("¯\\_(ツ)_/¯");
tap_code(KC_ENTER);
@@ -16,7 +16,7 @@ void dance_key_one (qk_tap_dance_state_t *state, void *user_data) {
}
}
-void dance_key_two (qk_tap_dance_state_t *state, void *user_data) {
+void dance_key_two (tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
send_unicode_string("ಠ_ಠ");
tap_code(KC_ENTER);
@@ -40,7 +40,7 @@ void dance_key_two (qk_tap_dance_state_t *state, void *user_data) {
}
}
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[TD_KEY_1] = ACTION_TAP_DANCE_FN(dance_key_one),
[TD_KEY_2] = ACTION_TAP_DANCE_FN(dance_key_two),
};
diff --git a/keyboards/spaceman/2_milk/keymaps/encg/keymap.c b/keyboards/spaceman/2_milk/keymaps/encg/keymap.c
index d74f8828db..fab1debf02 100644
--- a/keyboards/spaceman/2_milk/keymaps/encg/keymap.c
+++ b/keyboards/spaceman/2_milk/keymaps/encg/keymap.c
@@ -38,7 +38,7 @@ enum unicode_names {
WAVE
};
-const uint32_t PROGMEM unicode_map[] = {
+const uint32_t unicode_map[] PROGMEM = {
[COW] = 0x1F404, // 🐄
[BTTR] = 0x1F9C8, // 🧈
[CHIKN] = 0x1F414, // 🐔
diff --git a/keyboards/spaceman/2_milk/rules.mk b/keyboards/spaceman/2_milk/rules.mk
index 77b594bd81..55f12300d5 100644
--- a/keyboards/spaceman/2_milk/rules.mk
+++ b/keyboards/spaceman/2_milk/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/spaceman/pancake/rev1/config.h b/keyboards/spaceman/pancake/rev1/config.h
index 46eb28d6ba..c179ffff11 100644
--- a/keyboards/spaceman/pancake/rev1/config.h
+++ b/keyboards/spaceman/pancake/rev1/config.h
@@ -14,7 +14,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 4
diff --git a/keyboards/spaceman/pancake/rev1/feather/config.h b/keyboards/spaceman/pancake/rev1/feather/config.h
index c593147151..ea6af6336d 100644
--- a/keyboards/spaceman/pancake/rev1/feather/config.h
+++ b/keyboards/spaceman/pancake/rev1/feather/config.h
@@ -14,7 +14,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-#include "config_common.h"
/* Pancake default pinout */
#define MATRIX_ROW_PINS { B5, D7, C6, D0 }
diff --git a/keyboards/spaceman/pancake/rev1/feather/rules.mk b/keyboards/spaceman/pancake/rev1/feather/rules.mk
index c213c70872..822ab9971b 100644
--- a/keyboards/spaceman/pancake/rev1/feather/rules.mk
+++ b/keyboards/spaceman/pancake/rev1/feather/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
#
@@ -22,8 +16,6 @@ RGBLIGHT_ENABLE = no # This can be enabled if a ws2812 strip is connected to th
BLUETOOTH_ENABLE = yes
BLUETOOTH_DRIVER = BluefruitLE
-LAYOUTS = ortho_4x12 planck_mit
-
# Disable unsupported hardware
RGBLIGHT_SUPPORTED = no
AUDIO_SUPPORTED = no
diff --git a/keyboards/spaceman/pancake/rev1/info.json b/keyboards/spaceman/pancake/rev1/info.json
index b05601cfa4..723b6c1054 100644
--- a/keyboards/spaceman/pancake/rev1/info.json
+++ b/keyboards/spaceman/pancake/rev1/info.json
@@ -8,6 +8,9 @@
"pid": "0x504B",
"device_version": "0.0.1"
},
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "community_layouts": ["ortho_4x12", "planck_mit"],
"layouts": {
"LAYOUT_planck_mit": {
"layout": [
diff --git a/keyboards/spaceman/pancake/rev1/promicro/config.h b/keyboards/spaceman/pancake/rev1/promicro/config.h
index e96d9f152c..3024db4d46 100644
--- a/keyboards/spaceman/pancake/rev1/promicro/config.h
+++ b/keyboards/spaceman/pancake/rev1/promicro/config.h
@@ -14,7 +14,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-#include "config_common.h"
/* Pancake default pinout */
#define MATRIX_ROW_PINS { B1, B3, B2, B6 }
diff --git a/keyboards/spaceman/pancake/rev1/promicro/rules.mk b/keyboards/spaceman/pancake/rev1/promicro/rules.mk
index 561b3da8fe..96e36eba38 100644
--- a/keyboards/spaceman/pancake/rev1/promicro/rules.mk
+++ b/keyboards/spaceman/pancake/rev1/promicro/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
# Build Options
# change yes to no to disable
#
@@ -17,8 +11,6 @@ BACKLIGHT_ENABLE = no # Custom backlighting code is used, so this should not b
AUDIO_ENABLE = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below
RGBLIGHT_ENABLE = no # This can be enabled if a ws2812 strip is connected to the expansion port.
-LAYOUTS = ortho_4x12 planck_mit
-
# Disable unsupported hardware
RGBLIGHT_SUPPORTED = no
AUDIO_SUPPORTED = no
diff --git a/keyboards/spaceman/pancake/rev2/config.h b/keyboards/spaceman/pancake/rev2/config.h
index 15d483a82e..37e4ea461a 100644
--- a/keyboards/spaceman/pancake/rev2/config.h
+++ b/keyboards/spaceman/pancake/rev2/config.h
@@ -14,7 +14,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 4
diff --git a/keyboards/spaceman/pancake/rev2/info.json b/keyboards/spaceman/pancake/rev2/info.json
index 300d0f6090..22da63e5f2 100644
--- a/keyboards/spaceman/pancake/rev2/info.json
+++ b/keyboards/spaceman/pancake/rev2/info.json
@@ -8,6 +8,9 @@
"pid": "0x5032",
"device_version": "0.0.2"
},
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "community_layouts": ["ortho_4x12"],
"layouts": {
"LAYOUT_ortho_4x12": {
"layout": [
diff --git a/keyboards/spaceman/pancake/rev2/rules.mk b/keyboards/spaceman/pancake/rev2/rules.mk
index fa32ecc897..c085de5a4a 100644
--- a/keyboards/spaceman/pancake/rev2/rules.mk
+++ b/keyboards/spaceman/pancake/rev2/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
@@ -18,5 +12,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
OLED_ENABLE = yes
OLED_DRIVER = SSD1306
-
-LAYOUTS = ortho_4x12
diff --git a/keyboards/spaceman/yun65/config.h b/keyboards/spaceman/yun65/config.h
index 6f4c4e4050..d592ff03cc 100644
--- a/keyboards/spaceman/yun65/config.h
+++ b/keyboards/spaceman/yun65/config.h
@@ -14,7 +14,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-#include "config_common.h"
/* Key Matrix perameter */
#define MATRIX_ROWS 5
diff --git a/keyboards/spaceman/yun65/info.json b/keyboards/spaceman/yun65/info.json
index 0caaa1521e..1103a08c72 100644
--- a/keyboards/spaceman/yun65/info.json
+++ b/keyboards/spaceman/yun65/info.json
@@ -8,6 +8,8 @@
"pid": "0x594E",
"device_version": "0.0.1"
},
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/spaceman/yun65/rules.mk b/keyboards/spaceman/yun65/rules.mk
index d2c47c1529..e12dc198de 100644
--- a/keyboards/spaceman/yun65/rules.mk
+++ b/keyboards/spaceman/yun65/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#