Massdrop keyboard support #3780

patrickmt · 2018-08-28T14:23:01Z

This pull request adds support for new Massdrop keyboards, including the CTRL and ALT, utilizing Microchip's ATSAMD51 MCU, Microchip's USB2422 2-Port USB Hub controller, ISSI's 3733 Matrix LED Driver, and RGB lighting controls.

Massdrop SAMD51 keyboards initial project upload

Removing files that were relocated and not deleted from previous location

Cleaned some white space or comments. Fix for LED I2C command queue. Cleaned up interrupts. Added debug function for printing numbers to scope through m15 line.

Ability to use factory programmed serial in hub and keyboard usb descriptors

Added support for factory programmed serial and usage. Incorporated bootloader's conditional compiling to align project closer. Fixed issue when USB device attempted to send before enabled. General white space and comment cleanup.

Cleaned up project in terms of white space, commented code, and unecessary files. NKRO keyboard is now using correct setreport although KBD was fine to use. Fixed broken linkage to __xprintf for serial debug statements.

Fixed possible USB hang on extra keys report set missing

I2C cleanup and file renames necessary for master branch merge

Added optional boot debug trace mode through debug LED codes. General clock code cleanup.

Moved ARM/Atmel header folder from drivers to lib and made necessary makefile changes.

drashna · 2018-08-28T15:10:22Z

Looks like both boards are failing Travis CI with the same error:

keyboards/alt67/led_programs.c:1:0: error: target CPU does not support ARM mode

So it looks like an issue with the ARM_ATSAM integration here. Something isn't quite right.

drashna · 2018-08-28T15:17:58Z

keyboards/alt67/keymaps/default/keymap.c

@@ -0,0 +1,211 @@
+#include "alt67.h"


Could you replace this with #include QMK_KEYBOARD_H?

drashna · 2018-08-28T15:19:25Z

keyboards/alt67/keymaps/default/keymap.c

@@ -0,0 +1,211 @@
+#include "alt67.h"
+
+#include "samd51j18a.h"


Most, if not all of thes includes should be handled by quantum.h. And the ones that aren't, should be handled by the keyboard's h file (included with QMK_KEYBOARD_H)

If you could remove/move these to the keyboard h?

drashna · 2018-08-28T15:21:25Z

keyboards/alt67/keymaps/default/keymap.c

+keymap_config_t keymap_config;
+
+const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = KEYMAP(


Could you replace all of the KEYMAPs with LAYOUT?

We've been moving over from one to the other.

drashna · 2018-08-28T15:22:17Z

keyboards/alt67/keymaps/default/keymap.c

+ */
+};
+
+const uint16_t fn_actions[] = {


This isn't needed. MO(1) does the same thing here.

Though, I think this is a holdover from the old template.

drashna · 2018-08-28T15:23:15Z

keyboards/alt67/alt67.h

+#ifndef _ALT67_H_
+#define _ALT67_H_
+
+#include "samd51j18a.h"


This should include the quantum.h file as well.

drashna · 2018-08-28T15:40:26Z

keyboards/ctrl/keymaps/default/keymap.c

+keymap_config_t keymap_config;
+
+const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = KEYMAP(


Could you replace all of the KEYMAPs with LAYOUT?

patrickmt · 2018-08-28T19:27:19Z

keyboards/ctrl/matrix.c

+uint8_t col_ports[] = { MATRIX_COL_PORTS };
+uint8_t col_pins[] = { MATRIX_COL_PINS };
+uint32_t row_masks[2]; //NOTE: If more than PA PB used in the future, adjust code to accomodate
+


This change is in the file but request still shows

drashna · 2018-08-28T15:43:23Z

keyboards/ctrl/matrix.c

+ PORT->Group[col_ports[col]].DIRSET.reg = 1 << col_pins[col]; //Output
+ PORT->Group[col_ports[col]].OUTCLR.reg = 1 << col_pins[col]; //Low
+ }
+}


Please add matrix_init_quantum here

drashna · 2018-08-28T15:44:36Z

keyboards/ctrl/matrix.c

+
+ //m15_on; //Profiling scans
+
+ return 1;


Please add matrix_scan_quantum() here.

drashna · 2018-08-28T15:45:58Z

keyboards/ctrl/rules.mk

+# Build Options
+# comment out to disable the options.
+#
+#MOUSEKEY_ENABLE = yes # Mouse keys


Could you make sure that you have the whole block here?

BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) MOUSEKEY_ENABLE = yes # Mouse keys(+4700) EXTRAKEY_ENABLE = yes # Audio control and System control(+450) CONSOLE_ENABLE = yes # Console for debug(+400) COMMAND_ENABLE = yes # Commands for debug and configuration # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work NKRO_ENABLE = no # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config) UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID AUDIO_ENABLE = no # Audio output on port C6 FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400)

Just turn off (set to no) the features you don't want/need

Pull request changes

patrickmt · 2018-08-28T19:00:35Z

keyboards/alt67/keymaps/default/keymap.c

+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME, \
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, \
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, \
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_FN0, KC_LEFT, KC_DOWN, KC_RGHT \


Changed KC_FN0 to MO(1) for next commit

patrickmt · 2018-08-28T19:01:19Z

keyboards/ctrl/keymaps/default/keymap.c

+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, \
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_FN0, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \


Changed KC_FN0 to MO(1) for next commit

Keymap fix for momentary layer. Potential compile flag fix for Travis CI failure.

drashna · 2018-08-28T21:19:53Z

Looks like it's failing on a new error for the ATSAM stuff.

drashna · 2018-08-29T00:22:17Z

Specifically, it looks like it's failing at:

In file included from tmk_core/protocol/arm_atsam/arm_atsam_protocol.h:39:0,
                 from tmk_core/protocol/arm_atsam/adc.c:18:
tmk_core/protocol/arm_atsam/./usb/spfssf.h:50:44: error: unknown type name 'va_list'
 int vspf(char *_Dest, const char *_Format, va_list va);

Looks like va_list isn't defined right, or is missing an include in that folder.

Fix for va_list compile failure

Fixes for include files with incorrect case

drashna · 2018-08-29T15:51:48Z

Only thing missing now is readme's for the boards. :)

You can find the template here: https://github.com/qmk/qmk_firmware/blob/master/quantum/template/avr/readme.md

Added ctrl and alt67 keyboard readme files

drashna · 2018-08-29T18:47:07Z

Awesome!

The keyboard stuff looks great to me.

@jackhumbert, @skullydazed, and/or @fredizzimo, if you wanted to review the ATSAM ARM stuff, and the keyboard?

jackhumbert · 2018-08-29T19:07:48Z

Awesome - this looks good! Thanks for the review and quick changes :)

* 'master' of https://github.com/qmk/qmk_firmware: (73 commits) Keymap: Updated keymap with the "pretty" layout (qmk#3812) Keyboard: CTRL and ALT updates (qmk#3810) Docs: Tabulate Modifier & Mod-Tap keycode listings in advanced keycodes docs (qmk#3799) Keymap: Wanleg updates (qmk#3794) Keymap: Added new tada68 keymap (qmk#3788) Tweak the wording in "Becoming a QMK Collaborator" Docs: add process_terminal() and update links to other functions (qmk#3778) Keymap: Update keymap including LAYOUT_planck_grid (qmk#3779) Keyboard: remove old comment from keyboards/helix/rules.mk (qmk#3795) Keyboard: Update CTRL and ALT keyboard readme (qmk#3796) Mask off keycode/layer/mod where possible in LT(), MT(), etc. (qmk#3430) Autodetect lack of screen presence Massdrop keyboards readme update (qmk#3791) move massdrop boards into its own directory for configurator visibility STM32 EEPROM Emulation (qmk#3741) Massdrop keyboard support (qmk#3780) Keymap: Add german layout for redox keyboard (qmk#3695) Keyboard: Adding the AT101 PCB (qmk#3785) Updated templates for use by new_project.sh (qmk#3783) Fixed bootloader target Fixed matching grep matches (for PRODUCT in particular) Fixed " Bootloader" concatenation for WSL (windows line-endings) ...

* Massdrop SAMD51 Massdrop SAMD51 keyboards initial project upload * Removing relocated files Removing files that were relocated and not deleted from previous location * LED queue fix and cleaning Cleaned some white space or comments. Fix for LED I2C command queue. Cleaned up interrupts. Added debug function for printing numbers to scope through m15 line. * Factory programmed serial usage Ability to use factory programmed serial in hub and keyboard usb descriptors * USB serial number and bugfix Added support for factory programmed serial and usage. Incorporated bootloader's conditional compiling to align project closer. Fixed issue when USB device attempted to send before enabled. General white space and comment cleanup. * Project cleanup Cleaned up project in terms of white space, commented code, and unecessary files. NKRO keyboard is now using correct setreport although KBD was fine to use. Fixed broken linkage to __xprintf for serial debug statements. * Fix for extra keys Fixed possible USB hang on extra keys report set missing * I2C cleanup I2C cleanup and file renames necessary for master branch merge * Boot tracing and clocks cleanup Added optional boot debug trace mode through debug LED codes. General clock code cleanup. * Relocate ARM/Atmel headers Moved ARM/Atmel header folder from drivers to lib and made necessary makefile changes. * Pull request changes Pull request changes * Keymap and compile flag fix Keymap fix for momentary layer. Potential compile flag fix for Travis CI failure. * va_list include fix Fix for va_list compile failure * Include file case fixes Fixes for include files with incorrect case * ctrl and alt67 keyboard readme Added ctrl and alt67 keyboard readme files

patrickmt added 14 commits June 13, 2018 15:04

Massdrop SAMD51

d8fcbf8

Massdrop SAMD51 keyboards initial project upload

Removing relocated files

194fa89

Removing files that were relocated and not deleted from previous location

LED queue fix and cleaning

36ddeae

Cleaned some white space or comments. Fix for LED I2C command queue. Cleaned up interrupts. Added debug function for printing numbers to scope through m15 line.

Factory programmed serial usage

c4942e0

Ability to use factory programmed serial in hub and keyboard usb descriptors

USB serial number and bugfix

dd4d48f

Added support for factory programmed serial and usage. Incorporated bootloader's conditional compiling to align project closer. Fixed issue when USB device attempted to send before enabled. General white space and comment cleanup.

Merge remote-tracking branch 'upstream/master' into md_d51

351d54c

Project cleanup

8934c83

Cleaned up project in terms of white space, commented code, and unecessary files. NKRO keyboard is now using correct setreport although KBD was fine to use. Fixed broken linkage to __xprintf for serial debug statements.

Merge remote-tracking branch 'upstream/master' into md_d51

46b6f92

Fix for extra keys

b97b8ba

Fixed possible USB hang on extra keys report set missing

Merge branch 'master' into md_d51

12ddd30

I2C cleanup

16d1adb

I2C cleanup and file renames necessary for master branch merge

Boot tracing and clocks cleanup

b418ae1

Added optional boot debug trace mode through debug LED codes. General clock code cleanup.

Relocate ARM/Atmel headers

f7978eb

Moved ARM/Atmel header folder from drivers to lib and made necessary makefile changes.

Merge branch 'master' into md_d51

0d8db29

drashna added the keyboard label Aug 28, 2018

drashna requested changes Aug 28, 2018

View reviewed changes

Pull request changes

e5a1e73

Pull request changes

patrickmt commented Aug 28, 2018

View reviewed changes

Keymap and compile flag fix

dca097f

Keymap fix for momentary layer. Potential compile flag fix for Travis CI failure.

drashna approved these changes Aug 28, 2018

View reviewed changes

drashna added the in progress label Aug 29, 2018

patrickmt added 2 commits August 29, 2018 10:18

va_list include fix

fc1dd5e

Fix for va_list compile failure

Include file case fixes

5d75d21

Fixes for include files with incorrect case

drashna removed the in progress label Aug 29, 2018

drashna requested review from fredizzimo and jackhumbert August 29, 2018 15:49

drashna requested a review from skullydazed August 29, 2018 15:49

ctrl and alt67 keyboard readme

5b5246e

Added ctrl and alt67 keyboard readme files

jackhumbert merged commit 30680c6 into qmk:master Aug 29, 2018

patrickmt deleted the md_d51 branch August 30, 2018 13:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Massdrop keyboard support #3780

Massdrop keyboard support #3780

patrickmt commented Aug 28, 2018

drashna commented Aug 28, 2018

drashna Aug 28, 2018

drashna Aug 28, 2018

drashna Aug 28, 2018

drashna Aug 28, 2018

drashna Aug 28, 2018

drashna Aug 28, 2018

This comment was marked as resolved.

patrickmt Aug 28, 2018

drashna Aug 28, 2018

drashna Aug 28, 2018

drashna Aug 28, 2018

patrickmt Aug 28, 2018

patrickmt Aug 28, 2018

drashna commented Aug 28, 2018

drashna commented Aug 29, 2018

drashna commented Aug 29, 2018

drashna commented Aug 29, 2018

jackhumbert commented Aug 29, 2018

Massdrop keyboard support #3780

Massdrop keyboard support #3780

Conversation

patrickmt commented Aug 28, 2018

drashna commented Aug 28, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment was marked as resolved.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

drashna commented Aug 28, 2018

drashna commented Aug 29, 2018

drashna commented Aug 29, 2018

drashna commented Aug 29, 2018

jackhumbert commented Aug 29, 2018