Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Keymapping revs, revisions to documentation on API_SYSEX_ENABLE #924

Merged
merged 35 commits into from
Dec 2, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
04759d6
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Feb 7, 2016
4b682ea
Merge branch 'master' of github.com:cbbrowne/qmk_firmware
Oct 10, 2016
92ca956
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Oct 10, 2016
dbb8cba
Merge branch 'master' of github.com:cbbrowne/qmk_firmware
Oct 12, 2016
99ca59b
I keep mis-using UPPER|LOWER/SLASH, and getting RESET.
Oct 12, 2016
f74c560
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Oct 13, 2016
62e6789
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Oct 17, 2016
0469bd8
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Oct 17, 2016
778dbe4
Merge branch 'master' of github.com:cbbrowne/qmk_firmware
Oct 17, 2016
729b4cd
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Oct 18, 2016
976136a
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Oct 20, 2016
ed8efcf
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Oct 23, 2016
6a0313a
Merge branch 'master' of github.com:cbbrowne/qmk_firmware
Oct 23, 2016
2a2920d
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Oct 26, 2016
b903662
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Oct 31, 2016
930ae4b
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Nov 1, 2016
4f1cb9f
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Nov 6, 2016
a425566
Merge branch 'master' of github.com:cbbrowne/qmk_firmware
Nov 6, 2016
cdad01b
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Nov 7, 2016
83b67b0
Merge branch 'master' of github.com:cbbrowne/qmk_firmware
Nov 7, 2016
de3117f
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Nov 11, 2016
992ec01
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Nov 11, 2016
c609edc
Merge branch 'master' of github.com:cbbrowne/qmk_firmware
Nov 11, 2016
5b88e7a
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Nov 16, 2016
c05cbaf
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Nov 23, 2016
e3c735e
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Nov 25, 2016
5776f39
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Nov 28, 2016
ff1b563
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Nov 29, 2016
13eb2f8
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Dec 1, 2016
1f290f6
Make my builds smaller
Dec 1, 2016
b787ed9
More notes on .hex size protection
Dec 1, 2016
af4c44d
Improve docs on SYSEX bit
Dec 1, 2016
95a160b
Improve docs on memory usage
Dec 1, 2016
570e784
I want page-down/page-up - put those on LOWER-Left/Right near bottom …
Dec 2, 2016
f6e86cd
I also want page-down/page-up on UPPER layer
Dec 2, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions keyboards/planck/keymaps/cbbrowne/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
# the appropriate keymap folder that will get included automatically
#
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
MOUSEKEY_ENABLE = no # Mouse keys(+4700)
EXTRAKEY_ENABLE = no # Audio control and System control(+450)
CONSOLE_ENABLE = no # Console for debug(+400)
COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
Expand All @@ -16,10 +16,11 @@ AUDIO_ENABLE = yes # Audio output on port C6
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
API_SYSEX_ENABLE = yes # Enable SYSEX API (+5390)

# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend

ifndef QUANTUM_DIR
include ../../../../Makefile
endif
endif
3 changes: 3 additions & 0 deletions keyboards/planck/keymaps/cbbrowne/config.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#ifndef CONFIG_USER_H
#define CONFIG_USER_H

#define NO_DEBUG
#define NO_PRINT

#include "../../config.h"

#define LEADER_TIMEOUT 300
Expand Down
10 changes: 6 additions & 4 deletions keyboards/planck/keymaps/cbbrowne/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
- How about Alt-F1 thru Alt-F8?
- What's the keystroke to get from X to console these days?
- A layer for doing console switching would not be a bad idea
- I haven't got page-up/page-down, let's have that...
*/

enum layers {
Expand Down Expand Up @@ -94,6 +95,7 @@ enum macro_id {
#define SHIFTQUOTE MT(MOD_RSFT, KC_QUOT)
#define ALTRIGHT MT(MOD_LALT, KC_RGHT)
#define MVERSION M(M_VERSION)
#define ALTSLASH LALT(KC_SLSH)


/* Note that Planck has dimensions 4 rows x 12 columns */
Expand All @@ -109,14 +111,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_RAISE] = { /* RAISE */
{KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC},
{_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS},
{_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, QWERTY, KEYPAD, KEYPAD, RESET, _______},
{_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY}
{_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, QWERTY, KEYPAD, KEYPAD, ALTSLASH,_______},
{_______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, KC_VOLD, KC_VOLU, KC_PGUP}
},
[_LOWER] = { /* LOWER */
{KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC},
{_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE},
{_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, QWERTY, KEYPAD, KEYPAD, RESET, _______},
{_______, KEYPAD, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY}
{_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, QWERTY, KEYPAD, KEYPAD, ALTSLASH, _______},
{_______, KEYPAD, _______, _______, _______, _______, _______, _______, KC_PGDN, KC_VOLD, KC_VOLU, KC_PGUP}
},
[_KEYPAD] = { /* Key Pad */
{KC_ESC, USERNAME, MVERSION, KC_F10, KC_F11, KC_F12, KC_PGUP, KC_KP_ENTER, KC_7, KC_8, KC_9, KC_BSPC},
Expand Down
26 changes: 23 additions & 3 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,10 @@ This allows you output audio on the C6 pin (needs abstracting). See the [audio s

Use this to debug changes to variable values, see the [tracing variables](#tracing-variables) section for more information.

`API_SYSEX_ENABLE`

This enables using the Quantum SYSEX API to send strings (somewhere?)

### Customizing Makefile options on a per-keymap basis

If your keymap directory has a file called `Makefile` (note the filename), any Makefile options you set in that file will take precedence over other Makefile options for your particular keyboard.
Expand Down Expand Up @@ -1318,14 +1322,30 @@ You probably don't want to "brick" your keyboard, making it impossible
to rewrite firmware onto it. Here are some of the parameters to show
what things are (and likely aren't) too risky.

- If a keyboard map does not include RESET, then, to get into DFU
- If your keyboard map does not include RESET, then, to get into DFU
mode, you will need to press the reset button on the PCB, which
requires unscrewing some bits.
requires unscrewing the bottom.
- Messing with tmk_core / common files might make the keyboard
inoperable
- Too large a .hex file is trouble; `make dfu` will erase the block,
test the size (oops, wrong order!), which errors out, failing to
flash the keyboard
flash the keyboard, leaving it in DFU mode.
- To this end, note that the maximum .hex file size on Planck is
7000h (28672 decimal)
```Linking: .build/planck_rev4_cbbrowne.elf [OK]
Creating load file for Flash: .build/planck_rev4_cbbrowne.hex [OK]

Size after:
text data bss dec hex filename
0 22396 0 22396 577c planck_rev4_cbbrowne.hex
```
- The above file is of size 22396/577ch, which is less than
28672/7000h
- As long as you have a suitable alternative .hex file around, you
can retry, loading that one
- Some of the options you might specify in your keyboard's Makefile
consume extra memory; watch out for BOOTMAGIC_ENABLE,
MOUSEKEY_ENABLE, EXTRAKEY_ENABLE, CONSOLE_ENABLE, API_SYSEX_ENABLE
- DFU tools do /not/ allow you to write into the bootloader (unless
you throw in extra fruitsalad of options), so there is little risk
there.
Expand Down