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.

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
merged 30 commits into from
Feb 13, 2019

Conversation

awkannan
Copy link
Contributor

@awkannan awkannan commented Feb 10, 2019

Description

Adding the Satisfaction75 base code to QMK, enabling EEPROM of stm32f072, adding the basic CK4x4 macropad to handwired

Types of changes

  • Core
  • Bugfix
  • New Feature
  • Enhancement/Optimization
  • Keyboard (addition or update)
  • Keymap/Layout/Userspace (addition or update)
  • Documentation

Issues Fixed or Closed by this PR

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document. (https://docs.qmk.fm/#/contributing)
  • 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).

keyboards/handwired/ck4x4/config.h Outdated Show resolved Hide resolved
keyboards/cannonkeys/satisfaction75/config.h Outdated Show resolved Hide resolved
keyboards/cannonkeys/satisfaction75/config.h Outdated Show resolved Hide resolved
keyboards/cannonkeys/satisfaction75/config.h Outdated Show resolved Hide resolved
keyboards/cannonkeys/satisfaction75/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/handwired/ck4x4/config.h Outdated Show resolved Hide resolved
keyboards/handwired/ck4x4/config.h Outdated Show resolved Hide resolved
keyboards/handwired/ck4x4/config.h Outdated Show resolved Hide resolved
keyboards/zeal60/zeal60_keycodes.h Show resolved Hide resolved
drivers/qwiic/micro_oled.c Outdated Show resolved Hide resolved
Copy link
Contributor

@mechmerlin mechmerlin left a 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
Copy link
Contributor

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?

@mechmerlin mechmerlin merged commit 6b4549d into qmk:master Feb 13, 2019
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
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants