Cleanup Satisfaction75 Firmware and add new revisions #22082

awkannan · 2023-09-20T03:52:44Z

Description

There are a few changes in this PR.
If necessary, I can break it up further - but I think the changes are generally pretty straightforward.

Changed Satisfaction75 to use core QMK backlight code instead of its own custom code
Added a new revision of Satisfaction75 PCB with fewer keys
Moved core Satisfaction75 code to a CannonKeys-specific library folder
Updated core Satisfaction75 code to be more resilient to disabled features (backlight, oled)
Added a new Satisfaction75 Hotswap PCB to QMK, relying on CannonKeys-specific library folder
Updated readmes, keymaps, and copyright notices as necessary to pair with these changes

Types of Changes

Issues Fixed or Closed by This PR

Checklist

My code follows the code style of this project: C, Python
I have read the PR Checklist document and have made the appropriate changes.
My change requires a change to the documentation.
I have updated the documentation accordingly.
I have read the CONTRIBUTING document.
I have added tests to cover my changes.
I have tested the changes and verified that they work and don't break anything (as well as I can manage).

awkannan · 2023-09-20T04:46:13Z

Note: CI will likely fail due to user keymaps (and the new rev2 Sat75 PCB not having the layouts used in those keymaps)

keyboards/cannonkeys/lib/satisfaction75/satisfaction_keycodes.h

keyboards/cannonkeys/satisfaction75/rules.mk

keyboards/cannonkeys/satisfaction75_hs/rules.mk

keyboards/cannonkeys/satisfaction75/keymaps/boy_314/keymap.c

drashna

This should be targeting develop due to the changes.

Otherwise, LGTM.

awkannan · 2023-09-25T15:37:23Z

Retargeted to Develop. Thanks for review @drashna !

keyboards/cannonkeys/satisfaction75/rev2/readme.md

fauxpark · 2023-10-22T17:38:56Z

keyboards/cannonkeys/satisfaction75/satisfaction75.h

-void breathing_disable(void);
-void custom_config_load(void);
-void backlight_config_save(void);
+#include "satisfaction_keycodes.h"


This file can be deleted.

This is necessary in order to not have to import the keycodes in each keymap file. (See drashna's feedback above)

#22082 (comment)

keyboards/cannonkeys/satisfaction75/readme.md

fauxpark · 2023-10-22T17:39:52Z

keyboards/cannonkeys/satisfaction75/prototype/info.json

+            {"pin_a": "B9", "pin_b": "B8", "resolution": 2}
+        ]
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B2", "B10", "B11", "B12", "B13", "B14", "A8", "A9", "A10", "B0", "A7", "A5", "B5", "A15", "A1"],
+        "rows": ["B3", "B4", "A0", "A2", "A4", "A3"]
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x57F5"
+    },
    "layouts": {
        "LAYOUT_all": {
            "layout": [
                {"label": "K000", "matrix": [0, 0], "x": 0, "y": 0},
-


Please keep the spacing here.

The info.json auto-formatter removes these - I think that should be the standard.

keyboards/cannonkeys/satisfaction75/config.h

keyboards/cannonkeys/satisfaction75_hs/satisfaction75_hs.h

keyboards/cannonkeys/satisfaction75_hs/readme.md

fauxpark · 2023-10-22T17:42:19Z

keyboards/cannonkeys/satisfaction75/rev1/info.json

            "layout": [
                {"matrix": [0, 0], "x": 0, "y": 0},
-


Please keep the spacing here.

The info.json auto-formatter removes these - I think that should be the standard.

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

github-actions · 2024-01-14T01:52:29Z

Thank you for your contribution!
This pull request has been automatically marked as stale because it has not had activity in the last 45 days. It will be closed in 30 days if no further activity occurs. Please feel free to give a status update now, or re-open when it's ready.
For maintainers: Please label with bug, awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

awkannan · 2024-01-17T17:32:14Z

Could I get the “awaiting review” tag added? I believe I’ve done as much as I can on the PR so far but I’m happy to address any further feedback

* upstream/master: (245 commits) Attempt to fix changed files on CI workflow (qmk#23205) Bump peter-evans/create-pull-request from 5 to 6 (qmk#22995) Iron180 V2 H: correct key sizes (qmk#23214) `mntre_v3`: correct layout data (qmk#23216) Iron180 V2 S: correct ANSI Enter key sizes (qmk#23215) Workaround for uart makefile issues (qmk#23192) Normalise .editorconfig. (qmk#23186) Remove cd suggestion from new-keyboard (qmk#23194) CLI Speed improvements. (qmk#23189) Fix up AVR production build target. (qmk#23190) Fixing typos for OSAv2 and OSAv2_Topre (qmk#23161) geistmaschine/geist: enable mousekey, fix issues in default/via keymap (qmk#23187) Merge point for 2024q1 Breaking Change 2024q1 `develop` changelog. (qmk#23150) Update Atmel DFU driver assignments for dfu-programmer 1.x (qmk#23165) Merge upstream uf2conv.py changes (qmk#23163) Satisfaction75 post merge updates (qmk#23158) Ensmallification of `helix/rev3_5rows:via`. (qmk#23159) Cleanup Satisfaction75 Firmware and add new revisions (qmk#22082) cipulot/common: Fix for multiple AMUX usage (qmk#23155) ...

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

awkannan added 22 commits September 19, 2023 23:51

Save progress on Sat75 redo firmware

6b6eba1

Add hacky workaround for OLED reliability

ed6a2c5

Update Sat75 HS and make common lib

7ae3cb9

Update sat75v2 to point to common folder

54e81ac

Make changes for master

07a8c4b

Update sat core lib to work with VIA again

6b46c43

Move oled on to info.json from rules

f74fa62

a bit more cleanup of keycodes

9a34c90

Make names common

4313471

Add layout to indicate full BS matrix pos

94bbf8e

Add layout to indicate matrix positions for non-hs PCB

161657c

invert encoder pins Sat75v2 hS

94ed704

change it back it was right before

285cf31

Unify all solderable Sat75s into one folder

07ca553

Update readmes

83a39a2

Remove Sat75v2 folder now that rev2 exists

0b255d7

Some final cleanup

ec18aff

remove blank layers on rev2 via keymap

70c3f61

A bit more cleanup

19fb0c5

a bit more cleanup

b097e80

remove dead variable

dd11506

Reformat JSONs

474a99f

github-actions bot added keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Sep 20, 2023

remove TODO now that it's done

3f5e568

drashna requested changes Sep 21, 2023

View reviewed changes

License headers, remove some unnecessary defines

9f3edc4

drashna reviewed Sep 23, 2023

View reviewed changes

keyboards/cannonkeys/satisfaction75/keymaps/boy_314/keymap.c Outdated Show resolved Hide resolved

awkannan added 2 commits September 24, 2023 16:51

Move keymap imports to keyboard header

d5bcf43

remove oled define

f900014

drashna approved these changes Sep 25, 2023

View reviewed changes

awkannan changed the base branch from master to develop September 25, 2023 15:37

drashna requested a review from a team September 25, 2023 19:42

fauxpark requested changes Oct 22, 2023

View reviewed changes

Apply suggestions from code review

d2f4ff0

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

tzarc added the breaking_change_2024q1 label Nov 29, 2023

github-actions bot added the stale Issues or pull requests that have become inactive without resolution. label Jan 14, 2024

zvecr added awaiting review and removed stale Issues or pull requests that have become inactive without resolution. labels Jan 17, 2024

awkannan and others added 2 commits February 26, 2024 16:27

Move user keymaps into rev1 folder

6b46079

Merge branch 'develop' into 202306_sat75_redo_firmware

1988add

tzarc approved these changes Feb 26, 2024

View reviewed changes

tzarc merged commit 4906413 into qmk:develop Feb 26, 2024
3 checks passed

peepeetee pushed a commit to peepeetee/qmk_firmware that referenced this pull request Mar 12, 2024

Cleanup Satisfaction75 Firmware and add new revisions (qmk#22082)

5fa45e1

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

awkannan mentioned this pull request Apr 3, 2024

Add new versions of Sat75 to VIA the-via/keyboards#2226

Merged

7 tasks

nuess0r pushed a commit to nuess0r/qmk_firmware that referenced this pull request Sep 8, 2024

Cleanup Satisfaction75 Firmware and add new revisions (qmk#22082)

9502459

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cleanup Satisfaction75 Firmware and add new revisions #22082

Cleanup Satisfaction75 Firmware and add new revisions #22082

awkannan commented Sep 20, 2023 •

edited

Loading

awkannan commented Sep 20, 2023 •

edited

Loading

drashna left a comment

awkannan commented Sep 25, 2023

fauxpark Oct 22, 2023

awkannan Oct 23, 2023

drashna Nov 29, 2023

fauxpark Oct 22, 2023

awkannan Oct 23, 2023

fauxpark Oct 22, 2023

awkannan Oct 23, 2023

github-actions bot commented Jan 14, 2024

awkannan commented Jan 17, 2024

Cleanup Satisfaction75 Firmware and add new revisions #22082

Cleanup Satisfaction75 Firmware and add new revisions #22082

Conversation

awkannan commented Sep 20, 2023 • edited Loading

Description

Types of Changes

Issues Fixed or Closed by This PR

Checklist

awkannan commented Sep 20, 2023 • edited Loading

drashna left a comment

Choose a reason for hiding this comment

awkannan commented Sep 25, 2023

fauxpark Oct 22, 2023

Choose a reason for hiding this comment

awkannan Oct 23, 2023

Choose a reason for hiding this comment

drashna Nov 29, 2023

Choose a reason for hiding this comment

fauxpark Oct 22, 2023

Choose a reason for hiding this comment

awkannan Oct 23, 2023

Choose a reason for hiding this comment

fauxpark Oct 22, 2023

Choose a reason for hiding this comment

awkannan Oct 23, 2023

Choose a reason for hiding this comment

github-actions bot commented Jan 14, 2024

awkannan commented Jan 17, 2024

awkannan commented Sep 20, 2023 •

edited

Loading

awkannan commented Sep 20, 2023 •

edited

Loading