summaryrefslogtreecommitdiff
path: root/keyboards/ebastler
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ebastler')
-rw-r--r--keyboards/ebastler/e80_1800/config.h1
-rw-r--r--keyboards/ebastler/e80_1800/info.json1
-rw-r--r--keyboards/ebastler/e80_1800/keymaps/via_oled/keymap.c184
-rw-r--r--keyboards/ebastler/isometria_75/rev1/config.h2
-rw-r--r--keyboards/ebastler/isometria_75/rev1/info.json2
-rw-r--r--keyboards/ebastler/isometria_75/rev1/rules.mk6
6 files changed, 94 insertions, 102 deletions
diff --git a/keyboards/ebastler/e80_1800/config.h b/keyboards/ebastler/e80_1800/config.h
index 36b37d36ff..b0726f908a 100644
--- a/keyboards/ebastler/e80_1800/config.h
+++ b/keyboards/ebastler/e80_1800/config.h
@@ -14,7 +14,6 @@
*/
#pragma once
-#include "config_common.h"
#define BACKLIGHT_PWM_DRIVER PWMD1
#define BACKLIGHT_PWM_CHANNEL 2
#define BACKLIGHT_PAL_MODE 2
diff --git a/keyboards/ebastler/e80_1800/info.json b/keyboards/ebastler/e80_1800/info.json
index fd09130dd3..6624791143 100644
--- a/keyboards/ebastler/e80_1800/info.json
+++ b/keyboards/ebastler/e80_1800/info.json
@@ -11,7 +11,6 @@
"pid": "0x1338",
"device_version": "1.0.0"
},
- "debounce": 5,
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
diff --git a/keyboards/ebastler/e80_1800/keymaps/via_oled/keymap.c b/keyboards/ebastler/e80_1800/keymaps/via_oled/keymap.c
index 60d3d24e9b..a0da11e31c 100644
--- a/keyboards/ebastler/e80_1800/keymaps/via_oled/keymap.c
+++ b/keyboards/ebastler/e80_1800/keymaps/via_oled/keymap.c
@@ -61,67 +61,67 @@ extern matrix_row_t matrix[MATRIX_ROWS];
static bool OLED_redraw = true;
-static const uint8_t bongofont[] PROGMEM = { \
- 0xC1, 0xC1, 0xC2, 0x04, 0x08, 0x10, \
- 0xC0, 0x38, 0x04, 0x03, 0x00, 0x00, \
- 0xA0, 0x22, 0x24, 0x14, 0x12, 0x12, \
- 0xA0, 0x21, 0x22, 0x12, 0x11, 0x11, \
- 0x83, 0x7C, 0x41, 0x41, 0x40, 0x40, \
- 0x82, 0x82, 0x84, 0x08, 0x10, 0x20, \
- 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, \
- 0x80, 0x70, 0x19, 0x06, 0x00, 0x00, \
- 0x80, 0x70, 0x0C, 0x03, 0x00, 0x00, \
- 0x80, 0x00, 0x30, 0x30, 0x00, 0xC0, \
- 0x80, 0x00, 0x30, 0x30, 0x00, 0x00, \
- 0x49, 0x88, 0x08, 0x08, 0x08, 0x00, \
- 0x44, 0x84, 0x04, 0x04, 0x00, 0x00, \
- 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, \
- 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, \
- 0x3C, 0xC2, 0x01, 0x01, 0x02, 0x02, \
- 0x35, 0x01, 0x8A, 0x7C, 0x00, 0x00, \
- 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, \
- 0x20, 0x21, 0x22, 0x12, 0x11, 0x11, \
- 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, \
- 0x1E, 0xE1, 0x00, 0x00, 0x01, 0x01, \
- 0x1C, 0xE2, 0x01, 0x01, 0x02, 0x02, \
- 0x18, 0x64, 0x82, 0x02, 0x02, 0x02, \
- 0x18, 0x60, 0x80, 0x00, 0x00, 0x00, \
- 0x18, 0x18, 0x1B, 0x03, 0x00, 0x40, \
- 0x18, 0x06, 0x05, 0x98, 0x99, 0x84, \
- 0x12, 0x0B, 0x08, 0x08, 0x08, 0x08, \
- 0x11, 0x09, 0x08, 0x08, 0x08, 0x08, \
- 0x10, 0x10, 0xD0, 0x11, 0x0F, 0x21, \
- 0x10, 0x10, 0x10, 0x11, 0x0F, 0x01, \
- 0x10, 0x08, 0x08, 0x04, 0x04, 0x04, \
- 0x10, 0x08, 0x04, 0x02, 0x02, 0x04, \
- 0x0C, 0x30, 0x40, 0x80, 0x00, 0x00, \
- 0x0C, 0x0C, 0x0D, 0x01, 0x00, 0x40, \
- 0x08, 0xE8, 0x08, 0x07, 0x10, 0x24, \
- 0x08, 0x30, 0x40, 0x80, 0x00, 0x00, \
- 0x08, 0x08, 0x08, 0x07, 0x00, 0x00, \
- 0x08, 0x08, 0x04, 0x02, 0x02, 0x02, \
- 0x08, 0x04, 0x02, 0x01, 0x01, 0x02, \
- 0x05, 0x05, 0x09, 0x09, 0x10, 0x10, \
- 0x04, 0x38, 0x40, 0x80, 0x00, 0x00, \
- 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, \
- 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, \
- 0x04, 0x04, 0x02, 0x01, 0x00, 0x00, \
- 0x02, 0x02, 0x81, 0x80, 0x80, 0x00, \
- 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, \
- 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, \
- 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, \
- 0x01, 0xE1, 0x1A, 0x06, 0x09, 0x31, \
- 0x01, 0x01, 0x02, 0x04, 0x08, 0x10, \
- 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, \
- 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, \
- 0x00, 0x80, 0x40, 0x40, 0x20, 0x20, \
- 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, \
- 0x00, 0x00, 0x60, 0x60, 0x00, 0x81, \
- 0x00, 0x00, 0x01, 0x01, 0x00, 0x40, \
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, \
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, \
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, \
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, \
+static const uint8_t bongofont[] PROGMEM = {
+ 0xC1, 0xC1, 0xC2, 0x04, 0x08, 0x10,
+ 0xC0, 0x38, 0x04, 0x03, 0x00, 0x00,
+ 0xA0, 0x22, 0x24, 0x14, 0x12, 0x12,
+ 0xA0, 0x21, 0x22, 0x12, 0x11, 0x11,
+ 0x83, 0x7C, 0x41, 0x41, 0x40, 0x40,
+ 0x82, 0x82, 0x84, 0x08, 0x10, 0x20,
+ 0x80, 0x80, 0x00, 0x00, 0x00, 0x00,
+ 0x80, 0x70, 0x19, 0x06, 0x00, 0x00,
+ 0x80, 0x70, 0x0C, 0x03, 0x00, 0x00,
+ 0x80, 0x00, 0x30, 0x30, 0x00, 0xC0,
+ 0x80, 0x00, 0x30, 0x30, 0x00, 0x00,
+ 0x49, 0x88, 0x08, 0x08, 0x08, 0x00,
+ 0x44, 0x84, 0x04, 0x04, 0x00, 0x00,
+ 0x40, 0x80, 0x00, 0x00, 0x00, 0x00,
+ 0x40, 0x40, 0x20, 0x20, 0x20, 0x20,
+ 0x3C, 0xC2, 0x01, 0x01, 0x02, 0x02,
+ 0x35, 0x01, 0x8A, 0x7C, 0x00, 0x00,
+ 0x20, 0x40, 0x80, 0x00, 0x00, 0x00,
+ 0x20, 0x21, 0x22, 0x12, 0x11, 0x11,
+ 0x20, 0x20, 0x10, 0x10, 0x10, 0x10,
+ 0x1E, 0xE1, 0x00, 0x00, 0x01, 0x01,
+ 0x1C, 0xE2, 0x01, 0x01, 0x02, 0x02,
+ 0x18, 0x64, 0x82, 0x02, 0x02, 0x02,
+ 0x18, 0x60, 0x80, 0x00, 0x00, 0x00,
+ 0x18, 0x18, 0x1B, 0x03, 0x00, 0x40,
+ 0x18, 0x06, 0x05, 0x98, 0x99, 0x84,
+ 0x12, 0x0B, 0x08, 0x08, 0x08, 0x08,
+ 0x11, 0x09, 0x08, 0x08, 0x08, 0x08,
+ 0x10, 0x10, 0xD0, 0x11, 0x0F, 0x21,
+ 0x10, 0x10, 0x10, 0x11, 0x0F, 0x01,
+ 0x10, 0x08, 0x08, 0x04, 0x04, 0x04,
+ 0x10, 0x08, 0x04, 0x02, 0x02, 0x04,
+ 0x0C, 0x30, 0x40, 0x80, 0x00, 0x00,
+ 0x0C, 0x0C, 0x0D, 0x01, 0x00, 0x40,
+ 0x08, 0xE8, 0x08, 0x07, 0x10, 0x24,
+ 0x08, 0x30, 0x40, 0x80, 0x00, 0x00,
+ 0x08, 0x08, 0x08, 0x07, 0x00, 0x00,
+ 0x08, 0x08, 0x04, 0x02, 0x02, 0x02,
+ 0x08, 0x04, 0x02, 0x01, 0x01, 0x02,
+ 0x05, 0x05, 0x09, 0x09, 0x10, 0x10,
+ 0x04, 0x38, 0x40, 0x80, 0x00, 0x00,
+ 0x04, 0x04, 0x08, 0x08, 0x10, 0x10,
+ 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+ 0x04, 0x04, 0x02, 0x01, 0x00, 0x00,
+ 0x02, 0x02, 0x81, 0x80, 0x80, 0x00,
+ 0x02, 0x02, 0x04, 0x04, 0x08, 0x08,
+ 0x02, 0x02, 0x02, 0x01, 0x01, 0x01,
+ 0x02, 0x02, 0x01, 0x00, 0x00, 0x00,
+ 0x01, 0xE1, 0x1A, 0x06, 0x09, 0x31,
+ 0x01, 0x01, 0x02, 0x04, 0x08, 0x10,
+ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x80, 0x80, 0x00, 0x00, 0x00,
+ 0x00, 0x80, 0x40, 0x40, 0x20, 0x20,
+ 0x00, 0x00, 0x80, 0x80, 0x40, 0x40,
+ 0x00, 0x00, 0x60, 0x60, 0x00, 0x81,
+ 0x00, 0x00, 0x01, 0x01, 0x00, 0x40,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -131,44 +131,44 @@ static const uint8_t bongo_line_len[] = {5, 7, 8, 6};
const uint8_t bongo_line_data[8][26] PROGMEM = {
{ //idle1
- 60, 52, 19, 30, 35, \
- 22, 47, 51, 60, 9, 0, 17, \
- 1, 57, 33, 3, 27, 41, 29, 50, \
- 45, 36, 60, 60, 60, 60}, \
+ 60, 52, 19, 30, 35,
+ 22, 47, 51, 60, 9, 0, 17,
+ 1, 57, 33, 3, 27, 41, 29, 50,
+ 45, 36, 60, 60, 60, 60},
{ //idle2
- 60, 52, 19, 30, 35, \
- 22, 47, 51, 60, 9, 0, 17, \
- 1, 57, 33, 3, 27, 41, 29, 50, \
- 45, 36, 60, 60, 60, 60}, \
+ 60, 52, 19, 30, 35,
+ 22, 47, 51, 60, 9, 0, 17,
+ 1, 57, 33, 3, 27, 41, 29, 50,
+ 45, 36, 60, 60, 60, 60},
{ //idle3
- 60, 53, 14, 31, 23, \
- 15, 43, 60, 60, 54, 5, 13, \
- 7, 56, 24, 2, 26, 39, 29, 50, \
- 45, 36, 60, 60, 60, 60}, \
+ 60, 53, 14, 31, 23,
+ 15, 43, 60, 60, 54, 5, 13,
+ 7, 56, 24, 2, 26, 39, 29, 50,
+ 45, 36, 60, 60, 60, 60},
{ //idle4
- 6, 52, 19, 38, 32, \
- 20, 47, 51, 60, 9, 0, 17, \
- 8, 57, 33, 3, 27, 41, 29, 50, \
- 45, 36, 60, 60, 60, 60}, \
+ 6, 52, 19, 38, 32,
+ 20, 47, 51, 60, 9, 0, 17,
+ 8, 57, 33, 3, 27, 41, 29, 50,
+ 45, 36, 60, 60, 60, 60},
{ //idle5
- 60, 52, 19, 37, 40, \
- 21, 47, 51, 60, 9, 0, 17, \
- 8, 57, 33, 3, 27, 41, 29, 50, \
- 45, 36, 60, 60, 60, 60}, \
+ 60, 52, 19, 37, 40,
+ 21, 47, 51, 60, 9, 0, 17,
+ 8, 57, 33, 3, 27, 41, 29, 50,
+ 45, 36, 60, 60, 60, 60},
{ //prep
- 6, 52, 19, 38, 32, \
- 20, 44, 51, 60, 10, 48, 16, \
- 8, 25, 4, 18, 27, 42, 46, 50, \
- 60, 60, 60, 60, 60, 60}, \
+ 6, 52, 19, 38, 32,
+ 20, 44, 51, 60, 10, 48, 16,
+ 8, 25, 4, 18, 27, 42, 46, 50,
+ 60, 60, 60, 60, 60, 60},
{ //tap1
- 6, 52, 19, 38, 32, \
- 20, 44, 51, 60, 10, 49, 17, \
- 8, 25, 4, 18, 27, 41, 28, 11, \
- 60, 60, 60, 60, 58, 59}, \
+ 6, 52, 19, 38, 32,
+ 20, 44, 51, 60, 10, 49, 17,
+ 8, 25, 4, 18, 27, 41, 28, 11,
+ 60, 60, 60, 60, 58, 59},
{ //tap2
- 6, 52, 19, 38, 32, \
- 20, 47, 51, 60, 10, 48, 16, \
- 8, 60, 55, 3, 27, 42, 46, 50, \
+ 6, 52, 19, 38, 32,
+ 20, 47, 51, 60, 10, 48, 16,
+ 8, 60, 55, 3, 27, 42, 46, 50,
45, 34, 12, 60, 60, 60}
};
diff --git a/keyboards/ebastler/isometria_75/rev1/config.h b/keyboards/ebastler/isometria_75/rev1/config.h
index 2c2a62fc26..6b437075c3 100644
--- a/keyboards/ebastler/isometria_75/rev1/config.h
+++ b/keyboards/ebastler/isometria_75/rev1/config.h
@@ -17,7 +17,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 6
@@ -28,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
-#define DEBOUNCE 5
/* Backlight */
#define BACKLIGHT_PIN A9
diff --git a/keyboards/ebastler/isometria_75/rev1/info.json b/keyboards/ebastler/isometria_75/rev1/info.json
index ffc847a1d4..37898f4846 100644
--- a/keyboards/ebastler/isometria_75/rev1/info.json
+++ b/keyboards/ebastler/isometria_75/rev1/info.json
@@ -8,6 +8,8 @@
"pid": "0x1337",
"device_version": "0.0.1"
},
+ "processor": "STM32F072",
+ "bootloader": "stm32-dfu",
"layouts": {
"LAYOUT_iso": {
"layout": [
diff --git a/keyboards/ebastler/isometria_75/rev1/rules.mk b/keyboards/ebastler/isometria_75/rev1/rules.mk
index b755e9eb2d..bd6499b239 100644
--- a/keyboards/ebastler/isometria_75/rev1/rules.mk
+++ b/keyboards/ebastler/isometria_75/rev1/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = STM32F072
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
# Build Options
# change yes to no to disable
#