From 60cd12f8a4ac82b1dcb2c8ec0f0231c2004507ce Mon Sep 17 00:00:00 2001 From: Erovia Date: Sun, 6 Oct 2019 20:15:17 +0200 Subject: Dimple: Fix Caps Lock LED behaviour (#6936) * Dimple: Fix Caps Lock LED behaviour * Dimple: fix helper functions and cleanup unnecessary code --- keyboards/lazydesigners/dimple/config.h | 6 ------ keyboards/lazydesigners/dimple/dimple.c | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'keyboards/lazydesigners/dimple') diff --git a/keyboards/lazydesigners/dimple/config.h b/keyboards/lazydesigners/dimple/config.h index 9814d1050c..5c36a72527 100644 --- a/keyboards/lazydesigners/dimple/config.h +++ b/keyboards/lazydesigners/dimple/config.h @@ -58,9 +58,3 @@ along with this program. If not, see . /* #define RGBLIGHT_SAT_STEP 8 */ /* #define RGBLIGHT_VAL_STEP 8 */ #endif - -/* CapsLock LED */ -#define BACKLIGHT_PIN E6 -#ifdef BACKLIGHT_PIN - #define BACKLIGHT_LEVELS 6 -#endif diff --git a/keyboards/lazydesigners/dimple/dimple.c b/keyboards/lazydesigners/dimple/dimple.c index 69fb2253fc..6bbb9a0477 100644 --- a/keyboards/lazydesigners/dimple/dimple.c +++ b/keyboards/lazydesigners/dimple/dimple.c @@ -16,11 +16,11 @@ #include "dimple.h" void dimple_led_on() { - writePinHigh(E6); + writePinLow(E6); } void dimple_led_off() { - writePinLow(E6); + writePinHigh(E6); } void keyboard_pre_init_kb(void) { -- cgit v1.2.3 From c26faed2b60e59293f631e041619567f23a93406 Mon Sep 17 00:00:00 2001 From: tominabox1 Date: Fri, 18 Oct 2019 20:15:57 -0500 Subject: [Keymap] Tominabox1 userspace creation (#7014) * rebaselined the whole fork and added cool matrix animations * Updated dfu bootloader rules, oleds working on test map * Moving test branch into main moving my _test branch files into the main since the repo is now in the dev branch, don't see any reason to keep separate folders. * Update keymap.c Adding DOT to number layer * added LED sleeping * working on getting matrix rgb to sleep upon usb suspend uploading to github for qmk staff help * Added master sleep on usb suspend Unfortunately the sleep function does not work on the slave side so will probably revert this change later * bringing hhkb config up to current with other tominabox1 configs * Update config.h since master side is the only one that sleeps, going to disable this for now. * testing oled stuff * Update rules.mk * tinkering with oled still * Finally fixed custom image with corne doug * Adding keymap to dimple instead of screwing up the upstream references. * Changed oled image to peepo ggers * working on oled sleep * Update keymap.c * fixes oled wake/sleep issues * Adding :b: and BEPIS macros * Update .gitignore * Cleaning up and improving documentation * Update keymap.c * Adding my minivan keymap * Fixed error on keymap * fixed OLEDs not turning on and moved tapping term to the keymap file * Changed tapping term from 200 to 250 * Revised Fkey layers, arrows, question mark locations * Update keymap.c * tweaked tapping term and types on CRKBD, revised layout on HHKB * Update keymap.c * general code cleanup, keymap displays * Set up userspace for common keymap elements * tapping term stuff for shift * testing * Fixed new tapdance for accessing number and fkey layers * Update tominabox1.h * stuff * fixing function calls for userspace * cleaning up crkbd config and moving stuff to userspace * finally fixed oled lightup issues * cleaning up a few maps and rules * Removing permissive hold and returning spacefn to all boards. * Settting up wrapper keymaps for Dimple, Minivan, and Corne Wrappers * small tweaks * Update wrappers.h * finishing wrappers on Minivan and Dimple * Revised tapping term definition Providing additional tapping term config for CRKBD only. * Code cleanup and documentation * Update readme.md * Update readme.md * Wrapers and continued code cleanup and documentation * moved oled py scripts to user folder * completed wrapper implementation of CRKBD * added matrix startup mode - not working yet pending upstream changes * removed unused code in tominabox1.c * Fixing custom keycodes and tap dance indices fixed custom keycodes and tap dance indices Adding beginning of dimple RGB matrix definition changed oled on corne to scrolling matrix thing Added copy pasta * Secondary layer tweaks Swapping hands of numbers and symbols as well as tweaking tapping terms accordingly * Update tominabox1.c Continued refinement of tapping term to support better right hand symbol access. * Fixes from pr 7014 Removed gitignore data from qmk master Reverted changes to Drashna's crkbd keymap Accepted changes to crkbd keymap Added ignore to hhkb keymap - I think I need this because Teensy. Will revisit another time * Removing hhkb keymap for rework * Adding back hhkb keymap Re-adding hhkb folder with ignores * Reverting changes to Dimple default totally did not intend to modify these * Update keymap.c Reverting changes to Drashna's corne map * Accepting recommended changes * Reduced tap hold caps delay moved bootmagic enable to general usage Revised tapping terms Removed unused keycode defs * bootmagic * Update rules.mk * Fixed permissions (support 7014) and bootmagic addition Fixed permissions on Drashna's keymap and Dimple default keymap files. Adding bootmagic to my crkbd config. * Fixing permissions --- .../dimple/keymaps/tominabox1/keymap.c | 109 +++++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 keyboards/lazydesigners/dimple/keymaps/tominabox1/keymap.c (limited to 'keyboards/lazydesigners/dimple') diff --git a/keyboards/lazydesigners/dimple/keymaps/tominabox1/keymap.c b/keyboards/lazydesigners/dimple/keymaps/tominabox1/keymap.c new file mode 100644 index 0000000000..cdaade987f --- /dev/null +++ b/keyboards/lazydesigners/dimple/keymaps/tominabox1/keymap.c @@ -0,0 +1,109 @@ +#include QMK_KEYBOARD_H +#include "tominabox1.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Base COLEMAK layer + * ,---------------------------------------------------------------. + * |GEsc| Q | W | F | P | G | J | L | U | Y | : | Bspc | + * |---------------------------------------------------------------| + * |Tab-Ctl| A | R | S | T | D | H | N | E | I | O |Quote| + * |---------------------------------------------------------------| + * |Shft/Cap| Z | X | C | V | B | K | M | , | Up | . | + * |---------------------------------------------------------------| + * |Ctrl|Gui |Alt | Spc/Lwr | Spc/Rse |Left|Down|Rght| + * `-----------------------------------------------------' + */ + + [_BASE] = LAYOUT_wrapper( + __________________DIMPLE1__________________, + __________________DIMPLE2__________________, + __________________DIMPLE3L_________________,__________________DIMPLE3R_________________, + __________________DIMPLE4__________________ + ), + +/* Lower Symbol Layer + * ,---------------------------------------------------------------. + * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Del | + * |---------------------------------------------------------------| + * | Del | | | | | | | _ | + | { | } | | | + * |---------------------------------------------------------------| + * | | | | | | | | | ; |PgUp| ? | + * |---------------------------------------------------------------| + * | | | | | |Home|PgDn|End | + * `-----------------------------------------------------' + */ + + [_LOWER] = LAYOUT_wrapper( + _________________LOWER_1___________________, + _________________LOWER_2___________________, + _________________LOWER_3___________________, + _________________LOWER_4___________________ + ), + +/* Raise Number Layer + * ,---------------------------------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bspc | + * |---------------------------------------------------------------| + * | Ins | | | | | | | - | = | [ | ] | \ | + * |---------------------------------------------------------------| + * | | | | | | | | | | . | / | + * |---------------------------------------------------------------| + * |VolD|Mute|VolU| | | | | | + * `-----------------------------------------------------' + */ + + [_RAISE] = LAYOUT_wrapper( + ___________________RAISE1__________________, + ___________________RAISE2__________________, + ___________________RAISE3__________________, + ___________________RAISE4__________________ + + ), + +/* Adjust Layer + * ,---------------------------------------------------------------. + * |RST |EEP | | | | | | | | | | | + * |---------------------------------------------------------------| + * | MP | | | | | | | | | | | | + * |---------------------------------------------------------------| + * | MODE | HUI| HUD|M_SN| | | | | | | | + * |---------------------------------------------------------------| + * |RGB-|RGB |RGB+| | | | | | + * `-----------------------------------------------------' + */ + + [_ADJUST] = LAYOUT_wrapper( + ___________________ADJST1__________________, + ___________________ADJST2__________________, + ___________________ADJST3__________________, + ___________________ADJST4__________________ + + ), +/* Fkey Layer +* ,---------------------------------------------------------------. +* | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10| | +* |---------------------------------------------------------------| +* | | | | | | | | | | F11| F12| | +* |---------------------------------------------------------------| +* | | | | | | | | | | | | +* |---------------------------------------------------------------| +* | | | | | |FKEY| | | +* `-----------------------------------------------------' +*/ + + [_FKEY] = LAYOUT_wrapper( + ___________________FKEY1___________________, + ___________________FKEY2___________________, + ___________________FKEY3___________________, + ___________________FKEY4___________________ + ), +}; + +void led_set_user(uint8_t usb_led) { +if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) { + writePinLow(E6); + } else { + writePinHigh(E6); + } +} -- cgit v1.2.3 From e96cac0814995e2a0735708727cbab599d6cf5f1 Mon Sep 17 00:00:00 2001 From: fauxpark Date: Fri, 25 Oct 2019 07:50:13 +1100 Subject: Cleanup rules.mk for 32U4 keyboards, L-M (#7120) * Cleanup rules.mk for 32U4 keyboards, L-M * Move some stuff to keyboard level --- keyboards/lazydesigners/dimple/rules.mk | 40 ++------------------------------- 1 file changed, 2 insertions(+), 38 deletions(-) (limited to 'keyboards/lazydesigners/dimple') diff --git a/keyboards/lazydesigners/dimple/rules.mk b/keyboards/lazydesigners/dimple/rules.mk index a818e871c6..99e4911afa 100644 --- a/keyboards/lazydesigners/dimple/rules.mk +++ b/keyboards/lazydesigners/dimple/rules.mk @@ -1,50 +1,14 @@ # MCU name MCU = atmega32u4 -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -F_CPU = 16000000 - - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB = $(F_CPU) - -# Interrupt driven control endpoint task(+60) -OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT - - # Bootloader selection # Teensy halfkay # Pro Micro caterina # Atmel DFU atmel-dfu # LUFA DFU lufa-dfu # QMK DFU qmk-dfu -# atmega32a bootloadHID +# ATmega32A bootloadHID +# ATmega328P USBasp BOOTLOADER = atmel-dfu # Build Options -- cgit v1.2.3