Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

get latest upstream #2

Merged
merged 50 commits into from
Jun 7, 2021
Merged

get latest upstream #2

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
8ba537f
Keyboard: Planck THK (#12597)
Erovia May 26, 2021
0399271
[Keymap] update gunp layout for Planck (#12926)
gunpinyo May 27, 2021
7cd9eda
[Keyboard] SKErgo (#12923)
kevinzhao-tech May 27, 2021
3a6188f
[Keyboard] Adjustments to Gust Rev1.2 (#12716)
eithanshavit May 27, 2021
5962f05
[Keyboard] Add RGB Matrix support for Bear65 PCB (#12961)
stanrc85 May 27, 2021
e7d68c5
[Keymap] Add mercutio keymap and update readme.md for layouts (#12973)
Jonavin May 27, 2021
722b1d6
[Keymap] Add new keymap for ut472 (#12974)
stefanopace May 27, 2021
2ca7a86
[Keyboard] Removed LAYOUTS = ortho_6x16 (#12983)
noroadsleft May 27, 2021
712d53c
Document RGB_MATRIX_FRAMEBUFFER_EFFECTS (#12984)
peepeetee May 27, 2021
975e42e
[Keyboard] Fix Clawsome/Sedan matrix and default keymap (#13007)
beansrowning May 27, 2021
6750733
Add keymap with scrolling mode for the Ploopy Nano trackball (#13013)
hexadecatrienoic May 27, 2021
1f86c3a
[Keyboard] Fix Delilah VIA Keymap (#13008)
rainkeebs May 27, 2021
446ef4a
[Keyboard] Add F.Me Macropad (#12658)
thompson-ele May 27, 2021
0e53917
[Keyboard] Add VIA to Aves65 (#12990)
evyd13 May 27, 2021
7e14f85
[Keyboard] Add Jabberwocky Keyboard (#12500)
nopunin10did May 27, 2021
088c71b
[Keyboard] Corgi keyboard (#12311)
May 27, 2021
9da95bc
[Keymap] add personal keymap files, and sofle_rgb default maps, (#12267)
DaneEvans May 27, 2021
147cf8a
Sofle rev1 Keymap - featuring keyboard pets (#12499)
HellSingCoder May 27, 2021
84883d3
CLI/c2json: Print 'cpp' error when executed in verbose mode (#12869)
Erovia May 27, 2021
f55e39e
World domination (#13021)
Erovia May 29, 2021
1646c0f
2021 May 29 Breaking Changes Update (#13034)
noroadsleft May 29, 2021
305cca9
CLI: Fix automagic (#13046)
Erovia May 30, 2021
3aca3d3
merge/um70:via: Avoid sprintf() to make the code fit into flash (#12919)
sigprof May 30, 2021
fc9a216
[Keyboard] jabberwocky via support (#13029)
lukeski14 May 30, 2021
7b055dc
[Keyboard] Added BOP support (#12991)
blewis308 May 30, 2021
2b8f1fc
[Keyboard] Unicomp Mini M (#12892)
stevendlander May 30, 2021
1a3064a
[Keyboard] Add Rubi Numpad (#12283)
ohchiko May 31, 2021
6bafefa
[Keymap] lja83's Planck keymap (#12809)
lja83 May 31, 2021
5a06813
VIA compile fixes (#13054)
Xelus22 Jun 1, 2021
93496c8
fix missing arg (#13068)
Xelus22 Jun 1, 2021
35dbe8b
[Keymap] merge jdelkins userspace and associated keymaps (#11276)
jdelkins Jun 2, 2021
597d2e0
Fix up WS2812 SPI driver on F072. (#13022)
tzarc Jun 2, 2021
a0cc2dc
Update noroadsleft userspace and keymaps (2021-06-02) (#13086)
noroadsleft Jun 3, 2021
261d94c
Tidy up spi_master includes (#13053)
fauxpark Jun 3, 2021
af91221
`qmk multibuild`: Fix bug with Path objects (#13093)
fauxpark Jun 3, 2021
6eb18a6
[Keymap] Update bcat's split_3x6_3 for Crkbd legacy removal (#13097)
bcat Jun 3, 2021
e660dcf
Fix caps lock indicator on Bear65 PCB (#12966)
stanrc85 Jun 4, 2021
c7c9f3e
kbdfans/kbd67/rev2: add LAYOUT_65_ansi_split_space layout data (#13102)
noroadsleft Jun 4, 2021
770a334
Fix includes for pmw3360 driver (#13108)
drashna Jun 5, 2021
8128c5f
update feature_layers.md translation (#12752)
umi-umi Jun 5, 2021
ab6128e
Update Japanese document (#10670)
shelaf Jun 5, 2021
7aab06f
JETVAN: Add initial support (#12790)
TerryMathews Jun 5, 2021
add1052
Corrected Number-pad numbers (#13057)
NathanBlais Jun 6, 2021
0374e4c
[Keymap] add id80/ansi/keymaps/msf (#11957)
msf Jun 7, 2021
23631de
Fixed ISO keyboard layout for the Mysterium rev1.1 board (#12531)
HalfHeuslerAlloy Jun 7, 2021
7b66624
[Keyboard] add molecule (#12601)
bbrfkr Jun 7, 2021
94e8091
[Keyboard] Add program yoink via keymap (#12645)
matthewdias Jun 7, 2021
b10728e
[Docs] added basic midi documention of common features (#13113)
wxyangf Jun 7, 2021
9dffd35
Add default `ortho_1x1` layout (#13118)
fauxpark Jun 7, 2021
671a626
Merge branch 'qmk:master' into master
spRite75 Jun 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix includes for pmw3360 driver (qmk#13108)
  • Loading branch information
@drashna
drashna authored Jun 5, 2021
commit 770a3349bed397967dae159501ebc7a4ab1fadde
13 changes: 3 additions & 10 deletions keyboards/handwired/dactyl_manuform/5x6_right_trackball/pmw3360.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@

#ifdef POINTING_DEVICE_ENABLE

#include "wait.h"
#include "debug.h"
#include "print.h"
#include "pmw3360.h"
#include "pmw3360_firmware.h"

#ifdef CONSOLE_ENABLE
# include "print.h"
#endif
bool _inBurst = false;

#ifndef PMW_CPI
Expand All @@ -36,10 +36,7 @@ bool _inBurst = false;
# define ROTATIONAL_TRANSFORM_ANGLE 0x00
#endif

#ifdef CONSOLE_ENABLE
void print_byte(uint8_t byte) { dprintf("%c%c%c%c%c%c%c%c|", (byte & 0x80 ? '1' : '0'), (byte & 0x40 ? '1' : '0'), (byte & 0x20 ? '1' : '0'), (byte & 0x10 ? '1' : '0'), (byte & 0x08 ? '1' : '0'), (byte & 0x04 ? '1' : '0'), (byte & 0x02 ? '1' : '0'), (byte & 0x01 ? '1' : '0')); }
#endif


bool spi_start_adv(void) {
bool status = spi_start(SPI_SS_PIN, false, 3, SPI_DIVISOR);
Expand Down Expand Up @@ -173,9 +170,7 @@ bool pmw_check_signature(void) {

report_pmw_t pmw_read_burst(void) {
if (!_inBurst) {
#ifdef CONSOLE_ENABLE
dprintf("burst on");
#endif
spi_write_adv(REG_Motion_Burst, 0x00);
_inBurst = true;
}
Expand All @@ -200,14 +195,12 @@ report_pmw_t pmw_read_burst(void) {

spi_stop();

#ifdef CONSOLE_ENABLE
print_byte(data.motion);
print_byte(data.dx);
print_byte(data.mdx);
print_byte(data.dy);
print_byte(data.mdy);
dprintf("\n");
#endif

data.isMotion = (data.motion & 0x80) != 0;
data.isOnSurface = (data.motion & 0x08) == 0;
Expand Down
13 changes: 3 additions & 10 deletions keyboards/ploopyco/pmw3360.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/


#include "wait.h"
#include "debug.h"
#include "print.h"
#include "pmw3360.h"
#include "pmw3360_firmware.h"

#ifdef CONSOLE_ENABLE
# include "print.h"
#endif
bool _inBurst = false;

#ifndef PMW_CPI
Expand All @@ -35,9 +34,7 @@ bool _inBurst = false;
# define ROTATIONAL_TRANSFORM_ANGLE 0x00
#endif

#ifdef CONSOLE_ENABLE
void print_byte(uint8_t byte) { dprintf("%c%c%c%c%c%c%c%c|", (byte & 0x80 ? '1' : '0'), (byte & 0x40 ? '1' : '0'), (byte & 0x20 ? '1' : '0'), (byte & 0x10 ? '1' : '0'), (byte & 0x08 ? '1' : '0'), (byte & 0x04 ? '1' : '0'), (byte & 0x02 ? '1' : '0'), (byte & 0x01 ? '1' : '0')); }
#endif


bool spi_start_adv(void) {
Expand Down Expand Up @@ -172,9 +169,7 @@ bool pmw_check_signature(void) {

report_pmw_t pmw_read_burst(void) {
if (!_inBurst) {
#ifdef CONSOLE_ENABLE
dprintf("burst on");
#endif
spi_write_adv(REG_Motion_Burst, 0x00);
_inBurst = true;
}
Expand All @@ -199,14 +194,12 @@ report_pmw_t pmw_read_burst(void) {

spi_stop();

#ifdef CONSOLE_ENABLE
print_byte(data.motion);
print_byte(data.dx);
print_byte(data.mdx);
print_byte(data.dy);
print_byte(data.mdy);
dprintf("\n");
#endif

data.isMotion = (data.motion & 0x80) != 0;
data.isOnSurface = (data.motion & 0x08) == 0;
Expand Down