Keymap Minivan: configurable dual layout, many symbols, speed/text-size measuring
* Made center led color follow last activated layer color. Some led code clean up
* Reordered the _RAR layer, also putting GUI on the _ACC layer.
* Some issue with _FUN (see keymap.c FIXME), removed _FUN nested 'go to layer' key on _FUN.
* markdown formatting
* Update readme about _FUN top row issue (see keymap.c at XXX)
* Sentence order final bit was wrong by topic. White space fiddles.
* Minor comment editing
* minor comment adjustments
* leds are not modifiers, moved
* _FUN persistance on base layer only (XXX)
* The up/left to go to _LTR layer, now always goes to BASE (_LTR or _DDL).
Led indicators refldect this. No _DRA hold on base layer but _ACC. No
one shot to _FUN layer (seemed to make things confusing), but a TO().
* Some chatter about how to configure this map to your needs.
* language fixing
* Tried to make sense explaining how to access the descramble.
* language fix
* Seems there was a stale CSET_LTR/.*DDL, should be BASE_LTR/.*DDL, fixed.
* language, blabla
* Corrected stale _LTR into BASE
* Some documentation finetuning and trying to make it simple to understand
* language fixing
* language fixing
* Doing the utmost to explain it in a way I understand it too.
* language fixing, going ultra-verbose
* language fixing and formatting
* language fixing
* language fixing, formatting
* attempt to simplify explanations as much as possible
* added License to keymap.c (GPL), noted that _ACC and _DRA need work to
function in 'descramble' mode
* fixes regarding layer order, adding two layers, started on descramble
layers for _ACC and _DRA Unicode
* Noted some coming changes about F-layer and more descramble.
* changed globals to type 'bool'
* Changed F-layer by removing pre-modifier F keys, moved BASE direction
switches, added new incomplete descramble layers
* _FUN layer changes (comment fix)
* Led color fixes. Changed order of layers in the source (no user consequence).
* Added copyright authors (hope that is correct in GPL style/requirements).
* Switched on BASE layers the keys to activate _MOV with leftside _NSY:
more harmoneous, and _MOV can also be held by right hand.
* Follow Quantum indentation style more (mostly).
* On _NSY & _DDN, Tab follows _LTR. '-' moved to LShift, '.' moved, ','
created, shift(tab) removed.
* Added Linux Unicode input mode Accented characters on layers _DDA, _DDD
* added to Todo
* Added ijIJ to _ACC and _DDA layers (2nd last letter of Dutch alphabet).
* add todo point about navigation, fix -> "8th key"
* added 「」《》 to _DRA and _DDA
* Added 〇, ƒƑ. Altered Nav clusters with paging on outside, added thumb Page up/down to _MOV, brought _REV in line with recent _NSY changes (tab,-,enter,dot,comma). Harmonized tab on _Mov with other layer tabs (also a move command, moving cells).
* Added super- and sub-script for numbers on _DRA, _DDD.
* Added quotation marks „ “ ” to layers _DRA and _DDD.
* Added °〇•· to _DRA, _DDA
* § as an enumeration grouped with • (bullet), · as possibly math (middot or multiply) grouped with ±.
* Changed numbers to be on home-rows both hands, because thumb layer key does
not interfere alternating between hands for longer numbers (previous
reason for one-handed numbers). The unshifted symbols went left 2nd row,
because then the shifted versions can be accessed with shift if the
layout is replicated on a Pok3r (which is non-programmable right hand 2nd row.)
The logic has been harmonized with layers _DDN, _DRA & _DDD, _FUN, which
have number(-like) keys. It seems better this way. The symbols are layed
out more spaciously, each finger now does two symbols (2nd row, 4th
row). The numbers are more like they normally are, which feels more
natural, and should even the load between both hands and help with
alternating between hands when typing numbers.
Reason to change was looking into pressing ;, q, j, with ring-, middle-,
index-finger (moved one to the right from default Dvorak), because the
stagger makes it easier to reach that way, less loss of home row contact,
bending fingers more straight up and down. Downside became that left
index type 5 numbers, and that the normal finger matching (0 is pinky,
etc) was lost. With the new layout these potential problems are also resolved.
* Made descramble _DDN, _DDL representation show both raw and resulting layouts.
layouts.
* Added arrows, fleur and heart on _DRA and _DDD.
* Changed _FUN layer switching to incorporate the 'descramble' system
seemlessly. The 4 layer with a descramble twin will switch to either
depending on the descramble mode.
* Descramble mode with normal Unicode layers mostly done, except costum LT() to share the key with Delete/Alt on _DDL.
* Changed descramble mode keys to be just one on a cycle. Added full set
of Alt/Control/Shift multimodifiers to `_FUN` layer.
* Changed descramble mode keys to be just one on a cycle. Added full set
of Alt/Control/Shift multimodifiers to `_FUN` layer.
* format fix
* Descramble cycle key moved from row 1 to row 4 far right, to avoid
accidental press,
* The 'descramble' mode with normal Unicode encoding finished. Fixed
mistaken non-transparent key on _DRA and _DDD, removed tab from _RAR.
* stale layer comment fix _LTR/_DDL
* New layer-tap timed keys proved unreliable, longer tap term fixed it.
* The _FUN layer is a one-shot layer for the F-keys, but that can be toggled by the FUN< key on the _FUN layer (top row, 3rd).
Some additions to the readme.
* Comment improvements (layout tables)
* minor
* Made #defines to allow a user to easily switch to a WASD arrow layout.
* Added keys to switch leds on/off, to _RAR layer. Fixed wrong comment on 'APP' key in _RAR.
* comments fix regarding MLed, SLeds
* Added BASE to same key as _FUN on base layer, except layers with numbers/symbols.
Removed capital ƒ, and moved ± to that key. Added … on old spot of ±.
Some readme language editing, adding something about other keyboards, etc.
* small language fix
* Config.h: Removed unused #defines.
Readme: minor edits.
* minor language edits.
* Minor comment edit.
* Minor language fix.
* Minor language style edit.
* Removed unnecessary section 'personal remarks'
* Changed the top row in _DRA and _DDD. Super-/sub-script parenthesis to that location on _NSY, added currency symbols, reduced emoticons.
* minor formatting
* Added LGUI and RGUI on the _DRA/_DDD layer(s).
* Put RGUI on the base layer, on the _FUN layer switch key. This probably causes side-effects on
systems without where RGUI is not merely a modifier.
* Changed _FUN toggle on BASE to Rshift, because RGUI on some systems has a consequence when tapped by itself.
* Changed LGUI and RGUI around because LGUI is mostly used and on BASE layer. Some edits to last part of readme.md.
* Minor language fixed (L/R-GUI, use-case).
* some more blabla on use case of the map generally
* Changed name KC__[LR]GUI to KC__[XY]GUI for clarity wrt switching them.
* Removed left-arrow on Alt on _ACC and _DRA, for faster use with pointer device.
* Added the same system as is on RShift, to LShift, pointed it to _MOV layer.
* Changed left shift layer toggle to _DRA, because it has uncluttered shift, alt, control, for using those with a pointer device (mouse, stylus).
* Changed base layer left-shift tap from _DRA to _MOV, because _MOV toggled can be convenient generally, and it is a less dangerous layer to accidentally press, and it makes more sense to activate the navigation layer when editing in 3D software.
* The Power keys on _RAR now require Shift to be activated (accident prevention).
* fiddled with title
* more title fiddles
* Added RGUI on _FUN for future proofing the layout, harmonizing layers.
* Added ',' on _REV (number fraction division). Minor fix to documentation format.
* title fiddle
* Added LGUI, RGUI to _RAR, to harmonize with other layers and for potential future uses.
* Changed unnecessary transparent keycode on _AcC and _DDA to be 'nop', minor comment fixes.
* Added on _DRA and _DDD: ─━┄┅.
Fixed a bug in led layer colors (forgotten 'else', causing wrong color for _DDD).
* Some changes to conform to QMK readme.md standards (more necessary).
* Changed _REV into a numbers pad layer called _PAD, put on Lshift in BASE.
_REV layer (not used anyway) replaced with a layer that is basically
a layer where symbols that exist on _NSY (mostly) and on _LTR (few)
are existing in the same locations, but in the number pad variant of
that symbol. The goal is to make it easy to find, it is not meant for
single hand access quickly. The use is to deal with special shortcuts
like Blender has, which differentiate normal and numpad numbers/symbols.
For quick access it was put on the left shift in BASE layer.
* Added navigation arrangements to _PAD. Changed location of shift on _RAR.
The numbers on numpad are easy to find, but when these keys are in their
navigation variant with numlock on it becomes almost impossible. There
was room on the map to add an arrow row, and a row for the remaining
navigation keys, hence they where added. They are in a left handed
order, because there already is a right handed order on _MOV.
It still proved possible to accidentally trigger Power, due to erroneous
hitting 'shift' in BASE and then messing around by accident. With shift
on (BASE) space in _RAR, accidents should be reduced further, since it
is a combination never used.
* Added Tab on _ACC and _PAD
To facilitate Control-Tab (a blender shortcut). On _ACC the Tab is in its
correct place. On _PAD it messy because not on its correct place. Leaving
it there for now: easier to access Tab+Control with left hand only on the
modifiers in _PAD, and other hand on a pointer device. Tab has a potential
use to jump input cells, which may be used in combination with a numpad.
* _MOV layer: switched default layout to trangle navigation layout.
This only required to set the already existing #defines. I found
the flat layout not intuitive, the triangle layout has no left/rigth hand problem.
The higher buttons for the mouse where not correctly ordered, so they where re-ordered.
* Triangle navigation by default. Added pictures of layout to readme.md
* Layer names on images.
* Changed image for layer _DRAW slightly.
The shifted symbol to the lower right.
* Image for _PAD corrected for no-action and Tab.
* Added a paragraph about why this layout is good to use.
* removed 'modifiers' paragraph
* Some text improvements in paragraph on what is good about this layout.
Fiddle on the title as well.
* Added Del on _DRAW layer.
Some minor text fiddles here and there.
* Removed word "descramble" in image layer _RAR.
* Improved key 'sticky' and altered image size (test).
* Rescaled image for layer FUN
* Unicode in its own file. Bug fix: _DDA 'ï' printed a capital.
Upon a suggestion from QMK Discord #programming, the macros and
unicode is put in a separate file, because keymap.c got large.
An erroneous numerical value for ï was fixed.
Author e-mail is updated to a new e-mail adres.
* Added an image to illustrate 'descramble' mode.
* Changed explicit e-mail to link, to reduce spam bot trolling.
* Added a Qwerty+Dvorak compile time version.
It seemed the overall design (accented, Unicode, stuff) could be useful
for Qwerty typers (of which there are so many). This was done by #if(n)def
out/in a fair amount of code here and there, and creating 4 replacement
layers in a new file qwerty_dvorak.c, also with its own readme in
qwerty_dvorak.md. The 'descramble' switch system is re-used here to
switch from Qwerty to Dvorak.
The new code is put in qwerty_dvorak.c, which starts with an extensive
comment about why and how it works.
Fix: Docs, a stale "_MOV" was replaced with "_PAD" in the readme.md for _DDL.
* Changed image hosting.
Downtime, problems registering: resorting to my own domain.
* minor text order changes
* Some text improvements.
* Added a compile option to easily change what layer is active on startup.
This layer can be plain Dvorak or 'descrambled' Dvorak, if
QWERTY_DVORAK is not set. It can be Qwerty or Dvorak if it is set.
Just some simple #define statements.
* Added graphics for Qwerty+Dvorak, and improved documentation.
Added the whole set of layers also to qwerty_dvorak.md, because
it seemed it would get even more confusing to have a user cross
reference it between the two files.
* Some simple text improvements
* Numbers/symbols layer keys on BASE to DRAW when both pressed.
The two keys besides the space bars go to DRAW layer when pressed
simultaneously. (This is inspired on the Planck's 'adjust' layer,
pressing both 'lower' and 'raise' together.) All layers can now
(relatively) comfortably be reached. This change was necessary
because it was cumbersome to reach the DRAW layer with the right
pinky and then type with the right hand. _RAR is now not super
easy, but it is a 'rare' layer anyway.
* Added compile + flash section in readme.
* Corrected documentation: 'mouse on ... hand'
* Removed up/down arrow ⮙⮛ on _DRA and _DDD, because the hex file was too large.
Due to pulling the master repository, changing nothing in this keymap, the
code compiled as 2 bytes too large, where before it had been 2 bytes left free.
Some compile options have been created, to make it easy to cut out up/down
arrow on the 'descramble' _DDD layer, and/or the normal _DRA layer, and/or
dashes ┄┅ on the 'descramble' _DDD layer. The 'normal' layer cut out of arrows
yields little benefit, but it keeps all layers exactly the same between 'descramble'
and normal mode. For Qwerty compilation, you will want to not cut out anything,
requiring to edit the user compile options in keymap.c (top).
* Resolved size issue with QMK #defines, re-instated ⮙⮛, removed RGUI on _FUN.
Various #defines tested to reduce space, NO_ACTION_MACRO NO_ACTION_FUNCTION
worked. Therefore the cutting out of the up/down arrows was no longer
needed. The #defines to easily remove them have been left in place.
RGUI made _FUN confusing with the multi-modifiers, thus taken out. Multi-
modifiers now logically cascade without skipping a key.
* Improved image files with led colors and some tweaks.
* Updated graphics file for Dvorak in QWERTY_DVORAK compile option.
The led colors where not correct because the graphics for standard
Dvorak was being re-used.
* Fixed for re-instating arrow up/down for space.
* Activation marker on _FUN layer in documentation altered.
It looked like it was a symbol.
* Made startup layer explicit in code.
Startup layer follows 'descramble' on/off user #define setting.
* Marker for BASE activation for _PAD, _MOV: fixed.
There was a stale marker in the documentation layouts for _MOV: removed.
The same marker for _PAD was improved.
* Code optimizations suggested on pull request #8066https://github.com/qmk/qmk_firmware/pull/8066
Some things moved to config.h, rules.mk
Changed layer_on/_off to layer_move(..)
Removed a global variable, changed literal type on a function.
Code is now a lot smaller, hence removed readme.md entry on that.
Removed "not shown" on 'descramble' leds in qwerty readme (mistake).
* Compile option to change ƒ into €.
Since it's a west european keymap, maybe someone likes the euro currency on it.
(It was not on it because I don't like ...)
* default to ƒ on keymap
* Removed print sheet for layout *.odt file.
Changing this to text/markdown seems to reduce the use of this file
to a point that it may be better to delete it. There is also the
graphics now, which might be better to print.
* Updated the seller/maintainer of the board to: The Key Dot Company LLC.
https://thekey.company/blogs/blog-updates/thekey-company-acquires-minivan
* Changed external links to website to plain text.
The markdown link is caught by the github cammo system.
* Last free spot on the map made easy to configure.
One spot was still free (Unicode _DRA/_DDD layer). This puts a #define
on top of unicode_macros.c, to make it easy for a user to put in their
own symbol.
Put placeholder 🛠 in there. That symbol is not represented in the
documentation (maybe it should, it is a nice symbol).
* Removed space saving #defines.
These became obsolete clutter, now that there is enough space thanks to
LINK_TIME_OPTIMIZATION_ENABLE.
* Added tokens to simplify compiling for 45/46 keys.
An attempt to make it easy to switch on a #define between
various hardware configurations (44, 45, 46 keys) failed.
This: #define J1 , KC_A // seems to have failed to be
recognized as a key definition.
error: error: macro "LAYOUT_command" requires 45 arguments, but only 44 given
Left in are some code tokens (J1-J4) and #defines that need
at least bulk replacement in keymap.c and optionally qwerty_dvorak.c,
to compile for such hardware configurations. It would be nice
if this could be done better.
* User can easily compile for 45, 46 hardware keys.
Added some #ifdefs around optional keys in the keymap, to allow
compiling for 45 and 46 keys. Left the earlier made code with the
J1_J2 etc. tokens, which could still be used to port the map to
a board with even more keys. This fixes earlier mentioned problem.
* Arrow cluster for 'arrow' hardware configuration.
This is a user configurations option in the keymap.c, to have
an arrow cluster around the additional key for 'arrow' hardware.
The arrow cluster is however not on the base layer (no room). The
additional key is used to switch to the _MOV layer. There it becomes
a down arrow in the arrow cluster.
To make this work with the default _MOV layer, the right hand
keys on the 2nd row where moved one spot to the left, for the 'triangle'
arrow configuration (mouse right). This is a trivial change.
There was a bunch of language improvements to the documentation,
including graphics.
The symbol 🛠 is now listed.
The program seems to be reliable, as far as used and tested.
* Correction of mark-down formatting.
_MOV layer 'arrow' cluster documentation rendered incorrectly
(attempt to add newline).
* Markdown formatting mistake correction.
Adding a newline at 'Layers (text)' chapter.
* Moving the graphics about 'arrow' to topic.
The graphic explaining what 'arrow' with arrow cluster means,
should be where that is mentioned under compile options.
* Editor token J3_J4 moved to avoid arrow cluster.
If one wants to insert a key by bulk replacing J3_J4, and has
activated the 'arrow' layout arrow cluster, this new key would
be inside the arrow cluster, hence it was moved to the left.
* Æstethics of image 'arrow' layout, arrow cluster.
Shading corrected/nicer.
* Corrected image link in readme.md
Illustration 'arrow' layout, arrow cluster.
* Fix: Toggle to BASE layer leaked. South-paw key.
When toggling to a non-BASE layer, either on the _FUN layer or
using the 'arrow' cluster for 'arrow' layout, on the BASE layer to
toggle to _MOV, the layer changed on the down-stroke, causing a
character to leak. These layer switch macros now alter layer on the
up stroke.
There seems to have been an accidental code deletion: #define MORE_key1.
This defines what the additional hardware key for 'South Paw' ('Command')
should be.
* User compile option comments easier to read.
The phrases "uncomment" and "comment out" are confusing.
Replaced by _activate_ and _remove_.
* Put user compile options back to default Minivan.
Accidentally left the compile options for number of Minivan keys
in the wrong state while git pushing.
* Rewording a comment in the user compile options.
Clearer language.
* Leds indicate Caps/Num-lock.
Leds green/blue switch depending on numlock for numbers-pad layer _PAD.
BASE layer led brightens when capslock is on.
* _PAD had the wrong period, fixed.
_PAD layer had the KC_DOT instead of KC_KP_DOT.
* Options for navigation keys arrow hardware key.
Compile options added to have a complete navigation cluster around
the additional hardware key for 'arrow' layout, both for triangle
left handed arrows and flat right handed arrows.
* Added _FUN layer in text Qwerty.
_FUN text layer was by mistake missing/deleted in the qwerty-dvorak readme.
* Added graphical visualization of all layers.
* Graphics: _RAR 'Capslock', _NSY '~' corrected.
Text representation of layers was correct, graphics corrected.
* Compile Option arrows in a vi(1) editor layout.
Vi(1) is a much loved editor, with its own peculiar arrow layout
on HJKL (as it appears in Qwerty). It seems possible some Qwerty
vi users might find it fun this way for regular arrows as well.
The 'arrow' hardware layout, compiled with arrow cluster, follows
the vi(1) arrow arrangement.
* More layer overview graphics files for the readmes.
Added a '40% x 400%' to the 3D layer overview image (top).
Added overview of all layers in a readable way (Dvorak² only).
Added a guide to show where what is similar on layers. This should help with learning.
Added a graphic showing what key activates what layer.
Added graphics that show what layer subsets are active in certain modes (Dvorak² and Qwerty/Dvorak).
Fixed mistake: _Tab_ missing in layer `_PAD` graphics file.
* 'Tab' inserted in overview graphics for _PAD layer.
* Corrected mistake in similar layer keys.
LGUI on _ACC
* Added overview graphics for Qwerty/Dvorak.
Overview of layers, similar keys on similar layers, activation.
* Compile option to change ⮘ ⮙ ⮚ ⮛ into ☐ ☒ ☑ 🗹
Layer _DRA, _DDD. Checkboxes seem handy for lists. Set default on in
keymap.c. Pointers seem rarely useful. Right arrow sometimes as a bullet
point marker. All affected graphics updated.
* First overview image correction.
Last layer is not 'symbols' due to its numbers.
Some art improvement.
* Minor tekst correction (author Minivan config).
* Short features overview and git lib fix.
* note⁴ as example
* Improvements all over the place.
The keymap is now modular dual layout. There is a common system,
and there can then be two letter/numbers layer pairs be compiled
with it, which are separately defined and documented in ./bases…
files.
Speed measuring and text size counting added.
There is an additional Unicode layer, for a total of three.
The “descramble Dvorak” layer is now just a function, as was
originally intended.
* Wrong link to Dvorak manual, stray ‛r’ character.
* Splitting the layouts so they are not pairs of 4.
The layers had been configurable only as a set of a BASE and letter
layer with another BASE and letter layer: Dvorak + Dvorak² and
Qwerty+Dvorak.
Now Dvorak, Dvorak² and Qwerty can be individually configured, to
be on either the Default or Alternate spots in the dual layout
(Dvorak² only supports Alternate, due to its “_HALF_ descramble” mode).
* Added Colemak layout.
Some tidying up of documentation wrt DEF/ALT base layer identifiers.
Fixed missing ‛:’ on the graphics for Qwerty.
* stale letter
* fix modified submodules
* removed redundant code
testing twice for non-zero
* Speed measuring precision fix.
The calculation of “int speed;” caused great loss of precision.
* Added overview of layers by key.
Makes it easier to see the associations of meanings per key.
* Dvorak descramble by key overview
Forgot to add.
* Minor readme format fiddle.
* Graphics: blank keys are grey, fix one mistake.
* Compilation as a single layout.
Layer definitions _ALT_BASE and _ALT_NSY (enum) are simply #redefined
as preprocessor numbers equal to _DEF_BASE and _DEF_NSY (see user_config.h,
lowest reference to MINIFAN_SINGLE_LAYOUT).
* Single layout compile option
See user_config.h lowest reference to MINIFAN_SINGLE_LAYOUT for the why of the how.
* RShift toggles to _RAR when held ≥ 500 ms.
“Qwerty with arrows on BASE”, will need a key to _RAR layer.
It mirrors the behavior of LShift. It is generally useful.
Removed useless user options regarding LShift layer toggle.
It will have to be _PAD.
* Layer switch graphic update per last push.
Forgot to update the default base layer switching graphic.
* Preconfigured optional ‛Command’ hold key to _RAR layer.
This is a third way to reach the _RAR layer, useful if the furthest
right key on row 1 is changed to an uncluttered BASE layer arrow.
This further prepares the way for a Qwerty layout with arrows on BASE.
* Changed ‛Command’ hardware key to TG(_RAR)
MO(_RAR) doesn't work, because it doesn't follow a change in base
layers, which happens on _RAR.
* Corrected wrong all-layers-by-key upload readme.md
* More graphics = more fun: keycap view in readme.
Preparing to integrate a number pad base layer.
Shortened hold time for right/left Shift layer toggles to 200 ms.
* Too light grey for “1470” on three layout graphics.
* Added a numbers pad Base layout option.
This numbers pad layer is in the format of a numbers pad keyboard/cluster.
It has a second layer, which is normal for all Base layers. In this case,
the second layer provides sub-/super-script versions of the numbers, in the
same layout.
* Keycap view numpad improvements.
* Graphics: forgot to cut off southpaw/arrow on two keycap views.
* Preprocessor identifier for “MIT” Planck spacebar.
Trans-minivan preprocessor statements augmented with an identifier
which might work for a Planck keyboard with two unit spacebar.
At this point, the “trans minivan” code only could make porting
to other keyboards less of a chore. It remains untested. Only
visual inspection of the preprocessing regarding the amount of
keys in the layout has been done.
* Tweak of common layout graphic impression.
This would also allow indication of a number pad.
* Improved dual numpad layer & graphics.
All numbers/symbols seem to get affected by NumLock, hence they
all needed to show that in the graphic documentation. Tab was
removed in favor of Numpad ‛=’, and comma replaced by numpad-comma.
* Committing partial job on numpad Base layers.
Hardware problem here, don't want to loose the data.
* Three issues: header file, numpad Base, Tab key.
This should complete previous unexpected commit.
① Documentation and precedent for a base layer with its own header file,
base_NAME.h. This allows someone writing a new Base layer pair, to
(un)set user configuration options in user_config.h.
② Numbers pad Base layer added, different variants.
The common numbers pad also has a new optional layout (square), and can be
removed by user configuration option (because one might already compile with
the Base layer numbers pad)..
③ It turns out there was an easy solution to the Tab key anomaly.
Uncluttered Tab is now located both on BON and ACC layers, on intuitive
locations opposing Control, which is also in the right spot. Basic
modifiers for Tab works well now.
* Graphics for Base numpad single square: correction.
Showed wrong insertion key for 'command' / 'south paw' hardware key.
…
* ‛South paw’ default GUI. Graphics. TOC user config.
Made ‛south paw’ be GUI by default.
Improved graphics appearance.
Ordered options in user_config.h, added table of contents.
* User config cleanup & added a compact alternate.
The normal user configuration, which is heavily documented and
therefore a bit unwieldy, can now optionally be done in another
file, without any documentation.
* Base graphics fix, _ACC/_NSY hold switch option
* Added a Qwerty with arrows on base.
Added a graphic in readme for Dvorak descramble (for documentation predictability).
* Put `~ on the _BON layer.
① There was no uncluttered `~ available. On Qwerty Base Arrow
the `~ key got even more sidelined.
② Improved Qwerty Base Arrow manual.
* Option to harmonize Qwerty with Qwerty Base Arrow
Key ‛/?’ is different on Qwerty Base Arrow, which will lead
to typing arrows for people who have both kinds of Qwerty
running. This option adds this key in the same spot as where
it is on Qwerty Base Arrow, but only if Qwerty Base Arrow is
being compiled.
* See previous commit (Qwerty harmonization)
* Efficiency fix. +Workman layout.
Workman layout added.
Serious efficiency mistakes discovered and fixed:
① There was no check on Delete on Base layer, to see if another
key had been pressed. Fixed.
② The Shifts on Base did not provide a Shift for the _BON layer
accented characters. Fixed.
Fixing was painless, proving the code is stable and maintainable.
* Changed Tab/CTL on _ACC/_DRA, μ, T.O.C. readme.md
μ was forgotten (French), added on _ACC.
This caused Tab to get displaced and stacked with Control, which
ends up being better anyway. This also meant _ACC needed Left-Control,
and therefore _DRA needed to switch Tab and Control, because it needs
to complement _ACC with Right-Control (to be able to type all modifiers
with Tab).
➡ Overview graphics are not yet updated. _DRA and _ACC are now out of sync
in the graphics documentation. To be fixed soon.
Chapter on language support added in readme.
Table of Contents added to readme.
* Updated all graphics (_BON/_DRA Tab/Control/μ).
Some fiddles with readme.
* Led on/off at startup, RAlt on Base option.
It is hard to believe, but the todo que seems empty!
* Minor changes in readme.
* Minor documentation improvement (RAlt/_RAR).
* Minor changes readme.
Removed “not tested yet …”, because that becomes wrong once it is tested.
* Added a blank keycaps graphic.
* Lower saturation letters Dvorak-descramble keycap.
;-]
* One key change in personal keycap graphic.
;-]
* Forgot _NSY layer in keycap qwerty basearrow
* Moved speed/count startup setting in user_config.h
Moved to chapter startup settings.
(These last commits are more like some loose ends with the last
ongoing topics. It isn't active development, nothing new gets
started. If QMK requests more changes, even if it is a typo,
just let me know.)
* Travis Cl: “The LINK_TIME_OPTIMIZATION_ENABLE flag…
… has been renamed to LTO_ENABLE.. Stop.”
Changed it.
* Adds a link to external resources in readme.
A place to put gimp .xcf files if someone wants to
modify/port the keymap. Perhaps links to varieties
of Minifan on github. Maybe a video about the keymap,
and such. Stuff that doesn't belong/fit on github,
and is easy to update without pull requests.
* RGBLIGHT_ENABLE rules.mk fixed, leds off for nop
rules.mk RGBLIGHT_ENABLE can now be set to “no” without issue.
Compile option to have leds off in Default Base layer.
* Transparency bug fixed.
Default layer was not set. This remained a hidden mistake, until Qwerty
Base Arrow had a different layer hold key in one place.
* Graphics doc correction, L/Rshift toggle config
Qwerty Base Arrow fix: Keycap view showed unneeded and empty ‛South Paw’ key.
All layers by key shows 45 Minivan version, title said “44”.
Added user configuration options to alter what is on the short and long
toggle on Left and Right Shift.
* Improved “why this layout” in readme.
Wanted to add that numbers & symbols layer can be reached by both
thumbs. It seems quite a drawback if that is not possible, to
constantly need to hold down the same thumb, especially for programming ?
It seemed worthwhile to mention.
* Reduced size of readme, dvorak-descramble, todo.
Stuff got a bit out of hand.
* one letter typo
* renumbered readme, _fun_stay initialization
Renumbered readme chapters to start from 1 not 0. Other minor edits.
Sticky on/off for _FUN layer seemed to be unpredictable on startup.
* Letter Ñ (capital) fix.
I seem to remember messing with this recently,
must have damaged this letter :-(. Capital was missing.
* Bare bones base numpad all layer by key.
I seemed to have forgotten to hide the common layers for this version.
Which doesn't matter a whole lot but this is a bit better and as it was meant.
* Fix triggering of adjust layer in default lily58 keymap
* Remove unused extern
* Swap raise/lower in update_tri_layer_state call to match recommendation in PR checklist
* Initial refactor of ARM SLEEP_LED to enable more platforms
* fix build issues
* Disable SLEEP_LED for boards with no caps lock code
* Enable GPT14 for boards with caps lock code and SLEEP_LED enabled
* Enable GPT for boards with caps lock code and SLEEP_LED enabled
* [Keyboard] spiderisland/split78: add MCP23018 reset code
Now, communication with the right side gets re-established
after unplugging it and plugging it back in.
* [Keyboard] spiderisland/split78: configure debouncing
I've been experiencing particularly bad bounce on the 'A' key.
Also, update maintainer github username
* concatenate config.h to 64key directory
* move rules.mk to 64key directory
This commit makes the firmware actually compile.
* insert complete rules.mk contents
Conforms the file to QMK's template.
* move info.json to 64key directory
* remove concertina.h
This file no longer serves a purpose now that everything is in the 64key directory.
* complete 64key readme.md
Conforms the file more to QMK's template.
* VEA Support
* Update LEDs to use QMK methods
* Enable Backlight
* Update Vendor ID
* Updates to enable split RGB
* Update readme
* Update to split RGB
* remove unnecessary reference
* Knight animation starts at the back
* remove hardcoded variable
Co-authored-by: Major Koos <MajorKoos@noreply.users.github.com>
* [Keyboard] Add 'LAYOUT_65_ansi_split_bs' support to KBDfans KBD67 rev2
This is already supported by VIA.
* [Keymap] Fix kbd67 catrielmuller_camilad keymap
* [Keyboard] Add my keymap for KBDfans KBD67 rev2 using 'LAYOUT_65_ansi_split_bs'
* Create Alter folder
* Revert "Create Alter folder"
This reverts commit 361103b821dbb22957b66cdedb0d11f996def71c.
* Added n60_s folder
* Fixed the url of the image in the readme
* Updated readme
* Updated readme
* Updated readme
* initial rgb driver fix
* added underglow LEDs and fixed typo in RGB locations
* removed test code
* added my key maps
* updated rgb keymap to work with changes
* refactored my code to make it more maintainable and updated keymaps.
* added GPL licence
PR 10528 was intended to move the source for the Bear 65 and S7 Elephant to the new `jacky_studio` vendor directory. Instead of moving the source files, that PR added the source as if they were newly-supported. The result is that the Bear 65 and both revisions of the S7 Elephant have working, identical firmware in two different directories.
This commit removes the source from the old directories.
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
ANAVI Macro Pad 2 is an open source mini mechanical keyboard with
2 keys and backlit. Powered by ATtiny 85 microcontroller and with
microUSB connector. Designed with KiCad.
Provides the following keymaps for ANAVI Macro Pad 2:
- Default (with a, b and combo to control the LEDs)
- Copy & paste
- Tap dance example with a, b and c
- Mute
- Volume
- Zoom
- Jitsi Meet
Co-authored-by: Drashna Jaelre <drashna@live.com>
Signed-off-by: Leon Anavi <leon@anavi.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Latam version of Helix/rev2/back
. Latam adaptation of keymap(whit "ñ")
. 3 layers (Qwerty, Lower, Raise)
. Underglow light changes while pressing Lower(BLUE) and Raise(RED), then it returns to prior mode.
(cherry picked from commit 974be350115b2d33b55edbc02e3b5281e1f856d7)
* Se añade Keymap.
* Agrego un pdf preliminar del mapeo y reubico el keymap a carpeta correspondiente.
* Ajustes en mapeo para simplificar.
Agrego Mark Down con mapeo.
Creo carpeta "layers mapping" para guardar lo correspondiente a mapeo.
* Update keymap.md
* Rename keymap.md to readme.md
* Organización en general y cambio de configuración de "back" a "under"(que era la que correspondía).
.Ahora los leds underglow responden mejor.
* -Se agrega indicador rgb para el bloq mayús.
-Se agrega manejo del rgb_tog.
-Se agrega botón para reset(del teclado).
-Ajustes de keymap varios.
-Limpieza de código.
* Update readme.md
* Update readme.md
* Update readme.md
* adding helix-keyboard.png
* Update readme.md
* -Se agregan Mouse Keys (para manejo del mouse con el teclado).
-Se hace fix en el modo "Bloq. Mayús" (Se persiste el cambio de RGB mode mientras el Bloq. Mayús está activado).
* Cambios en el Keymap para mayor comodidad del uso del mouse.
* Update readme.md
* Update readme.md
* -Fixeo de comportamiento del "Bloq. Mayús":
Cuando se presionaba una Layer mientras estaba activado Bloq. Mayús, quedaba el rgb_mode como el de la capa LOWER o RAISE.
-Ajuste en mapeo:
Cambié las mouse keys y las de teclas de brillo.
* Update readme.md
* Se borra carpeta /rev2_latam, para dejar todo enlatado y andando desde /rev2.
Esto para que el PR solo sea agregar el keymap "fraanrosi".
* Quito cambio de helix.h
Quito lo que ya no es necesario, para hacer el pull request limpio.
* Update Readme.mp
* Revert "Update Readme.mp"
This reverts commit eb9a2712b0f22b44032f5123227b7bc8af37b89f.
* Update readme.md
* Clean up, organization, indent fixes
* Update readme.md
* Latam version of Helix/rev2/back
. Latam adaptation of keymap(whit "ñ")
. 3 layers (Qwerty, Lower, Raise)
. Underglow light changes while pressing Lower(BLUE) and Raise(RED), then it returns to prior mode.
(cherry picked from commit 974be350115b2d33b55edbc02e3b5281e1f856d7)
* Se añade Keymap.
* Agrego un pdf preliminar del mapeo y reubico el keymap a carpeta correspondiente.
* Ajustes en mapeo para simplificar.
Agrego Mark Down con mapeo.
Creo carpeta "layers mapping" para guardar lo correspondiente a mapeo.
* Update keymap.md
* Rename keymap.md to readme.md
* Organización en general y cambio de configuración de "back" a "under"(que era la que correspondía).
.Ahora los leds underglow responden mejor.
* -Se agrega indicador rgb para el bloq mayús.
-Se agrega manejo del rgb_tog.
-Se agrega botón para reset(del teclado).
-Ajustes de keymap varios.
-Limpieza de código.
* Update readme.md
* Update readme.md
* Update readme.md
* adding helix-keyboard.png
* Update readme.md
* -Se agregan Mouse Keys (para manejo del mouse con el teclado).
-Se hace fix en el modo "Bloq. Mayús" (Se persiste el cambio de RGB mode mientras el Bloq. Mayús está activado).
* Cambios en el Keymap para mayor comodidad del uso del mouse.
* Update readme.md
* Update readme.md
* -Fixeo de comportamiento del "Bloq. Mayús":
Cuando se presionaba una Layer mientras estaba activado Bloq. Mayús, quedaba el rgb_mode como el de la capa LOWER o RAISE.
-Ajuste en mapeo:
Cambié las mouse keys y las de teclas de brillo.
* Update readme.md
* Se borra carpeta /rev2_latam, para dejar todo enlatado y andando desde /rev2.
Esto para que el PR solo sea agregar el keymap "fraanrosi".
* Quito cambio de helix.h
Quito lo que ya no es necesario, para hacer el pull request limpio.
* Update Readme.mp
* Revert "Update Readme.mp"
This reverts commit eb9a2712b0f22b44032f5123227b7bc8af37b89f.
* Update readme.md
* Update readme.md
* Clean up, organization, indent fixes
* Update readme.md
Latam version of Helix/rev2/back
. Latam adaptation of keymap(whit "ñ")
. 3 layers (Qwerty, Lower, Raise)
. Underglow light changes while pressing Lower(BLUE) and Raise(RED), then it returns to prior mode.
(cherry picked from commit 974be350115b2d33b55edbc02e3b5281e1f856d7)
Se añade Keymap.
Agrego un pdf preliminar del mapeo y reubico el keymap a carpeta correspondiente.
Ajustes en mapeo para simplificar.
Agrego Mark Down con mapeo.
Creo carpeta "layers mapping" para guardar lo correspondiente a mapeo.
Update keymap.md
Rename keymap.md to readme.md
Organización en general y cambio de configuración de "back" a "under"(que era la que correspondía).
.Ahora los leds underglow responden mejor.
-Se agrega indicador rgb para el bloq mayús.
-Se agrega manejo del rgb_tog.
-Se agrega botón para reset(del teclado).
-Ajustes de keymap varios.
-Limpieza de código.
Update readme.md
Update readme.md
Update readme.md
adding helix-keyboard.png
Update readme.md
-Se agregan Mouse Keys (para manejo del mouse con el teclado).
-Se hace fix en el modo "Bloq. Mayús" (Se persiste el cambio de RGB mode mientras el Bloq. Mayús está activado).
Cambios en el Keymap para mayor comodidad del uso del mouse.
Update readme.md
Update readme.md
-Fixeo de comportamiento del "Bloq. Mayús":
Cuando se presionaba una Layer mientras estaba activado Bloq. Mayús, quedaba el rgb_mode como el de la capa LOWER o RAISE.
-Ajuste en mapeo:
Cambié las mouse keys y las de teclas de brillo.
Update readme.md
Se borra carpeta /rev2_latam, para dejar todo enlatado y andando desde /rev2.
Esto para que el PR solo sea agregar el keymap "fraanrosi".
Quito cambio de helix.h
Quito lo que ya no es necesario, para hacer el pull request limpio.
Update Readme.mp
Revert "Update Readme.mp"
This reverts commit eb9a2712b0f22b44032f5123227b7bc8af37b89f.
Update readme.md
Clean up, organization, indent fixes
Update readme.md
* Changes and corrections were made to Pull Request.
* Since the last change, readme.md and comment in keymap.c were to be updated.
* Redo Arm DAC implementation for additive, wavetable synthesis, sample playback
changes by Jack Humbert on an implementation for DAC audio on arm/chibios platforms
this commits bundles the changes from the arm-dac-work branch focused on audio/audio_arm.* into one commit (leaving out the test-keyboard)
f52faeb5d (origin/arm-dac-work) add sample and wavetable examples, parsers for both
-> only the changes on audio_arm_.*, the keyboard related parts are split off to a separate commit
bfe468ef1 start morphing wavetable
474d100b5 refined a bit
208bee10f play_notes working
3e6478b0b start in-place documentation of dac settings
3e1826a33 fixed blip (rounding error), other waves, added key selection (left/right)
73853d651 5 voices at 44.1khz
dfb401b95 limit voices to working number
9632b3379 configuration for the ez
6241f3f3b notes working in a new way
* Redo Arm DAC implementation for additive, wavetable synthesis, sample playback
changes by Jack Humbert on an implementation for DAC audio on arm/chibios platforms
this commit splits off the plank example keymap from commit
f52faeb5d (origin/arm-dac-work) add sample and wavetable examples, parsers for both
* refactoring: rename audio_ to reflect their supported hardware-platform and audio-generation method: avr vs arm, and pwm vs dac
* refactoring: deducplicate ISR code to update the pwm duty-cycle and period in the avr-pwm-implementation
pulls three copies of the same code into one function
which should improve readability and maintainability :-)
* refactoring: move common code of arm and avr implementation into a separate/new file
* refactoring: audio_avr_pwm, renaming defines to decouple them from actually used timers, registers and ISRs
* refactoring: audio_avr_pwm - replacing function defines with plain register defines
aligns better with other existing qmk code (and the new audio_arm_pwm) doing similar pwm thing
* add audio-arm-pwm
since not all STM32 have a DAC onboard (STM32F2xx and STM32F3xx), pwm-audio is an alternative (STM32F1xx)
this code works on a "BluePill" clone, with an STM32F103C8B
* clang-format changes on quantum/audio/* only
* audio_arm_dac: stopping the notes caused screeching when using the DAC audio paths
* audio_arm_pwm: use pushpull on the pin; so that a piezzo can be hooked up direclty without additional components (opendrain would require an external pullup)
* refactoring: remove unused file from/for atmel-avr chips
* refactoring: remove unused (avr) wavetable file
* audio_arm_dac: adapt dac_end callback to changed chibios DAC api
the previous chibios (17.6.0) passed along a pointer into the buffer plus a sample_count (which are/already where included in the DACDrivre object) - the current chibios (19.1.0) only passes the driver object.
this patch ports more or less exactly what the previous chibios ISR code did: either have the user-callback work the first or second half of the buffer (dacsample_t pointer, with half the DAC_BUFFER_SIZE samples) by adjusting the pointer and sample count
* audio-arm-dac: show a compile-warning on undefined audio-pins
Co-Authored-By: Drashna Jaelre <drashna@live.com>
* audio_arm_dac: switch from exemplary wavetable generation to sine only
sine+triangle+squrare is exemplary, and not realy fit for "production" use
'stairs' are usefull for debugging (hardware, with an oscilloscope)
* audio_arm_dac: enable output buffers in the STM32
to drive external loads without any additional ciruitry - external opamps and such
* audio: prevent out-of-bounds array access
* audio_arm_dac: add output-frequency correcting factor
* audio_arm_pwm: get both the alternate-function and pm-callback variants back into working condition
and do some code-cleanup, refine documentation, ...
* audio_arm_pwm: increase pwm frequency for "higher fidelity"
on the previous .frequency=100000 higher frequency musical notes came out wrong
(frequency measured on a Tektronix TDS2014B)
note | freq | arm-pwm
C2 | 65.4 | 65.491
C5 | 523.25 | 523.93
C6 | 1046.5 | 1053.38
C7 | 2093 | 2129
C8 | 4186 | 4350.91
with .frequency = 500000
C8 | 4186 | 4204.6
* audio refactoring: remove unused variables
* audio_arm_dac: calibrate note tempo: with a tempo of 60beats-per-second a whole-note should last for exactly one second
* audio: allow feature selection in rules.mk
so the user can switch the audio driver between DAC and PWM on STM32 boards which support both (STM32F2 and up)
or select the "pin alternate" pwm mode, for example on STM32F103
* audio-refactoring: move codeblocks in audio.[ch] into more coherent groups
and add some inline documentation
* audio-refactoring: cleanup and streamline common code between audio_arm_[dac|pwm]
untangeling the relation between audio.c and the two drivers
and adding more documenting comments :-)
* audio_avr_pwm: getting it back into working condition, and cleanup+refactor
* audio-refactoring: documentation and typo fixes
Co-Authored-By: Nick Brassel <nick@tzarc.org>
* audio-refactoring: cleanup defines, inludes and remove debug-prints
* audio_chibios_dac: define&use a minimal sampling rate, based on the available tone-range
to ease up on the cpu-load, while still rendering the higher notes/tones sufficiently
also reenable the lower tones, since with the new implementation there is no evidence of them still beeing 'bugged'
* audio-refactoring: one common AUDIO_MAX_VOICES define for all audio-drivers
* audio-chibios-pwm: pwm-pin-allternate: make the the timer, timer-channel and alternate function user-#definable
* audio_chibios_dac: math.h has fmod for this
* Redo Arm DAC implementation for additive, wavetable synthesis, sample playback
update Jack Humberts dac-example keymaps for the slight changes in the audio-dac interface
* audio-refactoring: use a common AUDIO_PIN configuration switch instead of defines
have the user select a pin by configuration in rules.mk instead of a define in config.h
has the advantage of beeing in a common form/pattern across all audio-driver implementations
* audio-refactoring: switch backlight_avr.c to the new AUDIO_PIN defines
* audio-common: have advance_note return a boolean if the note changed, to the next one in the melody beeing played
* audio-chibios-pwm: fix issue with ~130ms silence between note/frequency changes while playing a SONG
through trial,error and a scope/logic analyzer figured out Chibios-PWMDriver (at least in the current version) misbehaves if the initial period is set to zero (or one; two seems to work); when thats the case subsequent calls to 'pwmChhangePeriod' + pwmEnableChannel took ~135ms of silence, before the PWM continued with the new frequency...
* audio-refactoring: get 'play_note' working again
with a limited number of available voices (say AUDIO_VOICES_MAX=1) allow new frequencies to be played, by discarding the oldest one in the 'frequencies' queue
* audio: set the fallback driver to DAC for chibios and PWM for all others (==avr at the moment)
* audio-refactoring: moore documentation
and some cleanup
* audio-avr-pwm: no fallback on unset AUDIO_PIN
this seems to be the expected behaviour by some keyboards (looking at ckeys/handwire_101:default) which otherwise fail to build because the firmware-image ends up beeing too large for the atmega... so we fail silently instead to keep travis happy
* audio-refactoring: untangling terminology: voice->tone
the code actually was working on tones (combination of pitch/frequency, duration, timbre, intensity/volume) and not voices (characteristic sound of an instrument; think piano vs guitar, which can be played together, each having its own "track" = voice on a music sheet)
* audio-pwm: allow freq=0 aka a pause/rest in a SONG
continue processing, but do not enable pwm units, since freq=0 wouldn't produce any sound anyway (and lead to division by zero on that occasion)
* audio-refactoring: audio_advance_note -> audio_advance_state
since it does not only affect 'one note', but the internally kept state as a whole
* audio-refactoring: untangling terminology: polyphony
the feature om the "inherited" avr code has little to do with polyphony (see wikipedia), but is more a time-multiplexing feature, to work around hardware limitations - like only having one pwm channel, that could on its own only reproduce one voice/instrument at a time
* audio-chibios-dac: add zero-crossing feature
have tones only change/stop when the waveform approaches zero - to avoid audible clicks
note that this also requires the samples to start at zero, since the internally kept index into the samples is reset to zero too
* audio-refactoring: feature: time-multiplexing of tones on a single output channel
this feature was in the original avr-pwm implementation misnomed as "polyphony"
with polyphony_rate and so on; did the same thing though: time-multiplexing multiple active notes so that a single output channel could reproduce more than one note at a time (which is not the same as a polyphony - see wikipedia :-) )
* audio-avr-pwm: get music-mode working (again) on AVRs
with both pwm channels, or either one of the two :-)
play_notes worked already - but music_mode uses play_note
* audio-refactoring: split define MAX_SIMULTANEOUS_TONES -> TONE_STACKSIZE
since the two cases are independant from one another, the hardware might impose limitations on the number of simultaneously reproducable tones, but the audio state should be able to track an unrelated number of notes recently started by play_note
* audio-arm-dac: per define selectable sample-luts
plus generation script in ./util
* audio-refactoring: heh, avr has a MIN...
* audio-refactoring: add basic dac audio-driver based on the current/master implementation
whereas current=d96380e65496912e0f68e6531565f4b45efd1623
which is the state of things before this whole audio-refactoring branch
boiled down to interface with the refactored audio system = removing all
redundant state-managing and frequency calculation
* audio-refactoring: rename audio-drivers to driver_$PLATFORM_$DRIVER
* audio-arm-pwm: split the software/hardware implementations into separate files
which saves us partially from a 'define hell', with the tradeoff that now two somewhat similar chibios_pwm implementations have to be maintained
* audio-refactoring: update documentation
* audio-arm-dac: apply AUDIO_PIN defines to driver_chibios_dac_basic
* audio-arm-dac: dac_additive: stop the hardware when the last sample completed
the audio system calls for a driver_stop, which is delayed until the current sample conversion finishes
* audio-refactoring: make function-namespace consistent
- all (public) audio functions start with audio_
- also refactoring play*_notes/tones to play*_melody, to visually distance it a bit from play*_tone/_note
* audio-refactoring: consistent define namespace: DAC_ -> AUDIO_DAC_
* audio-arm-dac: update (inline) documentation regarding MAX for sample values
* audio-chibios-dac: remove zero-crossing feature
didn't quite work as intended anyway, and stopping the hardware on close-to-zero seems to be enought anyway
* audio-arm-dac: dac_basic: respect the configured sample-rate
* audio-arm-pwm: have 'note_timbre' influence the pwm-duty cycle
like it already does in the avr implementation
* audio-refactoring: get VIBRATO working (again)
with all drivers (verified with chibios_[dac|pwm])
* audio-arm-dac: zero-crossing feature (Mk II)
wait for the generated waveform to approach 'zero' before either turning off the output+timer or switching to the current set of active_tones
* audio-refactoring: re-add note-resting -> introduce short_rest inbetween
- introduce a short pause/rest between two notes of the same frequency, to separate them audibly
- also updating the refactoring comments
* audio-refactoring: cleanup refactoring remnants
remove the former avr-isr code block - since all its features are now refactored into the different parts of the current system
also updates the TODOS
* audio-refactoring: reserve negative numbers as unitialized frequencies
to allow the valid tone/frequency f=0Hz == rest/pause
* audio-refactoring: FIX: first note of melody was missing
the first note was missing because 'goto_next_note'=false overrode a state_change=true of the initial play_tone
and some code-indentations/cleanup of related parts
* audio-arm-dac: fix hardware init-click
due to wron .init= value
* audio-refactoring: new conveniance function: audio_play_click
which can be used to further refactor/remove fauxclicky (avr only) and/or the 'clicky' features
* audio-refactoring: clang-format on quantum/audio/*
* audio-avr-pwm: consecutive notes of the same frequency get a pause inserted inbetween by audio.c
* audio-refactoring: use milliseconds instead of seconds for 'click' parameters
clicks are supposed to be short, seconds make little sense
* audio-refactoring: use timer ticks instead of counters
local counters were used in the original (avr)ISR to advance an index into the lookup tables (for vibrato), and something similar was used for the tone-multiplexing feature
decoupling these from the (possibly irregular) calls to advance_state made sesne, since those counters/lookups need to be in relation to a wall-time anyway
* audio-refactoring: voices.c: drop 'envelope_index' counter in favour of timer ticks
* audio-refactoring: move vibrato and timbre related parts from audio.c to voices.c
also drops the now (globally) unused AUDIO_VIBRATO/AUDIO_ENABLE_VIBRATO defines
* audio.c: use system-ticks instead of counters the drivers have to take care of for the internal state posision
since there already is a system-tick with ms resolution, keeping count separatly with each driver implementation makes little sense; especially since they had to take special care to call audio_advance_state with the correct step/end parameters for the audio state to advance regularly and with the correct pace
* audio.c: stop notes after new ones have been started
avoids brief states of with no notes playing that would otherwise stop the hardware and might lead to clicks
* audio.c: bugfix: actually play a pause
instead of just idling/stopping which lead the pwm drivers to stop entirely...
* audio-arm-pwm: pwm-software: add inverted output
new define AUDIO_PIN_ALT_AS_NEGATIVE will generate an inverted signal on the alternate pin, which boosts the volume if a piezo is connected to both AUDIO_PIN and AUDIO_PIN_ALT
* audio-arm-dac: basic: handle piezo configured&wired to both audio pins
* audio-refactoring: docs: update for AUDIO_PIN_ALT_AS_NEGATIVE and piezo wiring
* audio.c: bugfix: use timer_elapsed32 instad of keeping timestamps
avoids running into issues when the uint32 of the timer overflows
* audio-refactoring: add 'pragma once' and remove deprecated NOTE_REST
* audio_arm_dac: basic: add missing bracket
* audio.c: fix delta calculation
was in the wrong place, needs to use the 'last_timestamp' before it was reset
* audio-refactoring: buildfix: wrong legacy macro for set_timbre
* audio.c: 16bit timerstamps suffice
* audio-refactoring: separate includes for AVR and chibios
* audio-refactoring: timbre: use uint8 instead of float
* audio-refactoring: duration: use uint16 for internal per-tone/note state
* audio-refactoring: tonemultiplexing: use uint16 instead of float
* audio-arm-dac: additive: set second pin output-low
used when a piezo is connected to AUDIO_PIN and AUDIO_PIN_ALT, with PIN_ALT_AS_NEGATIVE
* audio-refactoring: move AUDIO_PIN selection from rules.mk to config.h
to be consistent with how other features are handled in QMK
* audio-refactoring: buildfix: wrong legacy macro for set_tempo
* audio-arm-dac: additive: set second pin output-low -- FIXUP
* audio.c: do duration<>ms conversion in uint instead of float
on AVR, to save a couple of bytes in the firmware size
* audio-refactoring: cleanup eeprom defines/usage
for ARM, avr is handled automagically through the avr libc and common_features.mk
Co-Authored-By: Drashna Jaelre <drashna@live.com>
* audio.h: throw an error if OFF is larger than MAX
* audio-arm-dac: basic: actually stop the dac-conversion on a audio_driver_stop
to put the output pin in a known state == AUDIO_DAC_OFF_VALUE, instead of just leaving them where the last conversion was... with AUDIO_PIN_ALT_AS_NEGATIVE this meant one output was left HIGH while the other was left LOW
one CAVEAT: due to this change the opposing squarewave when using both A4 and A5 with AUDIO_PIN_ALT_AS_NEGATIVE
show extra pulses at the beginning/end on one of the outputs, the two waveforms are in sync otherwise.
the extra pusles probably matter little, since this is no high-fidelity sound generation :P
* audio-arm-dac: additive: move zero-crossing code out of dac_value_generate
which is/should be user-overridable == simple, and doing one thing: providing sample values
state-transitions necessary for the zero crossing are better handled in the surrounding loop in the dac_end callback
* audio-arm-dac: dac-additive: zero-crossing: ramping up or down
after a start trigger ramp up: generate values until zero=OFF_VALUE is reached, then continue normally
same in reverse for strop trigger: output values until zero is reached/crossed, then keep OFF_VALUE on the output
* audio-arm-dac: dac-additive: BUGFIX: return OFF_VALUE when a pause is playing
fixes a bug during SONG playback, which suddenly stopped when it encoutnered a pause
* audio-arm-dac: set a sensible default for AUDIO_DAC_VALUE_OFF
1/2 MAX was probably exemplary, can't think of a setup where that would make sense :-P
* audio-arm-dac: update synth_sample/_wavetable for new pin-defines
* audio-arm-dac: default for AUDIO_DAC_VALUE_OFF
turned out that zero or max are bad default choices:
when multiple tones are played (>>5) and released at the same time (!), due to the complex waveform never reaching 'zero' the output can take quite a while to reach zero, and hence the zero-crossing code only "releases" the output waaay to late
* audio-arm-dac: additive: use DAC for negative pin
instead of PAL, which only allows the pin to be configured as output; LOW or HIGH
* audio-arm-dac: more compile-time configuration checks
* audio-refactoring: typo fixed
* audio-refactoring: clang-format on quantum/audio/*
* audio-avr-pwm: add defines for B-pin as primary/only speaker
also updates documentation.
* audio-refactoring: update documentation with proton-c config.h example
* audio-refactoring: move glissando (TODO) to voices.c
refactored/saved from the original glissando implementation in then upstream-master:audio_avr.c
still needs some work though, as it is now the calculation *should* work, but the start-frequency needs to be tracked somewhere/somehow; not only during a SONG playback but also with user input?
* audio-refactoring: cleanup: one round of aspell -c
* audio-avr-pwm: back to AUDIO_PIN
since config_common.h expands them to plain integers, the AUDIO_PIN define can directly be compared to e.g. B5
so there is no need to deal with separate defines like AUDIO_PIN_B5
* audio-refactoring: add technical documentation audio_driver.md
which moves some in-code documentation there
* audio-arm-dac: move AUDIO_PIN checks into c-code
instead of doing everything with the preprocessor, since A4/A5 do not expand to simple integers, preprocessor int-comparison is not possible. but necessary to get a consistent configuration scheme going throughout the audio-code... solution: let c-code handle the different AUDIO_PIN configurations instead (and leave code/size optimizations to the compiler)
* audio-arm-dac: compile-fix: set AUDIO_PIN if unset
workaround to get the build going again, and be backwarts compatible to arm-keyboards which not yet set the AUDIO_PIN define. until the define is enforced through an '#error"
* audio-refactoring: document tone-multiplexing feature
* audio-refactoring: Apply suggestions from documentation review
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* audio-refactoring: Update docs/audio_driver.md
* audio-refactoring: docs: fix markdown newlines
Terminating a line in Markdown with <space>-<space>-<linebreak> creates an HTML single-line break (<br>).
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* audio-arm-dac: additive: fix AUDIO_PIN_ALT handling
* audio-arm-pwm: align define naming with other drivers
Co-authored-by: Joel Challis <git@zvecr.com>
* audio-refactoring: set detault tempo to 120
and add documentation for the override
* audio-refactoring: update backlight define checks to new AUDIO_PIN names
* audio-refactoring: reworking PWM related defines
to be more consistent with other QMK code
Co-authored-by: Joel Challis <git@zvecr.com>
* audio-arm: have the state-update-timer user configurable
defaulting to GPTD6 or GPTD8 for stm32f2+ (=proton-c)
stm32f1 might need to set this to GPTD4, since 6 and 8 are not available
* audio-refactoring: PLAY_NOTE_ARRAY was already removed in master
* Add prototype for startup
* Update chibiOS dac basic to disable pins on stop
* Add defaults for Proton C
* avoid hanging audio if note is completely missed
* Don't redefine pins if they're already defined
* Define A4 and A5 for CTPC support
* Add license headers to keymap files
* Remove figlet? comments
* Add DAC config to audio driver docs
* Apply suggestions from code review
Co-authored-by: Jack Humbert <jack.humb@gmail.com>
* Add license header to py files
* correct license header
* Add JohSchneider's name to modified files
AKA credit where credit's due
* Set executable permission and change interpeter
* Add 'wave' to pip requirements
* Improve documentation
* Add some settings I missed
* Strip AUDIO_DRIVER to parse the name correctly
* fix depreciated
* Update util/audio_generate_dac_lut.py
Co-authored-by: Jack Humbert <jack.humb@gmail.com>
* Fix type in clueboard config
* Apply suggestions from tzarc
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: Johannes <you@example.com>
Co-authored-by: JohSchneider <JohSchneider@googlemail.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Joshua Diamond <josh@windowoffire.com>
Co-authored-by: Jack Humbert <jack.humb@gmail.com>
