MS Sculpt Mobile refactor (#16038)

This commit is contained in:
Ryan 2022-03-20 15:19:46 +11:00 committed by GitHub
parent 729d7c2b2e
commit cfe28937d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 124 additions and 134 deletions

View File

@ -0,0 +1,6 @@
#pragma once
#define PRODUCT sculpt mobile astar
#define MATRIX_ROW_PINS { D7, C6, D4, D0, D1, D3, D2, E2 }
#define MATRIX_COL_PINS { B4, B5, E6, B7, B6, D6, C7, F7, F6, F4, F5, F1, F0, D5, B0, B1, B2, B3 }

View File

@ -0,0 +1,5 @@
# MCU name
MCU = atmega32u4
# Bootloader selection
BOOTLOADER = caterina

View File

@ -29,23 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROWS 8
#define MATRIX_COLS 18
#ifdef ASTAR
#define PRODUCT sculpt mobile astar
/*0 1 2 3 4 5 6 7 8 */
#define MATRIX_ROW_PINS {D7, C6, D4, D0, D1, D3, D2, E2}
/* A B C D E F G H I J K L M N O P Q R */
#define MATRIX_COL_PINS {B4, B5, E6, B7, B6, D6, C7, F7, F6, F4,F5, F1,F0, D5, B0, B1, B2, B3}
#else
#define PRODUCT sculpt mobile teensypp
/* 0 1 2 3 4 5 6 7 */
#define MATRIX_ROW_PINS { F7,F6,F4,F5,F3,F2,F1,F0}
/* A B C D E F G H I J K L M N O P Q R */
#define MATRIX_COL_PINS { B7, D0, D1, D2, D3, D4, D5, D6, D7, E0,E1,C1, C0, C3, C2, C5, C4,C7}
#define UNUSED_PINS { B6,B5,B4,B3,B2,B1,B0 }
#endif
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION ROW2COL

View File

@ -5,89 +5,94 @@
"layouts": {
"LAYOUT": {
"layout": [
{"label":"Esc", "x":0, "y":0},
{"label":"F1", "x":1, "y":0},
{"label":"F2", "x":2, "y":0},
{"label":"F3", "x":3, "y":0},
{"label":"F4", "x":4, "y":0},
{"label":"F5", "x":5, "y":0},
{"label":"F6", "x":6, "y":0},
{"label":"F7", "x":7, "y":0},
{"label":"F8", "x":8, "y":0},
{"label":"F9", "x":9, "y":0},
{"label":"F10", "x":10, "y":0},
{"label":"F11", "x":11, "y":0},
{"label":"F12", "x":12, "y":0},
{"label":"PrtSc", "x":13, "y":0},
{"label":"Home", "x":14, "y":0},
{"label":"End", "x":15, "y":0},
{"label":"`", "x":0, "y":1},
{"label":"1", "x":1, "y":1},
{"label":"2", "x":2, "y":1},
{"label":"3", "x":3, "y":1},
{"label":"4", "x":4, "y":1},
{"label":"5", "x":5, "y":1},
{"label":"6", "x":6, "y":1},
{"label":"7", "x":7, "y":1},
{"label":"8", "x":8, "y":1},
{"label":"9", "x":9, "y":1},
{"label":"0", "x":10, "y":1},
{"label":"-", "x":11, "y":1},
{"label":"=", "x":12, "y":1},
{"label":"Backspace", "x":13, "y":1, "w":2},
{"label":"Del", "x":15, "y":1, "h":1.6},
{"label":"Tab", "x":0, "y":2, "w":1.5},
{"label":"Q", "x":1.5, "y":2},
{"label":"W", "x":2.5, "y":2},
{"label":"E", "x":3.5, "y":2},
{"label":"R", "x":4.5, "y":2},
{"label":"T", "x":5.5, "y":2},
{"label":"Y", "x":6.5, "y":2},
{"label":"U", "x":7.5, "y":2},
{"label":"I", "x":8.5, "y":2},
{"label":"O", "x":9.5, "y":2},
{"label":"P", "x":10.5, "y":2},
{"label":"[", "x":11.5, "y":2},
{"label":"]", "x":12.5, "y":2},
{"label":"\\", "x":13.5, "y":2, "w":1.5},
{"label":"Caps Lock", "x":0, "y":3, "w":1.75},
{"label":"A", "x":1.75, "y":3},
{"label":"S", "x":2.75, "y":3},
{"label":"D", "x":3.75, "y":3},
{"label":"F", "x":4.75, "y":3},
{"label":"G", "x":5.75, "y":3},
{"label":"H", "x":6.75, "y":3},
{"label":"J", "x":7.75, "y":3},
{"label":"K", "x":8.75, "y":3},
{"label":"L", "x":9.75, "y":3},
{"label":";", "x":10.75, "y":3},
{"label":"'", "x":11.75, "y":3},
{"label":"Enter", "x":12.75, "y":3, "w":2.25},
{"label":"PgUp", "x":15, "y":2.6, "h":1.2},
{"label":"LShift", "x":0, "y":4, "w":2.25},
{"label":"Z", "x":2.25, "y":4},
{"label":"X", "x":3.25, "y":4},
{"label":"C", "x":4.25, "y":4},
{"label":"V", "x":5.25, "y":4},
{"label":"B", "x":6.25, "y":4},
{"label":"N", "x":7.25, "y":4},
{"label":"M", "x":8.25, "y":4},
{"label":",", "x":9.25, "y":4},
{"label":".", "x":10.25, "y":4},
{"label":"/", "x":11.25, "y":4},
{"label":"RShift", "x":12.25, "y":4, "w":1.75},
{"label":"Up", "x":14, "y":4},
{"label":"PgDn", "x":15, "y":3.8, "h":1.2},
{"label":"LCtrl", "x":0, "y":5, "w":1.25},
{"label":"LWin", "x":1.25, "y":5, "w":1.25},
{"label":"LAlt", "x":2.5, "y":5, "w":1.25},
{"label":"Space", "x":3.75, "y":5, "w":5.5},
{"label":"RAlt", "x":9.25, "y":5, "w":1.25},
{"label":"Fn", "x":10.5, "y":5, "w":1.25},
{"label":"RCtrl", "x":11.75, "y":5, "w":1.25},
{"label":"Left", "x":13, "y":5},
{"label":"Down", "x":14, "y":5},
{"label":"Right", "x":15, "y":5}
{"x": 0, "y": 0},
{"x": 1, "y": 0},
{"x": 2, "y": 0},
{"x": 3, "y": 0},
{"x": 4, "y": 0},
{"x": 5, "y": 0},
{"x": 6, "y": 0},
{"x": 7, "y": 0},
{"x": 8, "y": 0},
{"x": 9, "y": 0},
{"x": 10, "y": 0},
{"x": 11, "y": 0},
{"x": 12, "y": 0},
{"x": 13, "y": 0},
{"x": 14, "y": 0},
{"x": 15, "y": 0},
{"x": 0, "y": 1},
{"x": 1, "y": 1},
{"x": 2, "y": 1},
{"x": 3, "y": 1},
{"x": 4, "y": 1},
{"x": 5, "y": 1},
{"x": 6, "y": 1},
{"x": 7, "y": 1},
{"x": 8, "y": 1},
{"x": 9, "y": 1},
{"x": 10, "y": 1},
{"x": 11, "y": 1},
{"x": 12, "y": 1},
{"x": 13, "y": 1, "w": 2},
{"x": 15, "y": 1, "h": 1.6},
{"x": 0, "y": 2, "w": 1.5},
{"x": 1.5, "y": 2},
{"x": 2.5, "y": 2},
{"x": 3.5, "y": 2},
{"x": 4.5, "y": 2},
{"x": 5.5, "y": 2},
{"x": 6.5, "y": 2},
{"x": 7.5, "y": 2},
{"x": 8.5, "y": 2},
{"x": 9.5, "y": 2},
{"x": 10.5, "y": 2},
{"x": 11.5, "y": 2},
{"x": 12.5, "y": 2},
{"x": 13.5, "y": 2, "w": 1.5},
{"x": 0, "y": 3, "w": 1.75},
{"x": 1.75, "y": 3},
{"x": 2.75, "y": 3},
{"x": 3.75, "y": 3},
{"x": 4.75, "y": 3},
{"x": 5.75, "y": 3},
{"x": 6.75, "y": 3},
{"x": 7.75, "y": 3},
{"x": 8.75, "y": 3},
{"x": 9.75, "y": 3},
{"x": 10.75, "y": 3},
{"x": 11.75, "y": 3},
{"x": 12.75, "y": 3, "w": 2.25},
{"x": 15, "y": 2.6, "h": 1.2},
{"x": 0, "y": 4, "w": 2.25},
{"x": 2.25, "y": 4},
{"x": 3.25, "y": 4},
{"x": 4.25, "y": 4},
{"x": 5.25, "y": 4},
{"x": 6.25, "y": 4},
{"x": 7.25, "y": 4},
{"x": 8.25, "y": 4},
{"x": 9.25, "y": 4},
{"x": 10.25, "y": 4},
{"x": 11.25, "y": 4},
{"x": 12.25, "y": 4, "w": 1.75},
{"x": 14, "y": 4},
{"x": 15, "y": 3.8, "h": 1.2},
{"x": 0, "y": 5, "w": 1.25},
{"x": 1.25, "y": 5, "w": 1.25},
{"x": 2.5, "y": 5, "w": 1.25},
{"x": 3.75, "y": 5, "w": 5.5},
{"x": 9.25, "y": 5, "w": 1.25},
{"x": 10.5, "y": 5, "w": 1.25},
{"x": 11.75, "y": 5, "w": 1.25},
{"x": 13, "y": 5},
{"x": 14, "y": 5},
{"x": 15, "y": 5}
]
}
}

View File

@ -1,9 +1,3 @@
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
CONSOLE_ENABLE = no # Console for debug(+400)
COMMAND_ENABLE = yes # Commands for debug and configuration
MOUSEKEY_ENABLE = yes
CONSOLE_ENABLE = no
NKRO_ENABLE = yes
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.

View File

@ -46,8 +46,6 @@ The Astar mini has all pins exposed , so you can do 18x8
If you want a speaker, LEDs, etc., you'll need to free up a pin. I recommend joining columns
R and L to the same pin.
Building - add ASTAR=1 to the compile line or leave out for teensy2++
Make example for this keyboard (after setting up your build environment):
make handwired/ms_sculpt_mobile:default

View File

@ -1,18 +1,3 @@
# MCU name
ifdef ASTAR
MCU = atmega32u4
CFLAGS = -D ASTAR
else
MCU = at90usb1286
endif
# Bootloader selection
ifdef ASTAR
BOOTLOADER = caterina
else
BOOTLOADER = atmel-dfu
endif
# Build Options
# change yes to no to disable
#
@ -23,4 +8,7 @@ CONSOLE_ENABLE = yes # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
DEFAULT_FOLDER = handwired/ms_sculpt_mobile/teensy2pp

View File

@ -0,0 +1,6 @@
#pragma once
#define PRODUCT sculpt mobile teensypp
#define MATRIX_ROW_PINS { F7, F6, F4, F5, F3, F2, F1, F0 }
#define MATRIX_COL_PINS { B7, D0, D1, D2, D3, D4, D5, D6, D7, E0, E1, C1, C0, C3, C2, C5, C4, C7 }

View File

@ -0,0 +1,5 @@
# MCU name
MCU = at90usb1286
# Bootloader selection
BOOTLOADER = halfkay