From 226b5a22d8dd0e01970c4b78b9d911fb94eec803 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Tue, 4 Sep 2018 18:04:22 -0700 Subject: Update README pointers to new keyboardio Kaleidoscope bundle. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 79905bd..665961f 100644 --- a/README.md +++ b/README.md @@ -43,10 +43,10 @@ cd $HOME/Arduino ## Download hardware platform, including library source code ```sh -mkdir -p hardware/keyboardio +mkdir -p hardware ## then clone the hardware definitions to make them available to the arduino environment -git clone --recursive https://github.com/keyboardio/Arduino-Boards.git hardware/keyboardio/avr +git clone --recursive https://github.com/keyboardio/Kaleidoscope-Bundle-Keyboardio.git hardware/keyboardio ```` -- cgit v1.2.3 From 0ac41faab34d3ed6a0a6279f6693621568bd9a06 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Tue, 4 Sep 2018 18:24:02 -0700 Subject: Update travis.yml to point to new bundle repo --- .travis.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e7030ac..e3e64f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,15 @@ dist: trusty sudo: false os: - linux +addons: + apt: + packages: + - shellcheck install: - - git clone --depth 1 --recurse-submodules https://github.com/keyboardio/Arduino-Boards hardware/keyboardio/avr + - git clone --depth 1 --recurse-submodules https://github.com/keyboardio/Kaleidoscope-Bundle-Keyboardio hardware/keyboardio script: - make travis-test BOARD_HARDWARE_PATH=$(pwd)/hardware + - shellcheck bin/kaleidoscope-builder notifications: irc: channels: @@ -13,7 +18,7 @@ notifications: use_notice: true skip_join: true template: - - "%{repository_name}/%{branch} %{commit} by %{author}: %{commit_subject} %{build_url} %{message}" + - "%{repository_name}/%{branch} %{commit} by %{author}: %{commit_subject} %{build_url} %{message}" email: on_success: change on_failure: change -- cgit v1.2.3 From d99fdbd15bdd05ac2865b7a50be8674e44e2234c Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Tue, 4 Sep 2018 18:42:31 -0700 Subject: shellcheck should only be run in the Kaleidoscope repo --- .travis.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index e3e64f7..23d30cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,15 +2,10 @@ dist: trusty sudo: false os: - linux -addons: - apt: - packages: - - shellcheck install: - git clone --depth 1 --recurse-submodules https://github.com/keyboardio/Kaleidoscope-Bundle-Keyboardio hardware/keyboardio script: - make travis-test BOARD_HARDWARE_PATH=$(pwd)/hardware - - shellcheck bin/kaleidoscope-builder notifications: irc: channels: -- cgit v1.2.3 From 7bb88bd5a511404f32d92510f461dc07c8b0e504 Mon Sep 17 00:00:00 2001 From: Wes Malone Date: Fri, 21 Sep 2018 15:21:17 -0500 Subject: Fix trailing whitespace and stray tab Signed-off-by: Wes Malone --- Model01-Firmware.ino | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Model01-Firmware.ino b/Model01-Firmware.ino index 23ecf4c..2789078 100644 --- a/Model01-Firmware.ino +++ b/Model01-Firmware.ino @@ -156,7 +156,7 @@ enum { PRIMARY, NUMPAD, FUNCTION }; // layers KEYMAPS( -#if defined (PRIMARY_KEYMAP_QWERTY) +#if defined (PRIMARY_KEYMAP_QWERTY) [PRIMARY] = KEYMAP_STACKED (___, Key_1, Key_2, Key_3, Key_4, Key_5, Key_LEDEffectNext, Key_Backtick, Key_Q, Key_W, Key_E, Key_R, Key_T, Key_Tab, @@ -189,7 +189,7 @@ KEYMAPS( Key_RightShift, Key_LeftAlt, Key_Spacebar, Key_RightControl, ShiftToLayer(FUNCTION)), -#elif defined (PRIMARY_KEYMAP_COLEMAK) +#elif defined (PRIMARY_KEYMAP_COLEMAK) [PRIMARY] = KEYMAP_STACKED (___, Key_1, Key_2, Key_3, Key_4, Key_5, Key_LEDEffectNext, @@ -223,11 +223,11 @@ KEYMAPS( Key_RightShift, Key_LeftAlt, Key_Spacebar, Key_RightControl, ShiftToLayer(FUNCTION)), -#else +#else #error "No default keymap defined. You should make sure that you have a line like '#define PRIMARY_KEYMAP_QWERTY' in your sketch" -#endif +#endif @@ -260,7 +260,7 @@ KEYMAPS( Key_PcApplication, Consumer_Mute, Consumer_VolumeDecrement, Consumer_VolumeIncrement, ___, Key_Backslash, Key_Pipe, ___, ___, Key_Enter, ___, ___) - ) // KEYMAPS( +) // KEYMAPS( /* Re-enable astyle's indent enforcement */ // *INDENT-ON* -- cgit v1.2.3 From 718aba9a43351e8bc327a71ce13167815809c622 Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Tue, 9 Oct 2018 00:57:05 +0200 Subject: Support an EEPROM-based keymap overlay & Focus This adds the necessary code to support having five additional layers in EEPROM. Also adds support for Focus, so these layers can be changed, and the default layer set, too. We also enable the EEPROM commands, which can be helpful in debugging and backing up one's EEPROM contents. Signed-off-by: Gergely Nagy --- Model01-Firmware.ino | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/Model01-Firmware.ino b/Model01-Firmware.ino index 2789078..371effb 100644 --- a/Model01-Firmware.ino +++ b/Model01-Firmware.ino @@ -16,6 +16,13 @@ // The Kaleidoscope core #include "Kaleidoscope.h" +// Support for storing the keymap in EEPROM +#include "Kaleidoscope-EEPROM-Settings.h" +#include "Kaleidoscope-EEPROM-Keymap.h" + +// Support for communicating with the host via a simple Serial protocol +#include "Kaleidoscope-FocusSerial.h" + // Support for keys that move the mouse #include "Kaleidoscope-MouseKeys.h" @@ -396,6 +403,22 @@ USE_MAGIC_COMBOS({.action = toggleKeyboardProtocol, // The order can be important. For example, LED effects are // added in the order they're listed here. KALEIDOSCOPE_INIT_PLUGINS( + // The EEPROMSettings & EEPROMKeymap plugins make it possible to have an + // editable keymap in EEPROM. + EEPROMSettings, + EEPROMKeymap, + + // Focus allows bi-directional communication with the host, and is the + // interface through which the keymap in EEPROM can be edited. + Focus, + + // FocusSettingsCommand adds a few Focus commands, intended to aid in changing some settings of the keyboard, such as the default layer (via the `settings.defaultLayer` command) + FocusSettingsCommand, + + // FocusEEPROMCommand adds a set of Focus commands, which are very helpful in + // both debugging, and in backing up one's EEPROM contents. + FocusEEPROMCommand, + // The boot greeting effect pulses the LED button for 10 seconds after the keyboard is first connected BootGreetingEffect, @@ -488,6 +511,12 @@ void setup() { // This avoids over-taxing devices that don't have a lot of power to share // with USB devices LEDOff.activate(); + + // To make the keymap editable without flashing new firmware, we store + // additional layers in EEPROM. For now, we reserve space for five layers. If + // one wants to use these layers, just set the default layer to one in EEPROM, + // by using the `settings.defaultLayer` Focus command. + EEPROMKeymap.setup(5, EEPROMKeymap.Mode::EXTEND); } /** loop is the second of the standard Arduino sketch functions. -- cgit v1.2.3 From 56a90f702e8e374a7d5267859d4154ad90b97269 Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Wed, 10 Oct 2018 07:20:03 +0200 Subject: Travis cleanup Remove the IRC notifications from Travis (we're not using IRC anymore). Signed-off-by: Gergely Nagy --- .travis.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 23d30cc..49b8c49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,13 +7,6 @@ install: script: - make travis-test BOARD_HARDWARE_PATH=$(pwd)/hardware notifications: - irc: - channels: - - "chat.freenode.net#keyboardio" - use_notice: true - skip_join: true - template: - - "%{repository_name}/%{branch} %{commit} by %{author}: %{commit_subject} %{build_url} %{message}" email: on_success: change on_failure: change -- cgit v1.2.3