Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit ead341d63c7a0c630a8eec0adcb709f11fb31266
Author: Alabastard-64 <[email protected]>
Date:   Mon Mar 6 00:27:58 2023 -0700

    linting...

commit c321309d9ee4d154c7bf8b02cf71f52839b6f244
Author: Alabastard-64 <[email protected]>
Date:   Mon Mar 6 00:13:36 2023 -0700

    fix up quantum keycodes and docs

commit 0ccc88521d97c45b7011f94f9e47731c26c2e953
Author: Alabastard-64 <[email protected]>
Date:   Sun Mar 5 23:11:28 2023 -0700

    big update to multi device control

commit 4c7c9556536b25b6fa6f81199a9865f582140664
Author: Alabastard-64 <[email protected]>
Date:   Mon Feb 27 04:06:40 2023 -0700

    simplify/optimize, add keycodes for device switching

commit ed670f98f14146a4fbfc89bcf3f441b7146c5f2f
Author: Alabastard-64 <[email protected]>
Date:   Sun Feb 26 19:02:27 2023 -0700

    linting and keycode fix

commit c5eb29da73008503f9cbece238926a6b629efaaf
Author: Alabastard-64 <[email protected]>
Date:   Sun Feb 26 18:32:48 2023 -0700

    allow for multiple pointing device control

commit 1adaf77363746bc8b3dc767ab8930c7d28dc2aa7
Author: Alabastard-64 <[email protected]>
Date:   Sun Feb 19 20:08:25 2023 -0700

    as always... linting

commit c5f7ff1b30bb4b7118db90e321e980e557ba0279
Author: Alabastard-64 <[email protected]>
Date:   Sun Feb 19 20:00:19 2023 -0700

    some more fixes and docs

commit 5e095c809b0f9476dbde354a1d26f01b21f32b3e
Author: Alabastard-64 <[email protected]>
Date:   Sun Feb 19 17:54:00 2023 -0700

    add changes suggested by drashna

commit d31d1dbfaa069e2d7af77288fd5eb87d238053d5
Author: Alabastard-64 <[email protected]>
Date:   Sat Feb 18 21:30:17 2023 -0700

    fix leftover Drag axis split and small doc update

commit 468b9d291ad74df1da9f3a123908b21126b928aa
Author: Alabastard-64 <[email protected]>
Date:   Wed Feb 8 21:54:10 2023 -0700

    remove axial divisors for drag scroll, fixes

commit 9f0cfc8c63926dcbf44865875c795a28b6d6d46a
Author: Alabastard-64 <[email protected]>
Date:   Mon Feb 6 06:48:18 2023 -0700

    linting again

commit 8d3e63dbaac6b3446cbca7c7b58a973e4b73db53
Author: Alabastard-64 <[email protected]>
Date:   Sun Feb 5 22:52:13 2023 -0700

    rebase and linting

commit e1160f57dfad544534639dbdcb15617d79d03207
Author: Alabastard-64 <[email protected]>
Date:   Sun Feb 5 22:37:27 2023 -0700

    remove fastcalc, fix bugs/optimize, and correct docs

commit e483787d3fa05b1f552afdcf1c4d9713add70dae
Author: Alabastard-64 <[email protected]>
Date:   Sun Jan 29 14:56:37 2023 -0700

    optimizations and cleanup some function argument changes

commit 9a91303e0501e74638e7febcfaa99e8685c7fe3e
Author: Alabastard-64 <[email protected]>
Date:   Sun Jan 29 11:45:04 2023 -0700

    update keycodes.h

commit 81b3be2848a7599db6aedc65a2d435e26bbcef55
Author: Alabastard-64 <[email protected]>
Date:   Sun Jan 29 11:34:09 2023 -0700

    update keycodes hjson version

commit 23d5b9225c7bffaef0ed26b40762790ac223a4ad
Author: Alabastard-64 <[email protected]>
Date:   Tue Jan 24 08:16:17 2023 -0700

    linting

commit bb86d69651cb39023885b96449accdce554fa9db
Author: Alabastard-64 <[email protected]>
Date:   Tue Jan 24 08:13:49 2023 -0700

    fixup documentation

commit f3cf283bf284c86a2a1dcfddcc12798105a46a4c
Author: Alabastard-64 <[email protected]>
Date:   Tue Jan 24 07:42:33 2023 -0700

    fix bug with fastcalc and update doc

commit 11cd644682b9bbd624b4772fbaf335f725d32015
Author: Alabastard-64 <[email protected]>
Date:   Mon Jan 23 23:04:54 2023 -0700

    doc cleanup

commit 1a6f19f68001be0707f3c01e436875daf290000d
Author: Alabastard-64 <[email protected]>
Date:   Mon Jan 23 23:01:57 2023 -0700

    doc cleanup

commit 7f788e9d5cefa3ce6b5544d72ee57183afcbd90c
Author: Alabastard-64 <[email protected]>
Date:   Mon Jan 23 22:45:11 2023 -0700

    linting

commit c51a129527cd1939342570a376dc657084143bad
Author: Alabastard-64 <[email protected]>
Date:   Mon Jan 23 22:25:50 2023 -0700

    fix issues

commit 598a6b9fa12c02e104c51f0f3d44be652c77d417
Author: Alabastard-64 <[email protected]>
Date:   Mon Jan 23 16:39:58 2023 -0700

    add FASTCALC option and streamline a few things

commit ccc1cdc1977aa95e95bc987e901d18ea99c45183
Author: Alabastard-64 <[email protected]>
Date:   Fri Dec 23 14:58:39 2022 -0700

    doc update

commit ee54099c1724ff27cf92911955d7b95563883d64
Author: Alabastard-64 <[email protected]>
Date:   Fri Dec 23 14:51:37 2022 -0700

    linting

commit 5cfc509c37f657e85c197bd3a0f77147962d6ed9
Author: Alabastard-64 <[email protected]>
Date:   Thu Dec 22 19:13:24 2022 -0700

    fixes and doc improvements

commit 1d613e06d127b72d69f1ff496e210a39b9f0f124
Author: Alabastard-64 <[email protected]>
Date:   Wed Dec 21 23:07:52 2022 -0700

    fix previous changes to precision mode now working as intended additional mode fixes

commit cd57af862bc0c09c0852340429a35a158b4a0bfc
Author: Alabastard-64 <[email protected]>
Date:   Wed Dec 21 20:29:11 2022 -0700

    doc update and precision changes

commit c1dd50795001d6b4ec21e7d86d1ba741fc3f57a1
Author: Alabastard-64 <[email protected]>
Date:   Tue Dec 13 00:53:47 2022 -0700

    more doc updates/code cleanup

commit 7195781d36c95dbf52342fe2bc1e492b18cc68f6
Author: Alabastard-64 <[email protected]>
Date:   Tue Dec 13 00:20:15 2022 -0700

    code and doc fixup

commit f5ef00fab0edaf28a491dc8f206a8a6bb043e098
Author: Alabastard-64 <[email protected]>
Date:   Mon Dec 12 23:10:19 2022 -0700

    update and linting

commit d4ef3936f846d99b6d0876a26baf93ff117bcecb
Author: Alabastard-64 <[email protected]>
Date:   Sun Dec 11 21:08:08 2022 -0700

    post rebase/squash cleanup

commit 202fb29ad44ded90f61abb08311f83992362b7a1
Author: Alabastard-64 <[email protected]>
Date:   Tue Aug 30 01:23:41 2022 -0600

    parent c6ab70e
    author Alabastard-64 <[email protected]> 1661844221 -0600
    committer Alabastard-64 <[email protected]> 1670816485 -0700

    parent c6ab70e
    author Alabastard-64 <[email protected]> 1661844221 -0600
    committer Alabastard-64 <[email protected]> 1670813789 -0700

    parent c6ab70e
    author Alabastard-64 <[email protected]> 1661844221 -0600
    committer Alabastard-64 <[email protected]> 1670812067 -0700

    Squashed all previous Commits

commit b8c9cb8
Merge: cfa473e 61f3f56
Author: QMK Bot <[email protected]>
Date:   Mon Mar 6 01:28:47 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 61f3f56
Author: Leon Anavi <[email protected]>
Date:   Mon Mar 6 03:28:01 2023 +0200

    keyboards/anavi: Add ANAVI Knobs 3 (qmk#18624)

commit cfa473e
Merge: 23c365b 500c4b7
Author: QMK Bot <[email protected]>
Date:   Sun Mar 5 23:08:22 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 500c4b7
Author: Joel Challis <[email protected]>
Date:   Sun Mar 5 23:07:47 2023 +0000

    Reject VIA keys within info.json (qmk#20026)

commit 23c365b
Author: Ryan <[email protected]>
Date:   Mon Mar 6 09:53:52 2023 +1100

    Move matrix config to info.json, part 1 (qmk#19985)

commit b34d51d
Merge: 8075eb5 07b7fed
Author: QMK Bot <[email protected]>
Date:   Sun Mar 5 13:29:51 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 07b7fed
Author: Sergey Vlasov <[email protected]>
Date:   Sun Mar 5 16:29:10 2023 +0300

    Unbreak switchplate/southpaw_65 after qmk#16277 (qmk#20015)

    Apparently the changes done in qmk#16277 swapped the values read from the
    PCA9555 expanders by mistake, which resulted in mixed up matrix columns.
    Fix the chip and register addresses to match the original code.

commit 8075eb5
Merge: fab04ef 77f7351
Author: QMK Bot <[email protected]>
Date:   Sat Mar 4 00:53:53 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 77f7351
Author: lalalademaxiya1 <[email protected]>
Date:   Sat Mar 4 08:53:09 2023 +0800

    Add Keychron Q12 (qmk#19844)

    Co-authored-by: Ryan <[email protected]>
    Co-authored-by: Drashna Jaelre <[email protected]>

commit fab04ef
Merge: 3290bc7 127b53b
Author: QMK Bot <[email protected]>
Date:   Fri Mar 3 23:04:40 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 127b53b
Author: Elliot Powell <[email protected]>
Date:   Fri Mar 3 23:04:00 2023 +0000

    Add Support for Lilly58 r2g (qmk#19862)

    * Add support for lilly58 r2g by Mechboards

commit 3290bc7
Merge: 3be5d90 95dd573
Author: QMK Bot <[email protected]>
Date:   Fri Mar 3 22:02:32 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 95dd573
Author: Guillermo Aguirre <[email protected]>
Date:   Fri Mar 3 19:01:22 2023 -0300

    Add new keymap for Preonic rev3 (qmk#19706)

commit 3be5d90
Author: Joel Challis <[email protected]>
Date:   Fri Mar 3 17:50:40 2023 +0000

    Remove some use of keymap.h (qmk#20006)

commit c3c40df
Author: Joel Challis <[email protected]>
Date:   Fri Mar 3 11:26:53 2023 +0000

    Remove some use of keymap.h (qmk#19980)

commit 6676cc1
Merge: 4cf8f69 d1a430b
Author: QMK Bot <[email protected]>
Date:   Fri Mar 3 03:16:47 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit d1a430b
Author: Nick Brassel <[email protected]>
Date:   Fri Mar 3 14:16:32 2023 +1100

    Initial deprecation policy documentation. (qmk#19908)

commit 4cf8f69
Author: Nick Brassel <[email protected]>
Date:   Fri Mar 3 14:16:18 2023 +1100

    Remove Vagrant due to bit-rot. (qmk#20000)

commit 7ebb8c2
Author: Nick Brassel <[email protected]>
Date:   Fri Mar 3 14:16:06 2023 +1100

    Update branch names to reflect configurator's new deployment. (qmk#19999)

commit be78192
Author: Joel Challis <[email protected]>
Date:   Thu Mar 2 23:26:37 2023 +0000

    Merge upstream changes to uf2conv (qmk#19993)

commit 0a7f159
Merge: 500da8e 6fabc33
Author: QMK Bot <[email protected]>
Date:   Wed Mar 1 23:57:53 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 6fabc33
Author: Ryan <[email protected]>
Date:   Thu Mar 2 10:56:45 2023 +1100

    Check all keys have matrix positions when parsing C LAYOUT macros (qmk#19781)

commit 500da8e
Merge: a83cb60 80c6fba
Author: QMK Bot <[email protected]>
Date:   Wed Mar 1 17:54:11 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 80c6fba
Author: Albert Y <[email protected]>
Date:   Thu Mar 2 01:53:31 2023 +0800

    [Keyboard] Clean up contra & move to data-driven (qmk#19973)

    Co-authored-by: Joel Challis <[email protected]>

commit a83cb60
Merge: c9b49cd f639089
Author: QMK Bot <[email protected]>
Date:   Wed Mar 1 17:50:14 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit f639089
Author: David Rambo <[email protected]>
Date:   Wed Mar 1 09:49:33 2023 -0800

    [Keymap] Add davidrambo lulu keymap (qmk#19448)

    Co-authored-by: Joel Challis <[email protected]>

commit c9b49cd
Merge: 512c119 aeb3ed6
Author: QMK Bot <[email protected]>
Date:   Wed Mar 1 17:06:15 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit aeb3ed6
Author: Paul Enrico N. Viola <[email protected]>
Date:   Thu Mar 2 01:05:36 2023 +0800

    added Polly40 keyboard (qmk#19936)

    Co-authored-by: Ryan <[email protected]>
    Co-authored-by: jack <[email protected]>

commit 512c119
Merge: 9b09e7c 3fc9c03
Author: QMK Bot <[email protected]>
Date:   Wed Mar 1 02:56:03 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 3fc9c03
Author: Joel Challis <[email protected]>
Date:   Wed Mar 1 02:55:14 2023 +0000

    Remove `all` from list of animations in `info.json` (qmk#19978)

commit 9b09e7c
Author: Ryan <[email protected]>
Date:   Wed Mar 1 12:51:18 2023 +1100

    Check all rows have the correct number of columns when parsing `g_led_config` (qmk#19954)

commit f1894e4
Author: Huckies <[email protected]>
Date:   Wed Mar 1 09:44:40 2023 +0800

    Improve robustness of AW20216 driver (qmk#19849)

    * added soft reset and auto lowpower for AW20216

commit 791ab00
Merge: c9b206f 5372706
Author: QMK Bot <[email protected]>
Date:   Tue Feb 28 20:29:48 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 5372706
Author: Joel Challis <[email protected]>
Date:   Tue Feb 28 20:27:11 2023 +0000

    Disable safe.directory check (qmk#19970)

commit c9b206f
Merge: 7a518e5 d35cdcc
Author: QMK Bot <[email protected]>
Date:   Tue Feb 28 20:25:54 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit d35cdcc
Author: gkeyboard <[email protected]>
Date:   Wed Mar 1 03:24:35 2023 +0700

    [Keyboard] Add GPAD8-2R (gpad8_2r) Macro Pad (qmk#19914)

    Co-authored-by: jack <[email protected]>

commit 7a518e5
Merge: 0472399 b85a9ab
Author: QMK Bot <[email protected]>
Date:   Tue Feb 28 20:24:24 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit b85a9ab
Author: Michal S <[email protected]>
Date:   Tue Feb 28 20:23:47 2023 +0000

    [Keymap] sofle/keymaps/michal: rewrite (qmk#19938)

commit 0472399
Merge: 209e652 ee90ad2
Author: QMK Bot <[email protected]>
Date:   Tue Feb 28 20:23:02 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit ee90ad2
Author: studiokestra <[email protected]>
Date:   Tue Feb 28 13:22:14 2023 -0700

    [Keyboard] Add FRL84 PCB. (qmk#19942)

    Co-authored-by: jack <[email protected]>

commit 209e652
Merge: fc05929 e142543
Author: QMK Bot <[email protected]>
Date:   Tue Feb 28 20:10:51 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit e142543
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Feb 28 20:10:08 2023 +0000

    Bump tj-actions/changed-files from 34 to 35 (qmk#19971)

    Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 34 to 35.
    - [Release notes](https://github.com/tj-actions/changed-files/releases)
    - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md)
    - [Commits](tj-actions/changed-files@v34...v35)

    ---
    updated-dependencies:
    - dependency-name: tj-actions/changed-files
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit fc05929
Author: Joel Challis <[email protected]>
Date:   Tue Feb 28 19:15:54 2023 +0000

    Strip whitespace from CONVERT_TO variables (qmk#19948)

commit 184c1e5
Merge: 7a82652 0596720
Author: QMK Bot <[email protected]>
Date:   Tue Feb 28 19:15:33 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 0596720
Author: Shawn Meier <[email protected]>
Date:   Tue Feb 28 12:15:19 2023 -0700

    [Keyboard] remove non-existent method from ploopy documentation (qmk#19957)

commit 0514011
Author: Drashna Jaelre <[email protected]>
Date:   Tue Feb 28 11:14:48 2023 -0800

    [Keymap] Drashna updates for 0.20.0 (qmk#19960)

commit 7a82652
Author: Ryan <[email protected]>
Date:   Wed Mar 1 02:06:11 2023 +1100

    Remove `"w":1` and `"h":1` from info.json (qmk#19961)

commit bfeccf3
Merge: 4ac8476 05631b2
Author: QMK Bot <[email protected]>
Date:   Tue Feb 28 14:19:21 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 05631b2
Author: Joel Challis <[email protected]>
Date:   Tue Feb 28 14:18:43 2023 +0000

    Flag "builddefs" as core changes (qmk#19950)
  • Loading branch information
@freznel10
freznel10 committed Mar 6, 2023
1 parent 7de0858 commit f802a17
Show file tree
Hide file tree
Showing 16 changed files with 348 additions and 258 deletions.
2 changes: 1 addition & 1 deletion data/constants/keycodes/keycodes_0.0.3.hjson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
"define": "QK_POINTING_MODE_UTIL"
}
}
}
}
6 changes: 3 additions & 3 deletions data/constants/keycodes/keycodes_0.0.3_pointing_mode_util.hjson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@
"key": "QK_PM_DEVICE_RIGHT",
"label": "Set pointing mode device to PM_RIGHT_SIDE",
"aliases": [
"PMR_DR"
"PMR_RGHT"
]
},
"0x5302": {
"group": "pointing_mode_util",
"key": "QK_PM_DEVICE_LEFT",
"label": "Set pointing mode device to PM_LEFT_SIDE",
"aliases": [
"PMR_DL"
"PMR_LEFT"
]
}
}
}
}
394 changes: 241 additions & 153 deletions docs/feature_pointing_device.md
View file

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions keyboards/emblem/keymaps/freznel/graphics/djinn.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<<<<<<<< HEAD:keyboards/emblem/keymaps/freznel/graphics/djinn.h
/* Copyright 2021 QMK
========
/* Copyright 2020 QMK
>>>>>>>> Alabastard-64/feature_pointing_device_scroll_framework:keyboards/keychron/q12/mcuconf.h
*
* 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
Expand All @@ -14,6 +18,7 @@
* along with this program. If not, see <http:https://www.gnu.org/licenses/>.
*/

<<<<<<<< HEAD:keyboards/emblem/keymaps/freznel/graphics/djinn.h
/*
* This file was auto-generated by `qmk painter-convert-graphics -i djinn.png -f mono16`
*/
Expand All @@ -23,3 +28,11 @@
#include <qp.h>

extern painter_image_t gfx_djinn PROGMEM;
========
#pragma once

#include_next <mcuconf.h>

#undef STM32_I2C_USE_I2C1
#define STM32_I2C_USE_I2C1 TRUE
>>>>>>>> Alabastard-64/feature_pointing_device_scroll_framework:keyboards/keychron/q12/mcuconf.h
38 changes: 28 additions & 10 deletions keyboards/emblem/mcuconf.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/* Copyright 2020 QMK
>>>>>>>> upstream/develop:keyboards/cannonkeys/serenity/mcuconf.h
*
* 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
Expand All @@ -15,15 +14,6 @@
* along with this program. If not, see <http:https://www.gnu.org/licenses/>.
*/

/*
* This file was auto-generated by:
* `qmk chibios-confmigrate -i keyboards/cannonkeys/devastatingtkl/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
*/

#pragma once

#include_next "mcuconf.h"

#undef RP_SIO_I2C_USE_I2C0
#define RP_SIO_I2C_USE_I2C0 FALSE

Expand All @@ -38,3 +28,31 @@

#undef RP_PWM_USE_PWM4
#define RP_PWM_USE_PWM4 TRUE

#ifdef AUDIO_ENABLE
# define STARTUP_SONG SONG(PREONIC_SOUND)
// #define STARTUP_SONG SONG(NO_SOUND)

# define DEFAULT_LAYER_SONGS \
{ SONG(QWERTY_SOUND), SONG(COLEMAK_SOUND), SONG(DVORAK_SOUND) }
#endif

#define MUSIC_MASK (keycode != KC_NO)

/*
* MIDI options
*/

/* enable basic MIDI features:
- MIDI notes can be sent when in Music mode is on
*/

#define MIDI_BASIC

/* enable advanced MIDI features:
- MIDI notes can be added to the keymap
- Octave shift and transpose
- Virtual sustain, portamento, and modulation wheel
- etc.
*/
//#define MIDI_ADVANCED
5 changes: 1 addition & 4 deletions keyboards/emblem/rev2/rev2.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@

/* Copyright 2022 Freznel B. Sta. Ana (Freznel10)
*
* 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
Expand All @@ -17,7 +15,6 @@
*/
#pragma once


#include "emblem.h"

#include "quantum.h"

19 changes: 19 additions & 0 deletions keyboards/emblem/ui/settings/screensaver/screensaver.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<<<<<<<< HEAD:keyboards/emblem/ui/settings/screensaver/screensaver.h
/* Copyright 2022 Jose Pablo Ramirez <[email protected]>
========
/* Copyright 2022 Cole Smith <[email protected]>
* Copyright 2022 David Rambo <[email protected]>
>>>>>>>> Alabastard-64/feature_pointing_device_scroll_framework:keyboards/boardsource/lulu/keymaps/davidrambo/config.h
*
* 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
Expand All @@ -16,6 +21,7 @@

#pragma once

<<<<<<<< HEAD:keyboards/emblem/ui/settings/screensaver/screensaver.h
#ifdef __cplusplus
extern "C" {
#endif
Expand All @@ -35,4 +41,17 @@ extern "C" {

#ifdef __cplusplus
} /*extern "C"*/
========
#define MASTER_RIGHT
#define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD
#define CAPS_WORD_IDLE_TIMEOUT 3000 // 3 seconds.

#define TAPPING_TERM 210
/*#define PERMISSIVE_HOLD*/
#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_FORCE_HOLD

#ifdef RGB_MATRIX_ENABLE
#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
>>>>>>>> Alabastard-64/feature_pointing_device_scroll_framework:keyboards/boardsource/lulu/keymaps/davidrambo/config.h
#endif
41 changes: 0 additions & 41 deletions keyboards/zerfstudios/chunky2040/testchconf.h
View file

This file was deleted.

5 changes: 0 additions & 5 deletions keyboards/zerfstudios/emblem/mcuconf.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/* Copyright 2020 QMK
>>>>>>>> upstream/develop:keyboards/cannonkeys/serenity/mcuconf.h
*
* 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
Expand All @@ -15,10 +14,6 @@
* along with this program. If not, see <http:https://www.gnu.org/licenses/>.
*/

/*
* This file was auto-generated by:
* `qmk chibios-confmigrate -i keyboards/cannonkeys/devastatingtkl/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
*/

#pragma once

Expand Down
4 changes: 2 additions & 2 deletions quantum/keycodes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -946,8 +946,8 @@ enum qk_keycode_defines {
KC_RCMD = KC_RIGHT_GUI,
KC_RWIN = KC_RIGHT_GUI,
PMR_CYD = QK_PM_CYCLE_DEVICES,
PMR_DR = QK_PM_DEVICE_RIGHT,
PMR_DL = QK_PM_DEVICE_LEFT,
PMR_RGHT = QK_PM_DEVICE_RIGHT,
PMR_LEFT = QK_PM_DEVICE_LEFT,
SH_TOGG = QK_SWAP_HANDS_TOGGLE,
SH_TT = QK_SWAP_HANDS_TAP_TOGGLE,
SH_MON = QK_SWAP_HANDS_MOMENTARY_ON,
Expand Down
8 changes: 4 additions & 4 deletions quantum/pointing_device/pointing_device.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -468,15 +468,15 @@ report_mouse_t pointing_device_adjust_by_defines_right(report_mouse_t mouse_repo
*/
report_mouse_t pointing_device_task_combined(report_mouse_t left_report, report_mouse_t right_report) {
# ifdef POINTING_DEVICE_MODES_ENABLE
# ifdef POINTING_MODES_SINGLE_CONTROL
# if POINTING_MODES_SINGLE_CONTROL
// only one side controlled at any one time
switch (get_pointing_mode_device()) {
case PM_RIGHT_SIDE:
case PM_RIGHT_DEVICE:
right_report = pointing_device_modes_task(right_report);
break;
default:
left_report = pointing_device_modes_task(left_report);
}
}[
# else
// both sides controlled independently
// save current device id
Expand All @@ -485,7 +485,7 @@ report_mouse_t pointing_device_task_combined(report_mouse_t left_report, report_
right_report = pointing_device_modes_task(right_report);

set_pointing_mode_device(PM_LEFT_DEVICE);
left_report = pointing_device_modes_task(left_report);
left_report = pointing_device_modes_task(left_report);]
// set device id back
set_pointing_mode_device(current_device);
# endif
Expand Down
20 changes: 11 additions & 9 deletions quantum/pointing_device/pointing_device_modes.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ int16_t multiply_divisor_hv(int8_t value) {
* @return current device id [uint8_t]
*/
uint8_t get_pointing_mode_device(void) {
# if defined(POINTING_MODES_SINGLE_CONTROL)
# ifdef POINTING_MODES_SINGLE_CONTROL
return selected_device;
# else
return current_device;
Expand All @@ -151,18 +151,20 @@ uint8_t get_pointing_mode_device(void) {
/**
* @brief Allow changing of active side
*
* will change which side (PM_LEFT_SIDE, PM_RIGHT_SIDE, etc.) is controlled by pointing mode framework
* will change which side (PM_LEFT_DEVICE, PM_RIGHT_DEVICE, etc.) is controlled by pointing mode framework
*
* NOTE: If mode is set above maximum device number device is set to zero (this allows cycling)
*
* @params[in] new side uint8_t
*/
void set_pointing_mode_device(uint8_t device) {
if (device > POINTING_MODES_DEVICE_ID_MAX) device = 0;
# if defined(POINTING_MODES_SINGLE_CONTROL)
# if (POINTING_MODES_NUM_DEVICES > 1)
if (device > POINTING_MODES_NUM_DEVICES) device = 0;
# if POINTING_MODES_SINGLE_CONTROL
selected_device = device;
# elif POINTING_MODES_DEVICE_CONTROL_COUNT > 1
# else
current_device = device;
# endif
# else
;
# endif
Expand Down Expand Up @@ -431,19 +433,19 @@ void pointing_tap_codes(uint16_t kc_left, uint16_t kc_down, uint16_t kc_up, uint
switch (current_pointing_mode_direction()) {
case PD_DOWN ... PD_UP:
count = divisor_divide16(pointing_modes[current_device].y);
if (!count) return;
if (!count) return; // exit if accumulated y is too low
pointing_modes[current_device].y -= divisor_multiply16(count);
pointing_modes[current_device].x = 0;
break;
case PD_LEFT ... PD_RIGHT:
count = divisor_divide16(pointing_modes[current_device].x);
if (!count) return;
if (!count) return; // exit if accumulated x is too low
pointing_modes[current_device].x -= divisor_multiply16(count);
pointing_modes[current_device].y = 0;
break;
}
// skip if KC_NO (but allow for axes update above)
if (!kc_direction) return;
// skip if KC_TRNS or KC_NO (but allow for axes update above)
if (kc_direction < 2) return;

// tap codes
uint8_t taps = abs(count);
Expand Down
44 changes: 20 additions & 24 deletions quantum/pointing_device/pointing_device_modes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,31 +27,27 @@
#ifndef POINTING_MODE_DEFAULT
# define POINTING_MODE_DEFAULT PM_NONE
#endif
#ifndef POINTING_MODES_DEVICE_CONTROL_COUNT
# if defined(SPLIT_POINTING_ENABLE) && defined(POINTING_DEVICE_COMBINED)
# define POINTING_MODES_DEVICE_CONTROL_COUNT 2
# else
# define POINTING_MODES_DEVICE_CONTROL_COUNT 1

#if defined(SPLIT_POINTING_ENABLE) && defined(POINTING_DEVICE_COMBINED)
# ifndef POINTING_MODES_NUM_DEVICES
# define POINTING_MODES_NUM_DEVICES 2
# endif
#else
# ifndef POINTING_MODES_NUM_DEVICES
# define POINTING_MODES_NUM_DEVICES 1
# endif
#endif
#ifndef POINTING_MODES_DEFAULT_DEVICE
// equivalent to PM_RIGHT_SIDE or PM_LEFT_SIDE depending if MASTER_RIGHT is defined
# define POINTING_MODES_DEFAULT_DEVICE 0
#endif

// Internal settings
#if (POINTING_MODES_DEVICE_CONTROL_COUNT > 1) || (defined(SPLIT_POINTING_ENABLE) && defined(POINTING_DEVICE_COMBINED))
# define POINTING_MODES_DEVICE_ID_MAX MAX(POINTING_MODES_DEVICE_CONTROL_COUNT - 1, 1)
#ifdef POINTING_MODES_SINGLE_CONTROL
# define POINTING_MODES_DEVICE_CONTROL_COUNT 1
#else
# define POINTING_MODES_DEVICE_ID_MAX 0
# define POINTING_MODES_DEVICE_CONTROL_COUNT POINTING_MODES_NUM_DEVICES
#endif
#if (POINTING_MODES_DEVICE_CONTROL_COUNT == 1 && POINTING_MODES_DEVICE_ID_MAX > 0)
# ifndef POINTING_MODES_SINGLE_CONTROL
# define POINTING_MODES_SINGLE_CONTROL
# endif

#ifndef POINTING_MODES_DEFAULT_DEVICE
# define POINTING_MODES_DEFAULT_DEVICE 0
#endif

/* default divisors */
// default divisors
#ifndef POINTING_DEFAULT_DIVISOR
# define POINTING_DEFAULT_DIVISOR 64
#endif
Expand All @@ -77,14 +73,14 @@
# define POINTING_DRAG_DIVISOR 4
#endif

/* error checking */
#if (POINTING_DEFAULT_DIVISOR < 1)
// error checking
#if POINTING_DEFAULT_DIVISOR < 1
# pragma message "DEFAULT_DIVISOR must be 1 or greater"
# error DEFAULT_DIVISOR less than 1
#endif
#if (POINTING_MODES_DEVICE_CONTROL_COUNT < 1)
# pragma message "POINTING_MODES_DEVICE_CONTROL_COUNT must be 1 or more"
# error POINTING_MODES_DEVICE_CONTROL_COUNT less than 1
#if POINTING_MODES_NUM_DEVICES < 2 && (defined(SPLIT_POINTING_ENABLE) && defined(POINTING_DEVICE_COMBINED)) || defined(POINTING_MODES_SINGLE_CONTROL)
# pragma message "POINTING_MODE_NUM_DEVICES should be at least 2 with SPLIT_POINTING_ENABLE & POINTING_DEVICE_COMBINED or POINTING_MODES_SINGLE_CONTROL defined"
# error POINTING_MODE_NUM_DEVICES set too low
#endif

/* enums */
Expand Down
2 changes: 1 addition & 1 deletion quantum/process_keycode/process_pointing_mode_records.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ bool process_pointing_mode_records(uint16_t keycode, keyrecord_t* record) {
return true;
// utils: DEVICE LEFT
case QK_PM_DEVICE_LEFT:
pointing_mode_key_set_device(PM_LEFT_DEVICE, record->event.pressed);
pointing_mode_key_set_device(PM_RIGHT_DEVICE, record->event.pressed);
return true;
# endif

Expand Down
Loading

0 comments on commit f802a17

Please sign in to comment.