diff options
| author | Drashna Jaelre <drashna@live.com> | 2019-11-20 12:37:24 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-20 12:37:24 -0800 |
| commit | eb91c962886b1bb52c2d457a574cba09e2a8b0f0 (patch) | |
| tree | 20f3d49671b6d42ca1edf285431e3e4120551228 /keyboards/40percentclub | |
| parent | 8e8986b2506ca4cdd2339a441314a0838e3a4329 (diff) | |
[Keymap] All about (ARM) RGB and OLEDs (drashna keymaps) (#7354)
* Add Kyria Keymap
* Enable all RGBLIGHT Animations for ARM and high capacity AVR
* Reduce GNUC version for __has_include
* Cleanup Ortho 4x12 Community layout
* Update Collide 39 keymap
* Cleanup Keymaps
* Enable full 30 LEDs for Ergodox
* Change EEPROM Load timing
* Use RGB Matrix on Planck Rev6
* Use correct keymap swap
* Enable everything for ARM
* Only enable rgb sleep on avr until crash is fixed
* Add additional Kyria keymap config
* Overhaul Kyria OLED display
* Improve kyria keymap based on usage
* Minor tweaks to rules
* Update OLED code to truncate properly
* Fix RGB Light layer indication
* Switch all of biton32 to get_highest_layer function
* Fix OLED Keylogger display
* Run qmk cformat over all of my user files
* Slight tweak to kyria based on usage
* Move around LALT_T config
* Add comments about base wrappers to keymaps
* Another cformat pass
* Temp fix for VUSB boards and NKRO
* Convert tabs to spaces in rules.mk files
* Only enable RGBLight if it's enabled
* Add Encoder Flip setting
* Update OLED font file
Diffstat (limited to 'keyboards/40percentclub')
| -rw-r--r-- | keyboards/40percentclub/nano/keymaps/drashna/keymap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/keyboards/40percentclub/nano/keymaps/drashna/keymap.c b/keyboards/40percentclub/nano/keymaps/drashna/keymap.c index 6c5b974572..668178967b 100644 --- a/keyboards/40percentclub/nano/keymaps/drashna/keymap.c +++ b/keyboards/40percentclub/nano/keymaps/drashna/keymap.c @@ -1,12 +1,11 @@ -#include QMK_KEYBOARD_H #include "drashna.h" #include "analog.c" #include "pointing_device.h" #include "pincontrol.h" - #define KC_X0 LT(_FN, KC_ESC) +// clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT( KC_VOLU, KC_MPLY, KC_MPRV, RESET, @@ -14,6 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; +// clang-format on // Joystick // Set Pins @@ -39,7 +39,7 @@ int16_t xOrigin, yOrigin; uint16_t lastCursor = 0; int16_t axisCoordinate(uint8_t pin, uint16_t origin) { - int8_t direction; + int8_t direction; int16_t distanceFromOrigin; int16_t range; @@ -57,8 +57,8 @@ int16_t axisCoordinate(uint8_t pin, uint16_t origin) { direction = 1; } - float percent = (float)distanceFromOrigin / range; - int16_t coordinate = (int16_t)(percent * 100); + float percent = (float)distanceFromOrigin / range; + int16_t coordinate = (int16_t)(percent * 100); if (coordinate < 0) { return 0; } else if (coordinate > 100) { |