Code

solartempest merge#1

Code

Merged

crembz merged 176 commits intocrembz:mastercrembz/qmk_firmware:masterfrom solartempest:mastersolartempest/qmk_firmware:masterCopy head branch name to clipboardJun 15, 2022

+21,976-6

Commits

Commits on Sep 9, 2021

• Adding PS17 files

  solartempest

  committed
  fbd8612

  Copy full SHA for fbd8612

• Delete firmware location.lnk

  solartempest

  authored
  9877c6f

  Copy full SHA for 9877c6f

• Delete firmware location.lnk

  solartempest

  authored
  114fb3a

  Copy full SHA for 114fb3a

• Add 9e files.

  solartempest

  committed
  e7aebf7

  Copy full SHA for e7aebf7

• Removed extra files

  solartempest

  committed
  b6e351e

  Copy full SHA for b6e351e

• Add sofle files.

  solartempest

  committed
  74e56b4

  Copy full SHA for 74e56b4

• Merge branch 'master' of https://github.com/qmk/qmk_firmware

  solartempest

  committed
  6a2a0f7

  Copy full SHA for 6a2a0f7

• Initial commit

  solartempest

  committed
  47bc4a4

  Copy full SHA for 47bc4a4

• Initial commit, in progress.

  solartempest

  committed
  4dbd6fb

  Copy full SHA for 4dbd6fb

• Add firmware file.

  solartempest

  committed
  97f5ecf

  Copy full SHA for 97f5ecf

• Merge branch 'sofle'

  solartempest

  committed
  084d22f

  Copy full SHA for 084d22f

• Changed RGB enable to noeeprom.

  solartempest

  committed
  909427a

  Copy full SHA for 909427a

• Changed RGB timer to be noeeprom.

  solartempest

  committed
  1b7d27e

  Copy full SHA for 1b7d27e

• Initial commit.

  solartempest

  committed
  74543cb

  Copy full SHA for 74543cb

• Merge branch 'ak21'

  solartempest

  committed
  fdd9f66

  Copy full SHA for fdd9f66

• Add firmware file.

  solartempest

  committed
  26f6b2a

  Copy full SHA for 26f6b2a

• Merge branch 'ak21'

  solartempest

  committed
  919ab68

  Copy full SHA for 919ab68

Commits on Sep 11, 2021

• Merge branch 'gmmkpro'

  solartempest

  committed
  53c2cae

  Copy full SHA for 53c2cae

• Updated for breaking changes and encoder LED animation

  solartempest

  committed
  0d51da7

  Copy full SHA for 0d51da7

• Merge branch '9e'

  solartempest

  committed
  7a2b640

  Copy full SHA for 7a2b640

• Restore files.

  solartempest

  committed
  3585ae6

  Copy full SHA for 3585ae6

• Cleanup files

  solartempest

  committed
  deab6ab

  Copy full SHA for deab6ab

• Merge branch 'ps17'

  solartempest

  committed
  ca6a2c8

  Copy full SHA for ca6a2c8

• Changed debounce to 6.

  solartempest

  committed
  bdf3e21

  Copy full SHA for bdf3e21

• Merge branch 'sofle'

  solartempest

  committed
  985f25d

  Copy full SHA for 985f25d

• Merge branch 'master' of https://github.com/qmk/qmk_firmware

  solartempest

  committed
  9c482e9

  Copy full SHA for 9c482e9

Commits on Sep 14, 2021

• Increased combo duration

  solartempest

  committed
  a0c2e8b

  Copy full SHA for a0c2e8b

• Merge branch 'ps17'

  solartempest

  committed
  6ab2830

  Copy full SHA for 6ab2830

• Commented out combo code as it is not used

  solartempest

  committed
  3d7d874

  Copy full SHA for 3d7d874

• Merge branch 'sofle'

  solartempest

  committed
  1e22fc9

  Copy full SHA for 1e22fc9

• Added another VIA layer.

  solartempest

  committed
  00073c9

  Copy full SHA for 00073c9

• Merge branch 'sofle'

  solartempest

  committed
  b6f9c70

  Copy full SHA for b6f9c70

Commits on Sep 17, 2021

• Updated encoder function and disabled rainbow RGB

  solartempest

  committed
  ea722b9

  Copy full SHA for ea722b9

Commits on Sep 18, 2021

• Added define for OLED_LOGO in config.h for those looking to save space

  solartempest

  committed
  7175936

  Copy full SHA for 7175936

• Merge branch 'sofle'

  solartempest

  committed
  07b13c2

  Copy full SHA for 07b13c2

• Merge branch 'master' of https://github.com/qmk/qmk_firmware

  solartempest

  committed
  472268e

  Copy full SHA for 472268e

Commits on Sep 27, 2021

• Custom functions work in progress.

  solartempest

  committed
  331422f

  Copy full SHA for 331422f

• Updated VIA layout.

  solartempest

  committed
  b646305

  Copy full SHA for b646305

• Merge branch '9e'

  solartempest

  committed
  1e61e91

  Copy full SHA for 1e61e91

• Small file correction.

  solartempest

  committed
  1cd8345

  Copy full SHA for 1cd8345

• Remove file with issues.

  solartempest

  authored
  aa9e899

  Copy full SHA for aa9e899

• Remove file with issues.

  solartempest

  authored
  f1af31c

  Copy full SHA for f1af31c

• Restore hex file.

  solartempest

  committed
  24349ce

  Copy full SHA for 24349ce

• Attempt to resolve merge conflict

  solartempest

  committed
  826618c

  Copy full SHA for 826618c

• Remove extra file

  solartempest

  committed
  910c5eb

  Copy full SHA for 910c5eb

• Merge branch 'ps17'

  solartempest

  committed
  896dc73

  Copy full SHA for 896dc73

Commits on Oct 28, 2021

• Merge branch 'master' of https://github.com/qmk/qmk_firmware

  solartempest

  committed
  b461d06

  Copy full SHA for b461d06

• Merge branch 'master' of https://github.com/qmk/qmk_firmware into sofle

  solartempest

  committed
  26ea834

  Copy full SHA for 26ea834

Commits on Oct 31, 2021

• Add pimoroni trackball support.

  solartempest

  committed
  80616dc

  Copy full SHA for 80616dc

• Merge branch 'sofle'

  solartempest

  committed
  55cde80

  Copy full SHA for 55cde80

• Simpler fix for trackball rotation issue. Updated readme.

  solartempest

  committed
  dba1037

  Copy full SHA for dba1037

• Merge branch 'sofle'

  solartempest

  committed
  5158b33

  Copy full SHA for 5158b33

Commits on Nov 4, 2021

• Adjusted trackball precision.

  solartempest

  committed
  4fbaac9

  Copy full SHA for 4fbaac9

• Merge branch 'sofle'

  solartempest

  committed
  14d65a7

  Copy full SHA for 14d65a7

Commits on Nov 5, 2021

• Added rotary encoder LED animation and stretch timer first iteration.

  solartempest

  committed
  806e168

  Copy full SHA for 806e168

• Update stretch timer code for max timer limitations.

  solartempest

  committed
  6b786ca

  Copy full SHA for 6b786ca

Commits on Nov 6, 2021

• Merge branch '9e'

  solartempest

  committed
  fdce7fc

  Copy full SHA for fdce7fc

• Clean up files

  solartempest

  committed
  3041f74

  Copy full SHA for 3041f74

• Merge branch '9e'

  solartempest

  committed
  5d6ffeb

  Copy full SHA for 5d6ffeb

Commits on Nov 7, 2021

• Updated rotary encoder code with Drashna's improvements. LED status correction for stretch timer.

  solartempest

  committed
  4db5c32

  Copy full SHA for 4db5c32

• Add firmware file.

  solartempest

  committed
  e146857

  Copy full SHA for e146857

• Merge branch '9e'

  solartempest

  committed
  b384d37

  Copy full SHA for b384d37

• Updated rotary encoder code with Drashna's improvements. Tweaked trackball interval.

  solartempest

  committed
  35fd55b

  Copy full SHA for 35fd55b

• Commit changes.

  solartempest

  committed
  41da72d

  Copy full SHA for 41da72d

• Fix files.

  solartempest

  committed
  414b4b5

  Copy full SHA for 414b4b5

• Fix files

  solartempest

  committed
  48fadc5

  Copy full SHA for 48fadc5

• Fix files

  solartempest

  committed
  6fe9375

  Copy full SHA for 6fe9375

• Fix files

  solartempest

  committed
  0ad5610

  Copy full SHA for 0ad5610

• Trying to fix commit errors

  solartempest

  committed
  0f790d3

  Copy full SHA for 0f790d3

• Restore files

  solartempest

  committed
  5ffa35c

  Copy full SHA for 5ffa35c

• Attempt to fix files

  solartempest

  committed
  b2b9d7d

  Copy full SHA for b2b9d7d

• Restoring files

  solartempest

  committed
  6f39df5

  Copy full SHA for 6f39df5

• Update for stretch timer

  solartempest

  committed
  45c8e9c

  Copy full SHA for 45c8e9c

• Merge branch '9e'

  solartempest

  committed
  117ea0a

  Copy full SHA for 117ea0a

• Merge branch 'master' of https://github.com/qmk/qmk_firmware

  solartempest

  committed
  ac01152

  Copy full SHA for ac01152

• Merge branch 'master' of https://github.com/qmk/qmk_firmware into 9e

  solartempest

  committed
  537a318

  Copy full SHA for 537a318

• Merge branch 'master' of https://github.com/qmk/qmk_firmware into ps17

  solartempest

  committed
  e241d80

  Copy full SHA for e241d80

• Merge branch 'master' of https://github.com/qmk/qmk_firmware into sofle

  solartempest

  committed
  905e698

  Copy full SHA for 905e698

• Merge branch 'master' of https://github.com/qmk/qmk_firmware into gmmkpro

  solartempest

  committed
  d9741c9

  Copy full SHA for d9741c9

• Correct encoder index for animation

  solartempest

  committed
  e08817b

  Copy full SHA for e08817b

• Correct encoder index for animation. Add firmware file.

  solartempest

  committed
  a97aebc

  Copy full SHA for a97aebc

• Merge branch '9e'

  solartempest

  committed
  69bd503

  Copy full SHA for 69bd503

Commits on Nov 8, 2021

• Correct file link (Courtesy of xen). Code cleanup for clarity.

  solartempest

  committed
  956be50

  Copy full SHA for 956be50

• Merge branch 'ps17'

  solartempest

  committed
  8a3d0da

  Copy full SHA for 8a3d0da

Commits on Nov 12, 2021

• Add trackball click support for mouse buttons and key codes.

  solartempest

  committed
  ae8f23f

  Copy full SHA for ae8f23f

• Merge branch 'sofle'

  solartempest

  committed
  f119d8b

  Copy full SHA for f119d8b

Commits on Nov 14, 2021

• Add support for haptic feedback.

  solartempest

  committed
  1952283

  Copy full SHA for 1952283

• Update readme notes.

  solartempest

  committed
  785f8f6

  Copy full SHA for 785f8f6

• Update readme notes.

  solartempest

  committed
  63155e9

  Copy full SHA for 63155e9

• Update readme notes.

  solartempest

  committed
  f75e3eb

  Copy full SHA for f75e3eb

• Update readme notes.

  solartempest

  committed
  6a719a8

  Copy full SHA for 6a719a8

• Update readme notes.

  solartempest

  committed
  75f6034

  Copy full SHA for 75f6034

• Update readme notes.

  solartempest

  committed
  ea02e0a

  Copy full SHA for ea02e0a

• Merge branch 'sofle'

  solartempest

  committed
  fd95ead

  Copy full SHA for fd95ead

Commits on Nov 25, 2021

• Space optimizations, code cleanup, added code comments.

  solartempest

  committed
  2e9de99

  Copy full SHA for 2e9de99

• Merge branch 'sofle'

  solartempest

  committed
  e8c9e18

  Copy full SHA for e8c9e18

Commits on Nov 26, 2021

• Add standing timer, update LED code, code optimizations

  solartempest

  committed
  93194d4

  Copy full SHA for 93194d4

• Merge branch 'ps17'

  solartempest

  committed
  13ed291

  Copy full SHA for 13ed291

• Update firmware for standing timer, code optimizations

  solartempest

  committed
  d66cd5a

  Copy full SHA for d66cd5a

• Merge branch 'ps17'

  solartempest

  committed
  74bb197

  Copy full SHA for 74bb197

• Improved stretch timer LEDs. Add NKRO.

  solartempest

  committed
  7490f8b

  Copy full SHA for 7490f8b

• Merge branch '9e'

  solartempest

  committed
  bbb4b67

  Copy full SHA for bbb4b67

• Test lower trackball interval

  solartempest

  committed
  4c4fa49

  Copy full SHA for 4c4fa49

• Code cleanup

  solartempest

  committed
  5f48cf8

  Copy full SHA for 5f48cf8

• Merge branch 'gmmkpro'

  solartempest

  committed
  fac769e

  Copy full SHA for fac769e

• Merge branch 'sofle'

  solartempest

  committed
  5fa4232

  Copy full SHA for 5fa4232

• Fix lock key LED indicators

  solartempest

  committed
  b74a5ca

  Copy full SHA for b74a5ca

• Merge branch 'sofle'

  solartempest

  committed
  7da2159

  Copy full SHA for 7da2159

Commits on Nov 27, 2021

• Add gaming layer haptic feedback

  solartempest

  committed
  61ce7a2

  Copy full SHA for 61ce7a2

• Merge branch 'sofle'

  solartempest

  committed
  51651e6

  Copy full SHA for 51651e6

Commits on Nov 28, 2021

• Added haptic feedback for control key on game layer.

  solartempest

  committed
  053ce1e

  Copy full SHA for 053ce1e

• Merge branch 'sofle'

  solartempest

  committed
  be41ec4

  Copy full SHA for be41ec4

• Update ignores

  solartempest

  committed
  6d17ddc

  Copy full SHA for 6d17ddc

• Merge branch 'master' of https://github.com/qmk/qmk_firmware

  solartempest

  committed
  204a567

  Copy full SHA for 204a567

• Merge branch 'master' of https://github.com/qmk/qmk_firmware into sofle

  solartempest

  committed
  2170eeb

  Copy full SHA for 2170eeb

Commits on Nov 29, 2021

• Updated for breaking changes. Minor code still in progress.

  solartempest

  committed
  96346e5

  Copy full SHA for 96346e5

• Add firmware file for breaking changes updates.

  solartempest

  committed
  bb72963

  Copy full SHA for bb72963

• Merge branch 'master' of https://github.com/qmk/qmk_firmware into ps17

  solartempest

  committed
  2b4f48c

  Copy full SHA for 2b4f48c

• Updated firmware file only for breaking changes. No code changes.

  solartempest

  committed
  f4899eb

  Copy full SHA for f4899eb

• Merge branch 'master' of https://github.com/qmk/qmk_firmware into 9e

  solartempest

  committed
  e0d4da0

  Copy full SHA for e0d4da0

• Update firmware for breaking changes. No code changes.

  solartempest

  committed
  5d0a402

  Copy full SHA for 5d0a402

• Merge branch 'sofle'

  solartempest

  committed
  14b57ad

  Copy full SHA for 14b57ad

• Merge branch 'ps17'

  solartempest

  committed
  7001241

  Copy full SHA for 7001241

• Merge branch '9e'

  solartempest

  committed
  d2e5712

  Copy full SHA for d2e5712

• Merge branch 'master' of https://github.com/qmk/qmk_firmware into gmmkpro

  solartempest

  committed
  2c9db97

  Copy full SHA for 2c9db97

• Updates after breaking changes. Changed LED timeout and effects definitions.

  solartempest

  committed
  418c347

  Copy full SHA for 418c347

• Merge branch 'gmmkpro'

  solartempest

  committed
  53c5cba

  Copy full SHA for 53c5cba

Commits on Dec 1, 2021

• Optimized layer lighting and updated OLED WPM. Much more space efficient.

  solartempest

  committed
  a70e66c

  Copy full SHA for a70e66c

• Merge branch 'sofle'

  solartempest

  committed
  de8fdf0

  Copy full SHA for de8fdf0

• Optimize layer lighting code for space saving.

  solartempest

  committed
  d5ad8ab

  Copy full SHA for d5ad8ab

• Merge branch 'ps17'

  solartempest

  committed
  5830cd3

  Copy full SHA for 5830cd3

• OLED-free version for slise.dc

  solartempest

  committed
  7b85255

  Copy full SHA for 7b85255

• Added OLED ifdef

  solartempest

  committed
  65569fa

  Copy full SHA for 65569fa

Commits on Dec 4, 2021

• Add acknowledgements and change NO_PIN.

  solartempest

  committed
  df4df51

  Copy full SHA for df4df51

• Merge branch 'sofle'

  solartempest

  committed
  d3e9ae0

  Copy full SHA for d3e9ae0

Commits on Dec 11, 2021

• Add option for no OLED on master.

  solartempest

  committed
  aec6fe6

  Copy full SHA for aec6fe6

• Merge branch 'sofle'

  solartempest

  committed
  a872748

  Copy full SHA for a872748

Commits on Dec 12, 2021

• Correct splid oled sync when there is only one

  solartempest

  committed
  217337e

  Copy full SHA for 217337e

• Merge branch 'sofle'

  solartempest

  committed
  636068d

  Copy full SHA for 636068d

Commits on Dec 13, 2021

• Added destiny 2 skate macro and timer

  solartempest

  committed
  c982e62

  Copy full SHA for c982e62

• Merge branch 'sofle'

  solartempest

  committed
  1d0d913

  Copy full SHA for 1d0d913

• Merge branch 'master' of https://github.com/qmk/qmk_firmware

  solartempest

  committed
  3f0da73

  Copy full SHA for 3f0da73

• Merge branch 'master' of https://github.com/qmk/qmk_firmware into sofle

  solartempest

  committed
  7a9b635

  Copy full SHA for 7a9b635

Commits on Jan 2, 2022

• Merge branch 'master' of https://github.com/qmk/qmk_firmware

  solartempest

  committed
  bd69133

  Copy full SHA for bd69133

• Merge branch 'master' of https://github.com/qmk/qmk_firmware into sofle

  solartempest

  committed
  13fda03

  Copy full SHA for 13fda03

• Merge branch 'master' of https://github.com/qmk/qmk_firmware into 9e

  solartempest

  committed
  0468160

  Copy full SHA for 0468160

• Merge branch 'master' of https://github.com/qmk/qmk_firmware into ps17

  solartempest

  committed
  69fce48

  Copy full SHA for 69fce48

• Adjust layer colours.

  solartempest

  committed
  60cf6e2

  Copy full SHA for 60cf6e2

• Adjust layer colours

  solartempest

  committed
  9fd923d

  Copy full SHA for 9fd923d

• Update layer colours

  solartempest

  committed
  02f2134

  Copy full SHA for 02f2134

• Merge branch 'sofle'

  solartempest

  committed
  8e11eac

  Copy full SHA for 8e11eac

• Merge branch '9e'

  solartempest

  committed
  c1d5dc3

  Copy full SHA for c1d5dc3

• Merge branch 'ps17'

  solartempest

  committed
  f201559

  Copy full SHA for f201559

Commits on Jan 8, 2022

• Increase compatibility with stock OLED code

  solartempest

  committed
  3fb43b6

  Copy full SHA for 3fb43b6

• Merge branch 'sofle'

  solartempest

  committed
  eb3f4cb

  Copy full SHA for eb3f4cb

Commits on Jan 9, 2022

• Merge branch 'master' of https://github.com/qmk/qmk_firmware into zodiark_solar

  solartempest

  committed
  057526c

  Copy full SHA for 057526c

Commits on Jan 11, 2022

• General updates.

  solartempest

  committed
  ee6f48c

  Copy full SHA for ee6f48c

Commits on Jan 14, 2022

• Merge branch 'master' of https://github.com/qmk/qmk_firmware

  solartempest

  committed
  63e75e5

  Copy full SHA for 63e75e5

Commits on Jan 26, 2022

• Merge branch 'master' of https://github.com/qmk/qmk_firmware into zodiark_solar

  solartempest

  committed
  fa6fa97

  Copy full SHA for fa6fa97

• Updated build options

  solartempest

  committed
  e33c098

  Copy full SHA for e33c098

Commits on Jan 27, 2022

• Added pimoroni trackball support

  solartempest

  committed
  2c94084

  Copy full SHA for 2c94084

Commits on Jan 28, 2022

• Added VIA remapping of rotary encoders and custom functions.

  solartempest

  committed
  429f878

  Copy full SHA for 429f878

• Added readme and updated VIA layout.

  solartempest

  committed
  c05afb4

  Copy full SHA for c05afb4

• Merge branch 'zodiark_solar'

  solartempest

  committed
  e86dbf9

  Copy full SHA for e86dbf9

• Update readme

  solartempest

  committed
  bf5d9de

  Copy full SHA for bf5d9de

• Merge branch 'zodiark_solar'

  solartempest

  committed
  bdab62e

  Copy full SHA for bdab62e

• Update readme

  solartempest

  committed
  3e62b49

  Copy full SHA for 3e62b49

• Merge branch 'zodiark_solar'

  solartempest

  committed
  f5c0a7c

  Copy full SHA for f5c0a7c

• Changed product ID as VIA has issue loading layouts with the original one

  solartempest

  committed
  83a19dc

  Copy full SHA for 83a19dc

• Merge branch 'zodiark_solar'

  solartempest

  committed
  b751e7d

  Copy full SHA for b751e7d

Commits on Feb 10, 2022

• Fix skate macro. Update VIA game layout.

  solartempest

  committed
  17c4cc8

  Copy full SHA for 17c4cc8

• Merge branch 'zodiark_solar'

  solartempest

  committed
  1f8c314

  Copy full SHA for 1f8c314

Commits on Apr 13, 2022

• Updated firmware file and various files.

  solartempest

  committed
  992face

  Copy full SHA for 992face

• Removed haptic feedback by default. Functionality still can be enabled.

  solartempest

  committed
  30e3688

  Copy full SHA for 30e3688

• Merge branch 'sofle'

  solartempest

  committed
  4455037

  Copy full SHA for 4455037

• Merge branch 'zodiark_solar'

  solartempest

  committed
  29b3de7

  Copy full SHA for 29b3de7