-
-
Notifications
You must be signed in to change notification settings - Fork 38.3k
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.
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
Add Satisfaction75 to QMK, Enable EEPROM on stm32f072 #5094
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vomindoraan
suggested changes
Feb 10, 2019
drashna
requested changes
Feb 10, 2019
drashna
reviewed
Feb 12, 2019
drashna
approved these changes
Feb 13, 2019
mechmerlin
approved these changes
Feb 13, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When I'm watchin' my PRs and Upas comes on and tells me
Can this be merged quickly?
So I'll do as he says, cuz he's a good bloke
It's merged dude, yesiree!
#define DEVICE_VER 0x0001 | ||
/* in python2: list(u"whatever".encode('utf-16-le')) */ | ||
/* at most 32 characters or the ugly hack in usb_main.c borks */ | ||
#define MANUFACTURER QMK |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it not Cannon keys?
tenderlove
added a commit
to tenderlove/qmk_firmware
that referenced
this pull request
Feb 17, 2019
* master: (179 commits) Updates to noroadsleft keymap for KC60 (qmk#5127) [Keymap] Update to Drashna keymaps and Userspace (qmk#5122) Fix ESC on Default ANSI layer (qmk#5125) [Keyboard] KBD19x Bootmagic Enable (lite) and other fixes (qmk#5126) [Keymap] Add fsck keymaps for eco, planck and preonic (qmk#5106) [Keyboard] Unigo66 beta pcb added, bug fixes for flashing (qmk#5108) [Keymap] Adding buhearns keymap (qmk#5105) [Keyboard] New Keyboard: Doro67 Regular PCB (qmk#5115) Add Satisfaction75 to QMK, Enable EEPROM on stm32f072 (qmk#5094) Fix travis_compiled_push.sh script issue (qmk#5114) [Keyboard] Added aeboards/aegis (qmk#5099) [Keyboard] Refactor jj4x4 to enable ortho_4x4 LAYOUT (qmk#5112) [Keyboard] Move Keebio boards to own folder (qmk#5109) [Keymap] Plain60 rgb (qmk#5104) [Keymap] Add Minidox keymap by dustypomerleau (qmk#5101) Remove AUTOGEN and fix Travis Compiled Push scripts (qmk#5077) Added WT75-A, refactor wilba.tech PCBs (qmk#5100) [Keyboard] Space65: RGB Animations on by default (qmk#5097) Add digital layout for KBD75 (qmk#5095) fix the led_matrix.h naming conflict ...
dlhextall
pushed a commit
to dlhextall/qmk_firmware
that referenced
this pull request
May 24, 2019
* Add stm32f072 base ck4x4 to handwired * add prints * Save these tries * Save changes again * Working hadron oled * OLEd working but ws2812b still iffy: * save another try * Encoder feature + OLED * RTC code * Implement clock setting mode * Whitespace * Encoder hooked up to working LED PWM code * Add missing files * eeprom changes * Save changes * Move i2c master * Move satisfaction75 under cannonkeys * Set proper default folder * Revert some core changes * Undo paved iris changes * Reorganize code for maintainability and prep for new features * Add starting code for clock OLED mode * Clock set mode finished * Add custom encoder modes * Actually add VIA keymap * Gate to only 072 * fix gate for only 072 * Update header guards and includes * Update i2c selection strategy * Update board.c to handle software reset to DFU
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Adding the Satisfaction75 base code to QMK, enabling EEPROM of stm32f072, adding the basic CK4x4 macropad to handwired
Types of changes
Issues Fixed or Closed by this PR
Checklist: