summaryrefslogtreecommitdiff
path: root/keyboards/boston_meetup
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/boston_meetup')
-rw-r--r--keyboards/boston_meetup/2019/2019.c2
-rw-r--r--keyboards/boston_meetup/2019/2019.h19
-rw-r--r--keyboards/boston_meetup/2019/config.h29
-rw-r--r--keyboards/boston_meetup/2019/info.json11
-rw-r--r--keyboards/boston_meetup/2019/rules.mk1
-rw-r--r--keyboards/boston_meetup/boston_meetup.c2
-rw-r--r--keyboards/boston_meetup/boston_meetup.h19
-rw-r--r--keyboards/boston_meetup/config.h40
-rw-r--r--keyboards/boston_meetup/info.json20
9 files changed, 31 insertions, 112 deletions
diff --git a/keyboards/boston_meetup/2019/2019.c b/keyboards/boston_meetup/2019/2019.c
index e558048f6a..1097c58de2 100644
--- a/keyboards/boston_meetup/2019/2019.c
+++ b/keyboards/boston_meetup/2019/2019.c
@@ -13,7 +13,7 @@
* 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 "2019.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
#include "rgb_matrix.h"
diff --git a/keyboards/boston_meetup/2019/2019.h b/keyboards/boston_meetup/2019/2019.h
deleted file mode 100644
index fbba5c3154..0000000000
--- a/keyboards/boston_meetup/2019/2019.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2019 ishtob
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "boston_meetup.h"
-
diff --git a/keyboards/boston_meetup/2019/config.h b/keyboards/boston_meetup/2019/config.h
index 00e8648df8..d609409cb5 100644
--- a/keyboards/boston_meetup/2019/config.h
+++ b/keyboards/boston_meetup/2019/config.h
@@ -1,22 +1,5 @@
#pragma once
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-
-#define MATRIX_ROW_PINS { A3, B8, B9, B1 }
-#define MATRIX_COL_PINS { A7, A8, B2, B10 }
-
//Audio
#undef AUDIO_VOICES
#undef AUDIO_PIN
@@ -38,17 +21,6 @@
#define OLED_UPDATE_INTERVAL 33 // ~30fps
/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-/*
* Feature disable options
* These options are also useful to firmware size reduction.
*/
@@ -125,7 +97,6 @@
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 10
-#define RGB_DI_PIN B5
#define RGB_MATRIX_LED_COUNT RGBLED_NUM
#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/boston_meetup/2019/info.json b/keyboards/boston_meetup/2019/info.json
index 22f54c3472..d50e92e17c 100644
--- a/keyboards/boston_meetup/2019/info.json
+++ b/keyboards/boston_meetup/2019/info.json
@@ -2,11 +2,22 @@
"usb": {
"device_version": "20.1.9"
},
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["A7", "A8", "B2", "B10"],
+ "rows": ["A3", "B8", "B9", "B1"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B13", "pin_b": "B14"}
]
},
+ "ws2812": {
+ "pin": "B5"
+ },
"processor": "STM32F303",
"bootloader": "stm32-dfu",
"board": "QMK_PROTON_C",
diff --git a/keyboards/boston_meetup/2019/rules.mk b/keyboards/boston_meetup/2019/rules.mk
index a32fadf0b0..b2f1131ffd 100644
--- a/keyboards/boston_meetup/2019/rules.mk
+++ b/keyboards/boston_meetup/2019/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = yes # Audio output
RGBLIGHT_ENABLE = no
RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
HAPTIC_ENABLE = yes
HAPTIC_DRIVER = DRV2605L
OLED_ENABLE = yes
diff --git a/keyboards/boston_meetup/boston_meetup.c b/keyboards/boston_meetup/boston_meetup.c
deleted file mode 100644
index a9201ac852..0000000000
--- a/keyboards/boston_meetup/boston_meetup.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "boston_meetup.h"
-
diff --git a/keyboards/boston_meetup/boston_meetup.h b/keyboards/boston_meetup/boston_meetup.h
deleted file mode 100644
index e1d9d92060..0000000000
--- a/keyboards/boston_meetup/boston_meetup.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_boston_meetup_2019
- #include "2019.h"
-#define LAYOUT( \
- K00, \
- K10, K11, K12, K13, \
- K20, K21, K22, K23, \
- K30, K31, K32, K33 \
- ) \
-{ \
- { K00, KC_NO, KC_NO, KC_NO }, \
- { K10, K11, K12, K13 }, \
- { K20, K21, K22, K23 }, \
- { K30, K31, K32, K33 } \
-}
-#endif
-
-#include "quantum.h" \ No newline at end of file
diff --git a/keyboards/boston_meetup/config.h b/keyboards/boston_meetup/config.h
deleted file mode 100644
index 80379fab18..0000000000
--- a/keyboards/boston_meetup/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-//#define AUDIO_VOICES
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/boston_meetup/info.json b/keyboards/boston_meetup/info.json
index 2c25d4ff06..6be55c249c 100644
--- a/keyboards/boston_meetup/info.json
+++ b/keyboards/boston_meetup/info.json
@@ -9,6 +9,24 @@
},
"layouts": {
"LAYOUT": {
- "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K10", "x":0, "y":1}, {"label":"K11", "x":1, "y":1}, {"label":"K12", "x":2, "y":1}, {"label":"K13", "x":3, "y":1}, {"label":"K20", "x":0, "y":2}, {"label":"K21", "x":1, "y":2}, {"label":"K22", "x":2, "y":2}, {"label":"K23", "x":3, "y":2}, {"label":"K30", "x":0, "y":3}, {"label":"K31", "x":1, "y":3}, {"label":"K32", "x":2, "y":3}, {"label":"K33", "x":3, "y":3}] }
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3}
+ ]
+ }
}
}