summaryrefslogtreecommitdiff
path: root/keyboards/helix/pico
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2020-11-28 12:02:18 -0800
committerGitHub <noreply@github.com>2020-11-28 12:02:18 -0800
commitc66df1664497546f32662409778731143e45a552 (patch)
treeda73a2d532a27685a31d932b3a44a707d4a3af81 /keyboards/helix/pico
parent15385d4113414d42bd062c60c9de5df797d3157f (diff)
2020 November 28 Breaking Changes Update (#11053)
* Branch point for 2020 November 28 Breaking Change * Remove matrix_col_t to allow MATRIX_ROWS > 32 (#10183) * Add support for soft serial to ATmega32U2 (#10204) * Change MIDI velocity implementation to allow direct control of velocity value (#9940) * Add ability to build a subset of all keyboards based on platform. * Actually use eeprom_driver_init(). * Make bootloader_jump weak for ChibiOS. (#10417) * Joystick 16-bit support (#10439) * Per-encoder resolutions (#10259) * Share button state from mousekey to pointing_device (#10179) * Add hotfix for chibios keyboards not wake (#10088) * Add advanced/efficient RGB Matrix Indicators (#8564) * Naming change. * Support for STM32 GPIOF,G,H,I,J,K (#10206) * Add milc as a dependency and remove the installed milc (#10563) * ChibiOS upgrade: early init conversions (#10214) * ChibiOS upgrade: configuration file migrator (#9952) * Haptic and solenoid cleanup (#9700) * XD75 cleanup (#10524) * OLED display update interval support (#10388) * Add definition based on currently-selected serial driver. (#10716) * New feature: Retro Tapping per key (#10622) * Allow for modification of output RGB values when using rgblight/rgb_matrix. (#10638) * Add housekeeping task callbacks so that keyboards/keymaps are capable of executing code for each main loop iteration. (#10530) * Rescale both ChibiOS and AVR backlighting. * Reduce Helix keyboard build variation (#8669) * Minor change to behavior allowing display updates to continue between task ticks (#10750) * Some GPIO manipulations in matrix.c change to atomic. (#10491) * qmk cformat (#10767) * [Keyboard] Update the Speedo firmware for v3.0 (#10657) * Maartenwut/Maarten namechange to evyd13/Evy (#10274) * [quantum] combine repeated lines of code (#10837) * Add step sequencer feature (#9703) * aeboards/ext65 refactor (#10820) * Refactor xelus/dawn60 for Rev2 later (#10584) * add DEBUG_MATRIX_SCAN_RATE_ENABLE to common_features.mk (#10824) * [Core] Added `add_oneshot_mods` & `del_oneshot_mods` (#10549) * update chibios os usb for the otg driver (#8893) * Remove HD44780 References, Part 4 (#10735) * [Keyboard] Add Valor FRL TKL (+refactor) (#10512) * Fix cursor position bug in oled_write_raw functions (#10800) * Fixup version.h writing when using SKIP_VERSION=yes (#10972) * Allow for certain code in the codebase assuming length of string. (#10974) * Add AT90USB support for serial.c (#10706) * Auto shift: support repeats and early registration (#9826) * Rename ledmatrix.h to match .c file (#7949) * Split RGB_MATRIX_ENABLE into _ENABLE and _DRIVER (#10231) * Split LED_MATRIX_ENABLE into _ENABLE and _DRIVER (#10840) * Merge point for 2020 Nov 28 Breaking Change
Diffstat (limited to 'keyboards/helix/pico')
-rw-r--r--keyboards/helix/pico/keymaps/default/readme.md6
-rw-r--r--keyboards/helix/pico/local_features.mk60
-rw-r--r--keyboards/helix/pico/qmk_conf/config.h43
-rw-r--r--keyboards/helix/pico/qmk_conf/rules.mk4
-rw-r--r--keyboards/helix/pico/sc/back/rules.mk1
-rw-r--r--keyboards/helix/pico/sc/rules.mk1
-rw-r--r--keyboards/helix/pico/sc/under/rules.mk1
7 files changed, 91 insertions, 25 deletions
diff --git a/keyboards/helix/pico/keymaps/default/readme.md b/keyboards/helix/pico/keymaps/default/readme.md
index 3c097247e5..789097021b 100644
--- a/keyboards/helix/pico/keymaps/default/readme.md
+++ b/keyboards/helix/pico/keymaps/default/readme.md
@@ -116,15 +116,13 @@ build
```
$ make helix/pico:default
$ make helix/pico/back:default # with backlight
-$ make HELIX=no_ani helix/pico/back:default # with backlight without animation
+$ make HELIX=no-ani helix/pico/back:default # with backlight without animation
$ make helix/pico/under:default # with underglow
```
-build (experimental use of split_common)
+build (experimental use of split_common with backlight)
```
$ make helix/pico/sc:default
-$ make helix/pico/sc/back:default
-$ make helix/pico/sc/under:default
```
flash to keyboard
diff --git a/keyboards/helix/pico/local_features.mk b/keyboards/helix/pico/local_features.mk
index a984446868..25dcb8b6d3 100644
--- a/keyboards/helix/pico/local_features.mk
+++ b/keyboards/helix/pico/local_features.mk
@@ -5,6 +5,8 @@
# combinations of standard options) into QMK standard options.
#
+KEYBOARD_LOCAL_FEATURES_MK :=
+
define HELIX_CUSTOMISE_MSG
$(info Helix Spacific Build Options)
$(info - OLED_ENABLE = $(OLED_ENABLE))
@@ -15,42 +17,61 @@ define HELIX_CUSTOMISE_MSG
$(info )
endef
+define HELIX_HELP_MSG
+ $(info Helix keyboard convenient command line option)
+ $(info - make HELIX=<options> helix/pico:<keymap>)
+ $(info - option= oled | back | under | na | no-ani)
+ $(info - ios | sc | split-common | scan | verbose)
+ $(info - ex.)
+ $(info - make HELIX=oled helix/pico:<keymap>)
+ $(info - make HELIX=back helix/pico:<keymap>)
+ $(info - make HELIX=under helix/pico:<keymap>)
+ $(info - make HELIX=back,na helix/pico:<keymap>)
+ $(info - make HELIX=back,ios helix/pico:<keymap>)
+ $(info )
+endef
+
ifneq ($(strip $(HELIX)),)
- ### Helix keyboard keymap: convenient command line option
- ## make HELIX=<options> helix/pico:<keymap>
- ## option= oled | back | under | no_ani | na | ios | verbose
- ## ex.
- ## make HELIX=oled helix/pico:<keymap>
- ## make HELIX=oled,back helix/pico:<keymap>
- ## make HELIX=oled,under helix/pico:<keymap>
- ## make HELIX=oled,back,na helix/pico:<keymap>
- ## make HELIX=oled,back,ios helix/pico:<keymap>
- ##
- ifeq ($(findstring oled,$(HELIX)), oled)
+ COMMA=,
+ helix_option := $(subst $(COMMA), , $(HELIX))
+ ifneq ($(filter help,$(helix_option)),)
+ $(eval $(call HELIX_HELP_MSG))
+ $(error )
+ endif
+ ifneq ($(filter oled,$(helix_option)),)
OLED_ENABLE = yes
endif
- ifeq ($(findstring back,$(HELIX)), back)
+ ifneq ($(filter back,$(helix_option)),)
LED_BACK_ENABLE = yes
- else ifeq ($(findstring under,$(HELIX)), under)
+ else ifneq ($(filter under,$(helix_option)),)
LED_UNDERGLOW_ENABLE = yes
endif
- ifeq ($(findstring na,$(HELIX)), na)
+ ifneq ($(filter na,$(helix_option)),)
LED_ANIMATIONS = no
endif
- ifeq ($(findstring no_ani,$(HELIX)), no_ani)
+ ifneq ($(filter no_ani,$(helix_option)),)
LED_ANIMATIONS = no
endif
- ifeq ($(findstring ios,$(HELIX)), ios)
+ ifneq ($(filter no-ani,$(helix_option)),)
+ LED_ANIMATIONS = no
+ endif
+ ifneq ($(filter ios,$(helix_option)),)
IOS_DEVICE_ENABLE = yes
endif
- ifeq ($(findstring scan,$(HELIX)), scan)
+ ifneq ($(filter sc,$(helix_option)),)
+ SPLIT_KEYBOARD = yes
+ endif
+ ifneq ($(filter split-common,$(helix_option)),)
+ SPLIT_KEYBOARD = yes
+ endif
+ ifneq ($(filter scan,$(helix_option)),)
# use DEBUG_MATRIX_SCAN_RATE
# see docs/newbs_testing_debugging.md
OPT_DEFS += -DDEBUG_MATRIX_SCAN_RATE
CONSOLE_ENABLE = yes
SHOW_VERBOSE_INFO = yes
endif
- ifeq ($(findstring verbose,$(HELIX)), verbose)
+ ifneq ($(filter verbose,$(helix_option)),)
SHOW_VERBOSE_INFO = yes
endif
SHOW_HELIX_OPTIONS = yes
@@ -120,7 +141,8 @@ ifneq ($(strip $(SHOW_HELIX_OPTIONS)),)
$(info -- OLED_DRIVER_ENABLE = $(OLED_DRIVER_ENABLE))
$(info -- CONSOLE_ENABLE = $(CONSOLE_ENABLE))
$(info -- OPT_DEFS = $(OPT_DEFS))
- $(info -- LTO_ENABLE = $(LTO_ENABLE))
+ $(info -- SPLIT_KEYBOARD = $(SPLIT_KEYBOARD))
+ $(info -- LTO_ENABLE = $(LTO_ENABLE))
$(info )
endif
endif
diff --git a/keyboards/helix/pico/qmk_conf/config.h b/keyboards/helix/pico/qmk_conf/config.h
new file mode 100644
index 0000000000..7653185198
--- /dev/null
+++ b/keyboards/helix/pico/qmk_conf/config.h
@@ -0,0 +1,43 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+// place overrides here
+
+#ifdef AUDIO_ENABLE
+ #define STARTUP_SONG SONG(STARTUP_SOUND)
+ #define AUDIO_CLICKY
+#endif
+
+// If you need more program area, try select and reduce rgblight modes to use.
+
+// Selection of RGBLIGHT MODE to use.
+#if defined(LED_ANIMATIONS)
+ #define RGBLIGHT_EFFECT_BREATHING
+ #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+ #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+ #define RGBLIGHT_EFFECT_SNAKE
+ #define RGBLIGHT_EFFECT_KNIGHT
+ #define RGBLIGHT_EFFECT_CHRISTMAS
+ #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+ //#define RGBLIGHT_EFFECT_RGB_TEST
+ //#define RGBLIGHT_EFFECT_ALTERNATING
+#endif
diff --git a/keyboards/helix/pico/qmk_conf/rules.mk b/keyboards/helix/pico/qmk_conf/rules.mk
new file mode 100644
index 0000000000..966e64d618
--- /dev/null
+++ b/keyboards/helix/pico/qmk_conf/rules.mk
@@ -0,0 +1,4 @@
+EXTRAKEY_ENABLE = yes # Audio control and System control
+AUDIO_ENABLE = yes # Audio output on port B5
+
+include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))
diff --git a/keyboards/helix/pico/sc/back/rules.mk b/keyboards/helix/pico/sc/back/rules.mk
deleted file mode 100644
index 066fffb74a..0000000000
--- a/keyboards/helix/pico/sc/back/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LED_BACK_ENABLE = yes
diff --git a/keyboards/helix/pico/sc/rules.mk b/keyboards/helix/pico/sc/rules.mk
index d38a618090..4ed0672a70 100644
--- a/keyboards/helix/pico/sc/rules.mk
+++ b/keyboards/helix/pico/sc/rules.mk
@@ -1 +1,2 @@
SPLIT_KEYBOARD = yes
+LED_BACK_ENABLE = yes
diff --git a/keyboards/helix/pico/sc/under/rules.mk b/keyboards/helix/pico/sc/under/rules.mk
deleted file mode 100644
index a37aa6fab3..0000000000
--- a/keyboards/helix/pico/sc/under/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LED_UNDERGLOW_ENABLE = yes