Modified tmk_core/rules.mk to avoid linking errors #10728
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
Added -fcommon flag to avoid linking errors due to multiple variable definitions. Though this is neither a definitive nor good solution, proper changes and use of extern keyword to avoid those multiple definitions must be made
|
This only affects the massdrop boards, correct? If so, I would really say that we shouldn't look into fixing this, at this time, aside from locally. You can add the CFLAGS to your local keymap's config.h, if needed. Or even to the keyboard's rules.mk. However, given the lack of maintainence of the massdrop boards, adding this to core, which you already state is not a good solution, is a worse one, when considering the baggage that comes with the massdrop boards, in general. see #11119 for details. |
|
Thank you for your contribution! |
Cxarli
added a commit
to Cxarli/qmk_firmware
that referenced
this pull request
Feb 22, 2021
* Modified tmk_core/rules.mk to avoid linking errors Added -fcommon flag to avoid linking errors due to multiple variable definitions. Though this is neither a definitive nor good solution, proper changes and use of extern keyword to avoid those multiple definitions must be made * Comment updated Co-authored-by: Fabián González Martín <[email protected]>
zvecr
approved these changes
Feb 27, 2021
|
It should be noted that its not just massdrop boards which are currently broken. short/medium term, i think its best to throw this only to master and continue to fix up breakages on develop. |
skullydazed
approved these changes
Feb 28, 2021
|
Thanks! |
neopostmodern
added a commit
to neopostmodern/qmk_firmware
that referenced
this pull request
Apr 8, 2021
* [Keyboard] Fixup issues with Titan65 (#12002) * [Keyboard] Titan64 - Fix RGB Matrix config * Fix up keymaps * [BUG] Massdrop develop rgb fix (#12022) * Allow for disabling RGB_MATRIX on Massdrop boards. * Fixup init sequence. * Make some functions static as they've got very generic names. * Format code according to conventions (#12024) Co-authored-by: QMK Bot <[email protected]> * [Keyboard] Add VIA support to SX60 and update default keymap (#11908) * [Keyboard] Evk v1.3 add a key (#11880) Co-authored-by: Ryan <[email protected]> * Fix develop (#12039) Fixes file encoding errors on Windows, and layouts not correctly merging into info.json. * force utf8 encoding * correctly merge layouts and layout aliases * show what aliases point to * 2021 February 27 Breaking Changes Changelog (#11975) * restore main readme.md * add ChangeLog entry for 2021-02-27 develop branch - initial version * update Docs; consolidate sidebar entries to new Breaking Changes History doc * Changelog update - concatenate similar changes as one list item - unify change formatting (remove [bracketed] headings and trailing periods) - item sorting improvement * update Changes Requiring User Action section Detail the changes regarding keyboard relocations/additions/deletions. * add entry for fauxpark's user keymap cleanup for config.h/rules.mk * add link to Jacky Studio bugfix PR * add link for "ChibiOS conf migrations... take 15" * add links for "Make LAYOUT parsing more robust" and "Massdrop develop rgb fix" * remove sort sequence numbers * rename Breaking Changes History page Renames the Breaking Changes History page to "Past Breaking Changes". * update schedule in Breaking Changes Overview * suggestions/changes per tzarc * skully's changes * add entry for "Fix develop" (PR 12039) Co-authored-by: Nick Brassel <[email protected]> Co-authored-by: Zach White <[email protected]> * Force update the version tag * Fix build for linworks/whale75. (#12042) * Fix up build failures for melgeek boards after Feb27 develop merge. (#12043) * Fix build for attiny85-based boards. (#12044) * Format code according to conventions (#12046) Co-authored-by: QMK Bot <[email protected]> * Fix compile errors (#12048) * fix compile errors * fix broken json files * remove keyboard_folder from info.json * Fixes #4072, #6214. Revision of #156 to clear before AS/TD. (#9941) * Add suggestion for indirect unicode input on Linux (#10854) * Add suggestion for indirect unicode input on Linux I have used this approach myself with great success, and it seems to be the only good solution that doesn't involve IBus. * Elaborate on keyboard layout on Linux This should be enough to allow people to figure out how to add custom characters to a Linux keyboard layout. * Add support for using podman to util/docker_build.sh (#10819) * add podman support to docker_build.sh script * break out runtime into the RUNTIME variable * allows RUNTIME to be set by the user * decides on docker or podman if docker isn't avaible * rewrote check for docker-machine to account only for docker runtime * put --user arg into a variable only to be used with docker this is not needed with podman as podman maps the containers root id to the users id. * add podman to getting_started_docker documentation * Hub16 QMK configurator support + various bugfixes (#11496) * qmk configurator support + various bugfixes * Update keyboards/hub16/rules.mk Co-authored-by: Drashna Jaelre <[email protected]> Co-authored-by: Drashna Jaelre <[email protected]> Co-authored-by: Nick Brassel <[email protected]> * Add keyboard: 7c8/Framework (#11593) * Add 7c8/framework keyboard * Update VIA framework.json definition * Code cleanup and styling to conform to QMK style guide * Code cleanup and moving some keymap definitions to a 'steven' keymap in order to create a cleaner default keymap for other users * Update keyboards/7c8/framework/config.h Remove #define DESCRIPTION Co-authored-by: Drashna Jaelre <[email protected]> * Update keyboards/7c8/framework/config.h remove #define UNUSED_PINS Co-authored-by: Drashna Jaelre <[email protected]> * Update keyboards/7c8/framework/framework.h Change layout name to existing layout name. Co-authored-by: Drashna Jaelre <[email protected]> * Update keyboards/7c8/framework/framework.h Change layout name to existing layout name. Co-authored-by: Drashna Jaelre <[email protected]> * Update keyboards/7c8/framework/framework.h Change layout name to existing layout name. Co-authored-by: Drashna Jaelre <[email protected]> * Update keyboards/7c8/framework/keymaps/via/keymap.c change biton32 to get_highest_layer Co-authored-by: Drashna Jaelre <[email protected]> * change vendor ID from 0x07c8 to 0x77c8, which is unused * delete VIA .json definition from via keymap folder * Change framework_grid to LAYOUT_ortho_5x12 in default keymap.c * remove framework.json from 'steven' keymap folder * cleanup * Update keyboards/7c8/framework/config.h 0x77c8 -> 0x77C8 Co-authored-by: Drashna Jaelre <[email protected]> Co-authored-by: Drashna Jaelre <[email protected]> * Onekey keymap: quine (#10732) * 17 key Panasonic rotary encoder BLE pad (#11659) * Create rules.mk * Create glcdfonr.c * Create keymap.c * Create keymap.c * Create rules.mk * Add files via upload * Update readme.md * Update readme.md * Update readme.md * Update config.h * Update 10bleoledhub.h * Update 10bleoledhub.c * Update info.json * Update keymap.c * Update keymap.c * Rename glcdfonr.c to glcdfont.c * Update config.h * Update config.h * Update config.h * Update rules.mk * Update 10bleoledhub.c * Update 10bleoledhub.h * Update info.json * Update config.h * Update rules.mk * Update keymap.c * Update keymap.c * Update glcdfont.c * Update keyboards/10bleoledhub/rules.mk Co-authored-by: Ryan <[email protected]> * Update keyboards/10bleoledhub/keymaps/via/keymap.c Co-authored-by: Ryan <[email protected]> * Update keyboards/10bleoledhub/keymaps/default/keymap.c Co-authored-by: Ryan <[email protected]> * Update keyboards/10bleoledhub/config.h Co-authored-by: Ryan <[email protected]> * Update keyboards/10bleoledhub/config.h Co-authored-by: Ryan <[email protected]> * Update keyboards/10bleoledhub/10bleoledhub.h Co-authored-by: Ryan <[email protected]> * Create readme.md * Create rules.mk * Create latin47ble.h * Create latin47ble.c * Create info.json * Create config.h * Create keymap.c * Create rules.mk * Create keymap.c * Update keymap.c * Update keyboards/latin47ble/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <[email protected]> * Update keymap.c * Update keyboards/latin47ble/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre <[email protected]> * Update keyboards/latin47ble/rules.mk Co-authored-by: Drashna Jaelre <[email protected]> * Update keyboards/latin47ble/rules.mk Co-authored-by: Drashna Jaelre <[email protected]> * Update keyboards/latin47ble/rules.mk Co-authored-by: Drashna Jaelre <[email protected]> * Update latin47ble.h * Update latin47ble.c * Update latin47ble.h * Update latin47ble.c * Update keymap.c * Update keymap.c * Update config.h * Update keyboards/latin47ble/config.h Co-authored-by: Ryan <[email protected]> * Update keyboards/latin47ble/config.h Co-authored-by: Ryan <[email protected]> * Update keyboards/latin47ble/config.h Co-authored-by: Ryan <[email protected]> * Update keyboards/latin47ble/config.h Co-authored-by: Ryan <[email protected]> * Update keyboards/latin47ble/keymaps/via/keymap.c Co-authored-by: Ryan <[email protected]> * Update keyboards/latin47ble/rules.mk Co-authored-by: Ryan <[email protected]> * Delete info.json * Update readme.md * Update keymap.c * Update keymap.c * Update keyboards/latin47ble/config.h Co-authored-by: James Young <[email protected]> * Update keyboards/latin47ble/config.h Co-authored-by: James Young <[email protected]> * Update keyboards/latin47ble/keymaps/default/keymap.c Co-authored-by: James Young <[email protected]> * Update keyboards/latin47ble/latin47ble.c Co-authored-by: James Young <[email protected]> * Update keyboards/latin47ble/latin47ble.h Co-authored-by: James Young <[email protected]> * Update keyboards/latin47ble/keymaps/via/keymap.c Co-authored-by: James Young <[email protected]> * Update keymap.c * Update keymap.c * Update latin47ble.h * Update keymap.c * Update keymap.c * Update keymap.c * Update keymap.c * Update keyboards/latin47ble/keymaps/default/keymap.c Co-authored-by: James Young <[email protected]> * Update keyboards/latin47ble/keymaps/default/keymap.c Co-authored-by: James Young <[email protected]> * Update keyboards/latin47ble/latin47ble.h Co-authored-by: James Young <[email protected]> * Update keyboards/latin47ble/keymaps/default/keymap.c Co-authored-by: James Young <[email protected]> * Update keyboards/latin47ble/keymaps/via/keymap.c Co-authored-by: James Young <[email protected]> * Update keyboards/latin47ble/rules.mk Co-authored-by: James Young <[email protected]> * Update config.h * Create readme.md * Add files via upload * Create glcdfont.c * Create keymap.c * Create keymap.c * Create rules.mk * Update config.h * Update config.h * Update config.h * Update config.h * Update config.h * Update latinpadble.c * Update latinpadble.h * Update config.h * Update config.h * Update keymap.c * Update config.h * Update rules.mk * Update config.h * Update rules.mk * Update rules.mk * Update config.h * Update keyboards/latinpadble/config.h Co-authored-by: Drashna Jaelre <[email protected]> * Update keyboards/latinpadble/config.h Co-authored-by: Drashna Jaelre <[email protected]> * Update keymap.c * Update keymap.c * Update glcdfont.c Co-authored-by: Ryan <[email protected]> Co-authored-by: Drashna Jaelre <[email protected]> Co-authored-by: James Young <[email protected]> * Fixing K-type RGB lighting (#11551) * 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 * fix: ryloo studio m0110 layout 60 ansi fixed (#11685) * [Docs] New section to modifier docs: Checking Modifier State (#10550) * Added new section to docs: Checking Modifier State * Added id anchors to all headers in modifiers docs * Added a Wikipedia link to bitwise operators and... crosslinked to the QMK macro docs. * Added an explanation on the format of mod bitmask * Added .md extension to hyperlinks to macros docs * Corrected mod mask order and changed notation * Documented add_oneshot_mods and del_oneshot_mods * Mentioned modifier checks in the macro docs * Explained strict modifier checking i.e. using `get_mods() & MOD_MASK == MOD_MASK` instead of simply `get_mods() & MOD_MASK` * Added (un)register_mods to the docs * Put left term of comparison in parens * Added n60_s folder (#11455) * 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 * Satisfaction 75 turn off backlight on suspend, restore config on wakeup (#11774) * Satisfaction 75 turn off backlight on suspend, restore config on wakeup * Disable SLEEP_LED_ENABLE because it has no effect * [Keyboard] Add 'LAYOUT_65_ansi_split_bs' support to KBDfans KBD67 rev2 (#11739) * [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' * OddForge VE.A (#11875) * 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 <[email protected]> * Added support for barracuda keyboard (#11888) - Added default and via keymaps * Banana Split VIA Support (#11944) * add VIA keymap for bananasplit * refactor code to new standards * Add Potato65 PCB (#11956) * Make initial set of files * Update readme.md * [Keyboard] Dawn60 Rev1 RGB matrix port (#11970) * refactor * layout update * fix mods config * lto enable * add eeprom * refactor * final refactor * Fix incorrect key for LALT and add modifiers to LED matrix (#11984) Co-authored-by: datafx <[email protected]> * [Keymap] Initial commit for keyboardio/atreus/dshields keymap. (#11946) Incorporating changes suggested during pull request review. Co-authored-by: Daniel Shields <[email protected]> * New Variants of Console Keyboard (#11973) * initial push of console keyboard variants * update readme * fixed compilation issue * update Readme * added 18 and 27 key variants * missed commas * update info.json * added readme * correct info.json * correct info.json * info.json again * fixed keymap.c * Compilation fixes for handwired/concertina/64key (#11987) * 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. * Update lazydesigners/the40 (#11989) * Update the40.h Update the40.h to fix keymap * Add VIA support for lazydesigners/the40 Add VIA support for lazydesigners/the40 * Update keymap.c * [Keyboard] Update spiderisland/split78 (#11990) * [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 * Keycapsss Kimiko rev1: Configurator bugfix (#11992) * human-friendly formatting * fix key positioning and order * Kiko's Lab KL-90: Configurator bugfix (#11993) * human-friendly formatting * correct key order * correct layout macro name * Add RGB Matrix support for Preonic rev3 (#12008) * Add g_led_config for RGB Matrix support * Corrected indentation * Undo indentation on existing rev3.c code Co-authored-by: filterpaper <filterpaper@localhost> * Implement PLOOPY_DRAGSCROLL_INVERT option, which inverts the ploopy trackball's DRAG_SCROLL's vertical scroll direction. (#12032) * Modified tmk_core/rules.mk to avoid linking errors (#10728) * Modified tmk_core/rules.mk to avoid linking errors Added -fcommon flag to avoid linking errors due to multiple variable definitions. Though this is neither a definitive nor good solution, proper changes and use of extern keyword to avoid those multiple definitions must be made * Comment updated * Remove unused keymap_config from ctrl keymaps (#12058) * Extract sendstring into its own compilation unit (#12060) * Extract sendstring into its own compilation unit * License headers? * Put this include in the header * Fix generated file output while target exists (#12062) * Migrate make_dfu_header to CLI (#12061) * Migrate make_dfu_header to CLI * lint fixes * Update lib/python/qmk/cli/generate/dfu_header.py Co-authored-by: Ryan <[email protected]> * Rename object Co-authored-by: Ryan <[email protected]> * Bastardkb added keyboard and renaming (#11887) Co-authored-by: Drashna Jaelre <[email protected]> * Fixing adjust layer issue with the lily58 default keymap (#12052) * 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 * Revert "Fixing K-type RGB lighting (#11551)" (#12065) This reverts commit e6f7da403676b491ac278d5b793d18a0d114477e. * Fix the typo in ergodone 80 layout (#12075) * [Keyboard] Update eggman info.json (#12074) attempting to fix qmk configurator issues * [Docs] MATRIX_MASKED docs for SPLIT_HAND_MATRIX_GRID (#11974) * Set default for USB_SUSPEND_WAKEUP_DELAY to 0/disabled (#12081) * Remove more cruft from Lily58 default keymap (#12078) * Remove more cruft from lily58 default keymap * Update keyboards/lily58/keymaps/default/config.h Co-authored-by: Drashna Jaelre <[email protected]> * Update config.h Remove extra newline Co-authored-by: Drashna Jaelre <[email protected]> * [Docs] Small spelling mistake fix in leader keys (#12087) * [Keymap] Add ddone's iris keymap (#12055) * [Keymap] Add grant24 Planck Rev 6 keymap (#12070) Co-authored-by: Ryan <[email protected]> * [Keyboard] Added VIA folder under the keymaps folder (#12021) Co-authored-by: Ryan <[email protected]> * Update dichotomy/alairock layout (#12013) * [Keyboard] Add Keyboard Rartlite (#11866) * [Keyboard] Add Conone 65 (#11827) Co-authored-by: Ryan <[email protected]> * Documentation changes SPLIT_USB_DETECT and hid_listen udev rules (#11665) Co-authored-by: David Grundberg <david@quartz> * [Keymap] sigma-squared (#11694) * Format code according to conventions (#12102) Co-authored-by: QMK Bot <[email protected]> * cannonkeys/atlas_alps: rename via keymaps rules.mk.txt to rules.mk (#12103) File doesn't work without the correct filename. * Remove ifdefs for Swap Hands keycodes (#12095) * [Keyboard] Add Studio Kestra Nue PCB (#12094) * `qmk generate-rules-mk`: add `--escape` switch for makefile logic (#12101) * [Docs] Japanese translation of docs/keycodes.md (#10192) * copy 'keycodes.md'. * Translated 'keycodes.md'. * Fixed typo. * Fixed typo. * Apply suggestions from code review Co-authored-by: shela <[email protected]> Co-authored-by: Takeshi ISHII <[email protected]> * update based on comment. * update based on comment. * Update docs/ja/keycodes.md * update based on comment. Co-authored-by: Takeshi ISHII <[email protected]> * update based on comment. Co-authored-by: Takeshi ISHII <[email protected]> * update based on comment. Co-authored-by: Takeshi ISHII <[email protected]> * Update docs/ja/keycodes.md Co-authored-by: Takeshi ISHII <[email protected]> * update based on comment. Co-authored-by: Takeshi ISHII <[email protected]> Co-authored-by: shela <[email protected]> Co-authored-by: Takeshi ISHII <[email protected]> * Dubba175 (#12077) * dubba175 initial * Following checklist * Update readme.md * Update keyboards/dubba175/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <[email protected]> * Update keyboards/dubba175/keymaps/default/keymap.c Co-authored-by: ridingqwerty <[email protected]> * Update keyboards/dubba175/keymaps/default/keymap.c Co-authored-by: ridingqwerty <[email protected]> * Update keyboards/dubba175/rules.mk Co-authored-by: ridingqwerty <[email protected]> * Update config.h * Update keyboards/dubba175/readme.md Co-authored-by: Ryan <[email protected]> * Update keyboards/dubba175/rules.mk Co-authored-by: Ryan <[email protected]> * Update keyboards/dubba175/rules.mk Co-authored-by: Ryan <[email protected]> Co-authored-by: Drashna Jaelre <[email protected]> Co-authored-by: ridingqwerty <[email protected]> Co-authored-by: Ryan <[email protected]> * [Keymap] josjoha keymap for TheVan Keyboards' Minivan (#8066) 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 #8066 https://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. * Fixed the ortho60 and ortho48 matrix layout after testing (#12106) * update correct layout name (#12096) * dumbpad refactor - adding support for various PCB revisions (#9259) * Placeholder commit - Refactored to support different PCB revisions Individual revision folders still need: - info.json - readme.md all v0x folders support up to two LEDs for layer indication all v1x folders support up to two LEDs for layer indication plus one extra LED for numlock indication v0x - supports single-encoder v0.x PCB revisions v0x_right - supports reversible, single-encoder v0.x PCB revisions v0x_dualencoder - supports dual-encoder v0.x PCB revisions v1x - supports single-encoder v1.x PCB revisiions v1x_right - supports reversible, single-encoder v1.x PCB revisions * Added info.json and readme.md files for all dumbpad revisions * More refactoring, adding shared config.h and rules.mk Removed config.h from default keymap folders - defining TAPPING_TOGGLE in config.h * Minor formatting fix * MATRIX_COL_PINS for v1x_right was not reversed - changed to match v0x_right * adding support for v1x dual encoder PCB * adding alt-f2 tapdance routine for personal keymaps * adding dumbpad build using teensy 2.0 instead of Pro Micro * matched v1x dumbpad encoder and led pins to latest PCB revisions * updated readme, removed v1x_teensy until someone requests it * changed device name to match tmk udev rules, removed unnecessary ifdef * removed user keymaps and folders * missed hotdox keymap - removing * fixing info.json keyboard_names for all versions * Changed biton32 to get_highest_layer in keyboards/dumbpad/v0x/v0x.c * keyboards/dumbpad/v0x/v0x.c - remove matrix_scan_kb, process_record_kb * /dumbpad/v0x/keymaps/default/keymap.c - remove empty functions * /dumbpad/v0x/keymaps/default/keymap.c - changed biton32 to get_highest_layer * keyboards/dumbpad/v0x_dualencoder/keymaps/default/keymap.c - remove empty functions * keyboards/dumbpad/v0x_right/readme.md - smaller board layout image * keyboards/dumbpad/v1x_dualencoder/readme.md - smaller board image * keyboards/dumbpad/v1x/readme.md - smaller board image * keyboards/dumbpad/v1x_right/readme.md - smaller board image * Update keyboards/dumbpad/rules.mk * Apply suggestions from code review Batch applying suggestions from review * fixed removal of led_set_kb * Implementing requested changes from old pull request 9259 * removing unused rules * removed rules.mk from dumbpad base folder * adding templates for each layout * testing default keymap json * Testing applying default keymap for dumbpad * Layout correction: v1.x are 17 position pcb's * Update keyboards/dumbpad/v0x/rules.mk * Update keyboards/dumbpad/v0x/rules.mk * Update keyboards/dumbpad/v0x_dualencoder/keymaps/default/keymap.c * Update keyboards/dumbpad/v0x_dualencoder/rules.mk * Update keyboards/dumbpad/v0x_dualencoder/rules.mk * Update keyboards/dumbpad/v1x_dualencoder/rules.mk * Update keyboards/dumbpad/v1x_dualencoder/templates/keymap.c * Update keyboards/dumbpad/v1x_right/rules.mk * Update keyboards/dumbpad/v1x_right/rules.mk * Update keyboards/dumbpad/rules.mk * Update keyboards/dumbpad/v0x_dualencoder/templates/keymap.c * Update keyboards/dumbpad/v0x_right/rules.mk * Update keyboards/dumbpad/v1x/rules.mk * Update keyboards/dumbpad/v1x/rules.mk * Update keyboards/dumbpad/v1x_dualencoder/keymaps/default/keymap.c * Update keyboards/dumbpad/v1x_dualencoder/rules.mk * Update keyboards/dumbpad/v0x_right/rules.mk * Removing binary files * [Keyboard] NK65 rev 1.4 (#11991) NK65 Pinout change for rev 1.4. * Update Pinout for new PCB rev * Create readme.md * Update keyboards/nk65/v1_4/rules.mk * [Keyboard] Monstargear XO87 Solderable support (#11716) * Support for XO87 solderable version * cleanup * Remove abandoned code * replaced KEYMAP with LAYOUT and moved LAYOUT macro to solderable.h. deleted unneeded files. * Update keyboards/monstargear/xo87/solderable/keymaps/via/keymap.c * update info.json with missing keys * Apply suggestions from code review * Apply suggestions from code review correct layout macro * [Keyboard] Lagrange handwired keyboard (#11374) * [Keyboard] Add the Lagrange keyboard * Covert the master side to use the SPI driver. * [Keymap] Add 60_ansi_arrow_split_bs_7u_spc layout & keymap (#11329) * Add 60_ansi_arrow_split_bs_7u_spc layout & keymap * Update readme.md * Minor updates * Update dz60.h * Update keymap.c * Update readme.md * Update keymap.c * Update readme.md * Update readme.md * Update keymap.c * Update layouts/default/60_ansi_arrow_split_bs_7u_spc/layout.json * Update keymap.c * Update readme.md * [Keyboard] add Boston keyboard (#11273) * Added boston keyboard * Added Boston keyboard * Changed some keycodes, added layers, added encoder layer change, added RGB layer indicator * Cleaned up whitespace * Update config.h Cleaned up whitespace * Cleaned up whitespace * Added keyboard_post_init_kb code for RGBLEDs so that they start on a defined color * Modified layout so that split backspace right is at a more intuitive location for configurator * Cleaned up whitespace, changed some labels * Modified keymap to accommodate revised layout in boston.h * Removed "on port C6" from Line 20 (committed suggestion) * Removed "Encoder Enable" from Line 8 (committed suggestion) * Removed empty #define DESCRIPTION as suggested * Implemented lock LED changes as suggested by drashna * Implemented lock LED changes as suggested by Drashna, changed WS2812 driver byte order * Updated HSV color codes to reflect WS2812 byte order change * Implemented suggestion from noroadsleft * Implemented suggestion from noroadsleft * Updated readm.md per suggestions from noroadsleft * Update keyboards/boston/readme.md per noroadsleft's suggestion * Removed empty layers from default keymap * Stripped empty layers and much code from default keymap ; moved to RGB Light Layers keycap * add OLED_DRIVER_ENABLE into show_options.mk (#12121) * added 0xCB/1337 keyboard (#12089) Co-authored-by: Drashna Jaelre <[email protected]> Co-authored-by: Joel Challis <[email protected]> * Remove a few more ifdefs from quantum_keycodes (#12129) * Remove ifdefs for UC and X/XP too (#12131) * Adding Zodiark Split keyboard (#11837) * Adding Files for Zodiark * zodiark.h and keymap.c layout corrections * Apply suggestions from code review Applied all suggestions from zvecr. Co-authored-by: Joel Challis <[email protected]> * Applied all suggestions from fauxpark Co-authored-by: Ryan <[email protected]> * Defined matrix driver * Update keymap with GPL2 * Added GPL2+ to All keymap.c, cleaned up config.h, and removed the rgbmatrixwip keymap * Apply suggestions from code review Removed the two lines from the config.h and changed to the smaller resolution picture on the Readme. Co-authored-by: Drashna Jaelre <[email protected]> Co-authored-by: Ryan <[email protected]> * Added VIA keymap * Corrected VIA Keymap oled.c Co-authored-by: Joel Challis <[email protected]> Co-authored-by: Ryan <[email protected]> Co-authored-by: Drashna Jaelre <[email protected]> * [Keyboard] add Soup10 support (#11921) Co-authored-by: Joel Challis <[email protected]> Co-authored-by: Ryan <[email protected]> * [Keyboard] bm68rgb (#12128) * add support for Bbm68rgb * pull request changes filled * pull request changes filled(this time for real) * added new line to files that did not have new lines at end of file * updated modifier keys for rgb effects * Update keyboards/bm68rgb/readme.md * Apply suggestions from code review * Apply suggestions from code review * add nkro suppport * Update keyboards/bm68rgb/rules.mk * modified keymap to better correspond to physical layout * updated comment style * Enforce minimum versions for jsonschema and MILC (#12141) * upload api data to spaces * Remove stale references to "handwired/ferris" The code was moved to the "ferris" directory. Fixes the following commands: ``` qmk compile ~/qmk_firmware/keyboards/ferris/keymaps/default/keymap.json qmk compile ~/qmk_firmware/keyboards/ferris/keymaps/pierrec83/keymap.json ``` Addresses this issue: https://github.com/pierrechevalier83/ferris/issues/5 * fix CI job: api-data->api_data * Require `BOOTLOADER = qmk-dfu` for `:bootloader` target (#12136) * minor change to trigger api update * [Keyboard] Capsunlocked CU80 - added variant's for RGB matrix support (#12019) Co-authored-by: Ryan <[email protected]> * [Keymap] add crkbd/keymaps/armand1m (#12098) * improve detection of community layout support * Add BFO-9000 info.json (#12179) * Fix typo in `get_git_version()` (#12182) * Add VIA support to doodboard/duckboard_r2 (#12028) * Update R1 keymap and config * Add duckboard R2 * Add VIA support for duckboard R2 * Set bootmagic lite row and column * Update config.h * Update keyboards/doodboard/duckboard/config.h Co-authored-by: Drashna Jaelre <[email protected]> * Update config.h Co-authored-by: Drashna Jaelre <[email protected]> * Refactor to use led config - Part 6 (#12115) * Convert to config * Convert to config * Convert to config * Convert to config * Convert to config * Convert to config * Convert to config * Convert to config * revert changes * [Keymap] arkag Userspace updated (#12183) Co-authored-by: Alex <[email protected]> * ChibiOS conf upgrade for boston (#12170) boston - 8bded9dabff58de6febd927d4ad976bb743696a3 * Remove hex_to_keycode and move tap_random_base64 to send_string.c (#12079) * Enable default features on VIA keymap for Lily58 (#12185) Co-authored-by: filterpaper <filterpaper@localhost> * Document LED physical location index for Planck and Preonic (#12147) Co-authored-by: filterpaper <filterpaper@localhost> * [Bugs] Fix VIA Compiles (#12186) * fix info.json layout name for boardsource/5x12 (#12145) * Hand 88 (#11963) Co-authored-by: Drashna Jaelre <[email protected]> Co-authored-by: Ryan <[email protected]> * Update RGB matrix effects documentation (#12181) Co-authored-by: Ryan <[email protected]> * [Keymap] miles2go userspace update, add functions for babblepaste library, add prime_e keybard keymap (#9196) Co-authored-by: Drashna Jaelre <[email protected]> * Add Cassette42 (#10562) Co-authored-by: Drashna Jaelre <[email protected]> Co-authored-by: Ryan <[email protected]> * Add info.json for RGBKB Pan (#12218) * [Keymap] Add yhaliaw keymap for Planck/Rev6.1. (#11318) * [Keyboard] Added Adellein Keyboard/PCB (#11547) * Fix keycode mappings for via and ensure they don't change within protocol (#12130) * Fix keycode mappings for via and ensure they don't change within protocol * Update keycodes * Fix broken keyboards * added the missing keycodes found in via * Remove invalid keycodes Co-authored-by: David Hoelscher <[email protected]> * Format code according to conventions (#12244) Co-authored-by: QMK Bot <[email protected]> * Add missing info.json files for keyboards (#12239) Recent changes to QMK Configurator's API have made it so an info.json file is required for QMK Configurator to know how to render the keyboard in question. This PR adds info.json files for keyboards that did not have them, with a few exceptions for boards whose layouts I was unable to deter…
BorisTestov
pushed a commit
to BorisTestov/qmk_firmware
that referenced
this pull request
May 23, 2024
* Modified tmk_core/rules.mk to avoid linking errors Added -fcommon flag to avoid linking errors due to multiple variable definitions. Though this is neither a definitive nor good solution, proper changes and use of extern keyword to avoid those multiple definitions must be made * Comment updated
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
Added
-fcommonflag to avoid linking errors due to multiple variable definitions. Though this is neither a definitive nor good solution. Proper changes with use ofexternkeyword to avoid those multiple definitions must be made.I recently bought a Drop CTRL and qmk_firmware couldn't compile it. Investigating the reason of that I found issue #9733, and PR #9485 fixing this issue. That PR has not yet been merged due to changes on non-default keymaps, problems with this mentioned in #9485 (comment). As @DelusionalLogic said, using -fcommon is also an option. Before gcc 10 this was the default but it isn't anymore, breaking a bunch of keyboards that need to be fixed.
I've tested make all:default with and without the change and it reduces the number of [ERRORS] from 21 to 12
Types of Changes
Issues Fixed or Closed by This PR
dmac_desc#9733Checklist