tgrosinger/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,756 Commits 1 Branch 0 Tags
Commit Graph

15797 Commits

Author SHA1 Message Date
James Young
5e5b19cf94
Keychron S1 ANSI Layout Touch-Up (#19556) 2023-01-10 15:09:09 +00:00
Daniel Schaefer
2ce52c5b54 lotus: keypress command just does RGB handling 
Signed-off-by: Daniel Schaefer <dhs@frame.work>
 2023-01-10 17:58:39 +08:00
Daniel Schaefer
e7061ed797 lotus: Update matrix to use NO_LED 
Clearer than magic number.

Signed-off-by: Daniel Schaefer <dhs@frame.work>
 2023-01-10 17:53:33 +08:00
QMK Bot
6b81ba1d4c Merge remote-tracking branch 'origin/master' into develop 2023-01-10 09:06:09 +00:00
squarecut
aba67829e9
[Keymap] Kbdfans Tiger 80 keymap & Planck keymap (#19428) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Abhishek Malavalli <abhishek.malavalli@fphcare.co.nz>
 2023-01-10 01:05:31 -08:00
Daniel Schaefer
5b4f836e8c lotus: Fix Key Matrix to LED Index 
Now the key press based animations work!

Signed-off-by: Daniel Schaefer <dhs@frame.work>
 2023-01-10 16:26:09 +08:00
QMK Bot
64dea51094 Merge remote-tracking branch 'origin/master' into develop 2023-01-10 06:39:27 +00:00
Filip Paryż
4d83583410
[Keymap] Updated Freoduo keymap (#19351) 2023-01-09 22:38:54 -08:00
Daniel Schaefer
78e762028f lotus: Remove factory commands that overlap with VIA 
Can use qmk_hid for those now, yay!

Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
 2023-01-10 11:29:40 +08:00
Ryan
56555c61e1
Migrate LAYOUTS to data driven (#19541) 
* Migrate `LAYOUTS` to data driven, 0-9

* Migrate `LAYOUTS` to data driven, A

* Migrate `LAYOUTS` to data driven, B

* Migrate `LAYOUTS` to data driven, C

* Migrate `LAYOUTS` to data driven, D

* Migrate `LAYOUTS` to data driven, E

* Migrate `LAYOUTS` to data driven, F

* Migrate `LAYOUTS` to data driven, G

* Migrate `LAYOUTS` to data driven, H

* Migrate `LAYOUTS` to data driven, handwired

* Migrate `LAYOUTS` to data driven, I

* Migrate `LAYOUTS` to data driven, J

* Migrate `LAYOUTS` to data driven, K

* Migrate `LAYOUTS` to data driven, L

* Migrate `LAYOUTS` to data driven, M

* Migrate `LAYOUTS` to data driven, N

* Migrate `LAYOUTS` to data driven, O

* Migrate `LAYOUTS` to data driven, P

* Migrate `LAYOUTS` to data driven, Q

* Migrate `LAYOUTS` to data driven, R

* Migrate `LAYOUTS` to data driven, S

* Migrate `LAYOUTS` to data driven, T

* Migrate `LAYOUTS` to data driven, U

* Migrate `LAYOUTS` to data driven, V

* Migrate `LAYOUTS` to data driven, W

* Migrate `LAYOUTS` to data driven, X

* Migrate `LAYOUTS` to data driven, Y

* Migrate `LAYOUTS` to data driven, Z
 2023-01-10 02:48:20 +00:00
Daniel Schaefer
30328f6f57 lotus: Enable RGB effects that react to keypress 
Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
 2023-01-10 10:18:35 +08:00
QMK Bot
59ae682dc9 Merge remote-tracking branch 'origin/master' into develop 2023-01-10 00:49:04 +00:00
Dennis Kruyt
caca029e12
[Keyboard] add YMDK40 AIR40 (#19276) 
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2023-01-09 16:48:11 -08:00
QMK Bot
2dd4359181 Merge remote-tracking branch 'origin/master' into develop 2023-01-09 23:50:53 +00:00
Manna Harbour
0becd33c4d
[keyboard] Enable community layout support (#19499) 2023-01-09 23:50:18 +00:00
QMK Bot
14fabfd893 Merge remote-tracking branch 'origin/master' into develop 2023-01-09 21:34:03 +00:00
Nick Brassel
01de98428c
[Keychron Q5] Build failures: recursive function call. (#19553) 2023-01-10 08:33:28 +11:00
QMK Bot
cf55032485 Merge remote-tracking branch 'origin/master' into develop 2023-01-08 15:27:43 +00:00
Joel Challis
1c024bfa91
Add some missing layout data (#19539) 2023-01-08 15:26:37 +00:00
Joel Challis
974a1eaf2a
Ignore defaults.hjson values if already set (#19511) 
* Ignore defaults.hjson values if already set

* Add warning when nothing is merged
 2023-01-07 17:05:53 +00:00
QMK Bot
403c7eeb5c Merge remote-tracking branch 'origin/master' into develop 2023-01-07 17:03:18 +00:00
Joel Challis
c5e3275299
Fix handwired/onekey/kb2040 WS2812 pin (#19517) 2023-01-07 17:02:40 +00:00
Daniel Schaefer
920b502077 lotus: Reduce sleep before ADC read 
5us seems enough sleep. Still works

Also need to measure delay not between each ADC scan but between each
matrix scan! That's what matters to the user.

Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
 2023-01-07 22:49:16 +08:00
Daniel Schaefer
8d392644b0 lotus: Remove pins that we don't use 
Now if you grep GP0 through GP29 they'll all only show for the exact
uses we need them for.

Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
 2023-01-07 22:25:27 +08:00
Daniel Schaefer
48deca2b32 lotus: Add host SLEEP# detection 
Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
 2023-01-07 22:17:19 +08:00
Daniel Schaefer
50136360e7 lotus: Auto start ADC conversion 
Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
 2023-01-07 21:58:51 +08:00
Daniel Schaefer
b192ff0c3e lotus: Fix print_float 
Would print 3.09 as 3.9. Need to add leading 0.

Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
 2023-01-07 21:53:35 +08:00
Daniel Schaefer
1413dfa26e lotus: Add some comments 
Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
 2023-01-07 21:47:46 +08:00
Daniel Schaefer
e37039c23e lotus: Add two missing columns 
Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
 2023-01-07 21:35:35 +08:00
Daniel Schaefer
12c192c323 lotus: Integrate ADC reading into matrix logic 
Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
 2023-01-07 21:35:16 +08:00
Daniel Schaefer
72247be69f lotus: Clean up ADC code a bit 
Should now work on non-pi and prints:

```
...
Framework Computer Inc:Lotus Keyboard:1: scan
Framework Computer Inc:Lotus Keyboard:1: 5 ms (200 Hz)
Framework Computer Inc:Lotus Keyboard:1: Temperature: 18.71
Framework Computer Inc:Lotus Keyboard:1: ADC Voltage: 0.1
Framework Computer Inc:Lotus Keyboard:1: scan
Framework Computer Inc:Lotus Keyboard:1: 6 ms (166 Hz)
Framework Computer Inc:Lotus Keyboard:1: Temperature: 18.24
Framework Computer Inc:Lotus Keyboard:1: ADC Voltage: 0.1
Framework Computer Inc:Lotus Keyboard:1: scan
Framework Computer Inc:Lotus Keyboard:1: 6 ms (166 Hz)
...
```

Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
 2023-01-07 20:58:38 +08:00
Daniel Schaefer
37aae1748e lotus: Implement quick ADC reading 
Has to be started manually:
hidapitester --vidpid 32ac/0012 --usagePage 0xFF60 --usage 0x0061 -v --open -l33 --send-output 0,11,3

Will print:

```
Framework Computer Inc:Lotus Keyboard:1: After handle_samplescan
Framework Computer Inc:Lotus Keyboard:1: prev: 959345
Framework Computer Inc:Lotus Keyboard:1: curr: 959352
Framework Computer Inc:Lotus Keyboard:1: 7 ms
Framework Computer Inc:Lotus Keyboard:1: 142 Hz
Framework Computer Inc:Lotus Keyboard:1: letsgo
Framework Computer Inc:Lotus Keyboard:1: adc_end_callback
Framework Computer Inc:Lotus Keyboard:1: After adcConvert
Framework Computer Inc:Lotus Keyboard:1: Raw ADC samples: 1004, 892, 1003, 892
Framework Computer Inc:Lotus Keyboard:1: Temp: 19.64
Framework Computer Inc:Lotus Keyboard:1: ADC Voltage: 0.80
```

Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
 2023-01-07 19:49:24 +08:00
Daniel Schaefer
e1997affa0 lotus: Fix non-pico build and GPIOs 
Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
 2023-01-07 17:01:33 +08:00
Daniel Schaefer
877e2f9ace lotus: Implement ADC on correct pin 
Verified with potentiometer knob. Voltage goes from 0.1V to 3.1.

Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
 2023-01-07 16:52:28 +08:00
Daniel Schaefer
4eb191c845 lotus: Add ifdef for pico variant 
Pico doesn't expose all the pins so it'll be a bit different.
Just for prototyping.

Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
 2023-01-07 13:34:25 +08:00
Daniel Schaefer
8990a17d32 fixup! lotus: Add RGB factory commands 2023-01-07 13:31:44 +08:00
Daniel Schaefer
229d5eebe2 fixup! lotus: Add RGB factory commands 2023-01-06 18:26:10 +08:00
Daniel Schaefer
e61c85c212 lotus: Add RGB factory commands 
Example to enable RGB:

```
hidapitester --vidpid 32ac/0012 --usagePage 0xFF60 --usage 0x0061 \
  --open -l32 --send-output 0,11,4
```

Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
 2023-01-06 18:11:39 +08:00
Daniel Schaefer
aef9c8a91b lotus: Fix RGB LED order 
This makes them work with the correct x/y position.

Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
 2023-01-06 18:02:55 +08:00
Daniel Schaefer
dd1de24050 lotus: Update gridpad LED positions 
New schematic!

Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
 2023-01-06 17:05:23 +08:00
Daniel Schaefer
f56d8cf742 lotus: Fix RGB 
Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
 2023-01-06 15:41:11 +08:00
Daniel Schaefer
02a496cad2 fixup! lotus: Configure I2C 2023-01-06 09:43:48 +08:00
Daniel Schaefer
f0d6021e84 lotus: Enable RGB effects 
Same as Keychron Q1. Can adjust.

Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
 2023-01-06 08:30:37 +08:00
Daniel Schaefer
15def1ac4b lotus: RP2040 UART driver isn't ready yet 
https://github.com/qmk/qmk_firmware/issues/17744

Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
 2023-01-06 08:29:48 +08:00
Daniel Schaefer
80b4bc533a lotus: Enable MUX on init 
Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
 2023-01-05 21:09:18 +08:00
Daniel Schaefer
c7f8acb4ce lotus: Configure I2C 
Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
 2023-01-05 21:02:13 +08:00
Daniel Schaefer
f7f339c414 WIP: Dummy serial number 
Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
 2023-01-05 16:08:12 +08:00
Daniel Schaefer
3ea4ec2a9c lotus: Update USB PIDs 
Different PID for each layout so that VIA can tell them apart.

Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
 2023-01-04 17:30:38 +08:00
Daniel Schaefer
b23e075e19 fixup! Add analog support for RP2040 2023-01-04 15:50:46 +08:00
Daniel Schaefer
116a4af371 lotus: Need to define ADC IRQ priority 
Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
 2023-01-04 15:40:57 +08:00