summaryrefslogtreecommitdiff
path: root/keyboards/contra
AgeCommit message (Collapse)Author
2021-05-292021 May 29 Breaking Changes Update (#13034)James Young
* Add Per Key functionality for AutoShift (#11536) * LED Matrix: Reactive effect buffers & advanced indicators (#12588) * [Keyboard] kint36: switch to sym_eager_pk debouncing (#12626) * [Keyboard] kint2pp: reduce input latency by ≈10ms (#12625) * LED Matrix: Split (#12633) * [CI] Format code according to conventions (#12650) * feat: infinite timeout for leader key (#6580) * feat: implement leader_no_timeout logic * docs(leader_key): infinite leader timeout docs * Format code according to conventions (#12680) * Update ADC driver for STM32F1xx, STM32F3xx, STM32F4xx (#12403) * Fix default ADC_RESOLUTION for ADCv3 (and ADCv4) Recent ChibiOS update removed ADC_CFGR1_RES_10BIT from the ADCv3 headers (that macro should not have been there, because ADCv3 has CFGR instead of CFGR1). Fix the default value for ADC_RESOLUTION to use ADC_CFGR_RES_10BITS if it is defined (that name is used for ADCv3 and ADCv4). * Update ADC docs to match the actually used resolution ADC driver for ChibiOS actually uses the 10-bit resolution by default (probably to match AVR); fix the documentation accordingly. Also add both ADC_CFGR_RES_10BITS and ADC_CFGR1_RES_10BIT constants (these names differ according to the ADC implementation in the particular MCU). * Fix pinToMux() for B12 and B13 on STM32F3xx Testing on STM32F303CCT6 revealed that the ADC mux values for B12 and B13 pins were wrong. * Add support for all possible analog pins on STM32F1xx Added ADC mux values for pins A0...A7, B0, B1, C0...C5 on STM32F1xx (they are the same at least for STM32F103x8 and larger F103 devices, and also F102, F105, F107 families). Actually tested on STM32F103C8T6 (therefore pins C0...C5 were not tested). Pins F6...F10, which are present on STM32F103x[C-G] in 144-pin packages, cannot be supported at the moment, because those pins are connected only to ADC3, but the ChibiOS ADC driver for STM32F1xx supports only ADC1. * Add support for all possible analog pins on STM32F4xx Added ADC mux values for pins A0...A7, B0, B1, C0...C5 and optionally F3...F10 (if STM32_ADC_USE_ADC3 is enabled). These mux values are apparently the same for all F4xx devices, except some smaller devices may not have ADC3. Actually tested on STM32F401CCU6, STM32F401CEU6, STM32F411CEU6 (using various WeAct “Blackpill” boards); only pins A0...A7, B0, B1 were tested. Pins F3...F10 are inside `#if STM32_ADC_USE_ADC3` because some devices which don't have ADC3 also don't have the GPIOF port, therefore the code which refers to Fx pins does not compile. * Fix STM32F3xx ADC mux table in documentation The ADC driver documentation had some errors in the mux table for STM32F3xx. Fix this table to match the datasheet and the actual code (mux settings for B12 and B13 were also tested on a real STM32F303CCT6 chip). * Add STM32F1xx ADC pins to the documentation * Add STM32F4xx ADC pins to the documentation * Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) (#12600) * Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example. * Update flashing.md * Update chconf.h * Update config.h * Update halconf.h * Update mcuconf.h * eeprom driver: Refactor where eeprom driver initialisation (and EEPROM emulation initialisation) occurs to make it non-target-specific. (#12671) * Add support for MCU = STM32F446 (#12619) * Add support for MCU = STM32F446 * Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h * Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64 * stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled. * Format code according to conventions (#12682) * Format code according to conventions (#12687) * Add STM32L433 and L443 support (#12063) * initial L433 commit * change to XC * fix L433 * disable all peripherals * update system and peripheral clocks * 433 change * use its own board files * revert its own board files * l433 specific change * fix stm32l432xx define * remove duplicate #define * fix bootloader jump * move to L443xx and add i2c2, spi2, usart3 to mcuconf.h * move to L443 * move to L443 * fix sdmmc in mcuconf.h * include STM32L443 * add L443 * Include L443 in compatible microcontrollers * Include L443 in compatible microcontrollers * Update config bootloader jump description * Update ChibiOS define reasoning * Update quantum/mcu_selection.mk * fix git conflict * Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613) * Fix bad PR merge for #6580. (#12721) * Change RGB/LED Matrix to use a simple define for USB suspend (#12697) * [CI] Format code according to conventions (#12731) * Fixing transport's led/rgb matrix suspend state logic (#12770) * [CI] Format code according to conventions (#12772) * Fix comment parsing (#12750) * Added OLED fade out support (#12086) * fix some references to bin/qmk that slipped in (#12832) * Resolve a number of warnings in `qmk generate-api` (#12833) * New command: qmk console (#12828) * stash poc * stash * tidy up implementation * Tidy up slightly for review * Tidy up slightly for review * Bodge environment to make tests pass * Refactor away from asyncio due to windows issues * Filter devices * align vid/pid printing * Add hidapi to the installers * start preparing for multiple hid_listeners * udev rules for hid_listen * refactor to move closer to end state * very basic implementation of the threaded model * refactor how vid/pid/index are supplied and parsed * windows improvements * read the report directly when usage page isn't available * add per-device colors, the choice to show names or numbers, and refactor * add timestamps * Add support for showing bootloaders * tweak the color for bootloaders * Align bootloader disconnect with connect color * add support for showing all bootloaders * fix the pyusb check * tweaks * fix exception * hide a stack trace behind -v * add --no-bootloaders option * add documentation for qmk console * Apply suggestions from code review * pyformat * clean up and flesh out KNOWN_BOOTLOADERS * Remove pointless SERIAL_LINK_ENABLE rules (#12846) * Make Swap Hands use PROGMEM (#12284) This converts the array that the Swap Hands feature uses to use PROGMEM, and to read from that array, as such. Since this array never changes at runtime, there is no reason to keep it in memory. Especially for AVR boards, as memory is a precious resource. * Fix another bin/qmk reference (#12856) * [Keymap] Turn OLED off on suspend in soundmonster keymap (#10419) * Fixup build errors on `develop` branch. (#12723) * LED Matrix: Effects! (#12651) * Fix syntax error when compiling for ARM (#12866) * Remove KEYMAP and LAYOUT_kc (#12160) * alias KEYMAP to LAYOUT * remove KEYMAP and LAYOUT_kc * Add setup, clone, and env to the list of commands we allow even with broken modules (#12868) * Rename `point_t` -> `led_point_t` (#12864) * [Keyboard] updated a vendor name / fixed minor keymap issues (#12881) * Add missing LED Matrix suspend code to suspend.c (#12878) * LED Matrix: Documentation (#12685) * Deprecate `send_unicode_hex_string()` (#12602) * Fix spelling mistake regarding LED Matrix in split_common. (#12888) * [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895) * Use milc.subcommand.config instead of qmk.cli.config (#12915) * Use milc.subcommand.config instead * pyformat * remove the config test * Add function to allow repeated blinking of one layer (#12237) * Implement function rgblight_blink_layer_repeat to allow repeated blinking of one layer at a time * Update doc * Rework rgblight blinking according to requested change * optimize storage * Fixup housekeeping from being invoked twice per loop. (#12933) * matrix: wait for row signal to go HIGH for every row (#12945) I noticed this discrepancy (last row of the matrix treated differently than the others) when optimizing the input latency of my keyboard controller, see also https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/ Before this commit, when tuning the delays I noticed ghost key presses when pressing the F2 key, which is on the last row of the keyboard matrix: the dead_grave key, which is on the first row of the keyboard matrix, would be incorrectly detected as pressed. After this commit, all keyboard matrix rows are interpreted correctly. I suspect that my setup is more susceptible to this nuance than others because I use GPIO_INPUT_PIN_DELAY=0 and hence don’t have another delay that might mask the problem. * ensure we do not conflict with existing keymap aliases (#12976) * Add support for up to 4 IS31FL3733 drivers (#12342) * Convert Encoder callbacks to be boolean functions (#12805) * [Keyboard] Fix Terrazzo build failure (#12977) * Do not hard set config in CPTC files (#11864) * [Keyboard] Corne - Remove legacy revision support (#12226) * [Keymap] Update to Drashna keymap and user code (based on develop) (#12936) * Add Full-duplex serial driver for ARM boards (#9842) * Document LED_MATRIX_FRAMEBUFFER_EFFECTS (#12987) * Backlight: add defines for default level and breathing state (#12560) * Add dire message about LUFA mass storage bootloader (#13014) * [Keyboard] Remove redundant legacy and common headers for crkbd (#13023) Was causing compiler errors on some systems. * Fix keyboards/keymaps for boolean encoder callback changes (#12985) * `backlight.c`: include `eeprom.h` (#13024) * Add changelog for 2021-05-29 Breaking Changes merge (#12939) * Add ChangeLog for 2021-05-29 Breaking Changes Merge: initial version * Add recent develop changes * Sort recent develop changes * Remove sections for ChibiOS changes per tzarc No ChibiOS changes this round. * Add and sort recent develop changes * add notes about keyboard moves/deletions * import changelog for PR 12172 Documents the change to BOOTMAGIC_ENABLE. * update section headings * re-sort changelog * add additional note regarding Bootmagic changes * remove changelog timestamp * update dates in main Breaking Changes docs * fix broken section anchors in previous changelogs * add link to backlight/eeprom patch to changelog * highlight some more changes * link PRs from section headers * Restore standard readme * run: qmk cformat --core-only
2021-02-06Remove `MIDI_ENABLE_STRICT` from user keymaps (#11750)Ryan
2021-01-30Merge remote-tracking branch 'origin/master' into developZach White
2021-01-30add missing ADJUST keyZach White
2021-01-30Add a <FEATURE>_SUPPORTED flag (#9058)Zach White
* Initial attempt at allowing keyboards to indicate what features they do not support * try to use a for loop instead * Update disable_features.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * add a few more features * remove my test fixture * disable things that make all:all suggested" Co-authored-by: Zach White <skullydazed@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-01-27Merge remote-tracking branch 'upstream/master' into developfauxpark
2021-01-27Remove `MIDI_ENABLE_STRICT` from keyboards' config.h (#11679)Ryan
2021-01-22Remove QMK_KEYBOARD_CONFIG_H (#11576)Joel Challis
2021-01-15Remove `DESCRIPTION`, B-D (#11513)Ryan
2020-05-18[Keymap] Add Via keymap for Contra (#9119)Frothy
* Add Via keymap for Contra * Added Via-enabled keymap * Changed VENDOR_ID from 0xFEED to 0x4354 (CT) * Removed unnecessary RGB mappings * PR changes * Removed empty via/config.h * Changed product ID from 0x6060 to 0x0001
2020-01-29Trim firmware sizes from default rules.mk, part 1 (#8027)ridingqwerty
* Removed reference to firmware size in 0-9,a-f board-level and default keymap 'rules.mk' files * Correct some 'rules.mk' in boards buried under vendor folders * PR8027 patch Co-authored-by: GeorgeKoenig <35542036+GeorgeKoenig@users.noreply.github.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2019-12-07[Keymap] Added my customized 40% layout (#7555)Alper Cugun
* Formatting of Contra readme. * Initial version of my custom keymap * Move TODOs to readme * Add comment * Nuke Plover layer * Port changes to other layers * Finished work on my own layout for now * Add layout image * Processed comments from review
2019-11-20Remove keymap_config extern from default keymaps (#7399)Drashna Jaelre
* Remove keymap_config extern from default keymaps * Revert unicode Apparently VSCode does not like unicode, I didn't actually edit these lines, so it must have been automatic... :( Co-Authored-By: fauxpark <fauxpark@gmail.com>
2019-10-05Cleanup rules.mk for 32U4 keyboards, A-F (#6804)fauxpark
* Cleanup rules.mk for 32U4 keyboards, A-F * Put back stuff in VIA keymaps
2019-06-19[Keymap] Actually swap space and left control in gaming mode (#6162)Max Rumpf
2019-06-06Replace DEBOUNCING_DELAY (deprecated) with DEBOUNCE (#5997)Drashna Jaelre
2019-03-26[Keymap] adding keymaps (#3583)martinmksiu
* add key map * QWERTY with 40% layers * updated line 21 updated line 21 from "#include "xd75.h" to "#include QMK_KEYBOARD_H" as requested * upload contra folders * Update .directory * Update config.h * Update config.h * Update keymap.c * Update config.h * Update rules.mk * Update keyboards/contra/keymaps/martin_bac/config.h Co-Authored-By: martinmksiu <martinmksiu@gmail.com> * Update keyboards/xd75/keymaps/martin_cennum/config.h Co-Authored-By: martinmksiu <martinmksiu@gmail.com> * Delete .directory * upload * Delete rules.mk * Update keyboards/contra/keymaps/msiu/config.h Co-Authored-By: martinmksiu <martinmksiu@gmail.com> * Update keyboards/katana60/keymaps/msiu/config.h Co-Authored-By: martinmksiu <martinmksiu@gmail.com> * Update keyboards/katana60/keymaps/msiu/config.h Co-Authored-By: martinmksiu <martinmksiu@gmail.com> * Update keyboards/katana60/keymaps/msiu/config.h Co-Authored-By: martinmksiu <martinmksiu@gmail.com> * Update keyboards/katana60/keymaps/msiu/config.h Co-Authored-By: martinmksiu <martinmksiu@gmail.com> * Delete nano.save * Delete rules.mk * Update keymap.c * Update keymap.c * Update config.h * Update keyboards/lets_split_eh/keymaps/msiu/keymap.c Co-Authored-By: martinmksiu <martinmksiu@gmail.com> * Update keyboards/lets_split_eh/keymaps/msiu/keymap.c Co-Authored-By: martinmksiu <martinmksiu@gmail.com> * Update keymap.c * Update keyboards/planck/keymaps/msiu/config.h Co-Authored-By: martinmksiu <martinmksiu@gmail.com> * Apply suggestions from code review Co-Authored-By: martinmksiu <martinmksiu@gmail.com> * Update keymap.c * Update readme.md * Update keymap.c
2019-03-19 Cleanup Default Keymaps (#5442)Drashna Jaelre
* Cleanup Default Keymaps to conform to QMK Firmware standards * Minor fixes * Revert some changes
2019-02-17Remove redundant KC_TRNS and KC_NO fillers in remaining keymaps (#5154)fauxpark
2019-01-27[Keymap] Support FX keys on Maxr1998's ContraMaxr1998
Using update_tri_layer() and more manual layer switching, also rename some layers & keycodes
2019-01-27[Keymap] Small improvements to Maxr1998's Contra keymap (#4952)Max Rumpf
Add backslash, disable Super key in "Gaming" mode
2019-01-26Adds a default value for IS_COMMAND for COMMAND feature (#4301)Drashna Jaelre
* Add default value for IS_COMMAND for COMMAND feature * Cleanup and consistency * Update Templates to reflect change * Fix IS_COMMAND in template * Fix IS_COMMAND define * Use consistent IS_COMMAND block in templates * Remove unnecessary `#undef IS_COMMAND` directives * Fix compile issue on orthodox * Reomve IS_COMMAND option for newer boards * Remove all existing definitions of IS_COMMAND if they use default LSHIFT and RSHIFT setting * Remove a couple of additional IS_COMMAND defines * Remove remaining redundant IS_COMMAND definitions * Remove #undef IS_COMMAND from orthodox:drashna and whitefox:konstantin * Remove multiple empty lines in modified config.h files * Update additional boards * Reomve IS_COMMAND from newer boards * Update Alice keyboard * Remove IS_COMMAND from additional boards Jan 24th edition
2019-01-13Modified URLs to point to new locationsJeremy Bernhardt
2019-01-04Remove deprecated QUANTUM_DIR code blocks from makefiles (#4754)noroadsleft
* Remove QUANTUM_DIR code blocks from keyboard rules This commit removes the deprecated "QUANTUM_DIR" code block from rules.mk files that affect entire keyboards. * remove QUANTUM_DIR code blocks from rules for default keymaps This commit removes the deprecated "QUANTUM_DIR" code block from rules.mk files that affect default keymaps. * remove QUANTUM_DIR code blocks from rules for user keymaps This commit removes the deprecated "QUANTUM_DIR" code block from rules.mk files that affect "user" keymaps. (It's actually any keymap that isn't named `default`.) * remove QUANTUM_DIR code blocks from rules for community layouts This commit removes the deprecated "QUANTUM_DIR" code block from rules.mk files for community layouts. * remove QUANTUM_DIR code blocks from rules for userspaces This commit removes the deprecated "QUANTUM_DIR" code block from rules.mk files for userspaces.
2019-01-03Remove redundant, language-specific aliases for KC_ALGR (#4720)Konstantin Đorđević
* Use standard KC_ALGR, remove language-specific redefinitions * Use ALGR instead of ALTGR in BÉPO and Canadian multilingual keymaps * Remove BE_LALT, BE_LGUI aliases
2018-10-29Keymap: Added personal Contra layout. (#4235)Bramver
* Added personal Contra layout. * Update keyboards/contra/keymaps/bramver/rules.mk Co-Authored-By: BramVer <bramvereertbrugghen@live.be> * Update keyboards/contra/keymaps/bramver/keymap.c Co-Authored-By: BramVer <bramvereertbrugghen@live.be> * Update keyboards/contra/keymaps/bramver/keymap.c Co-Authored-By: BramVer <bramvereertbrugghen@live.be> * Reformatted layers to use the layout format.
2018-10-22Replace outdated RGB/Audio informationDrashna Jaelre
2018-10-15Keymap: Some tweaks to Maxr1998's Contra layout (#4144)Max Rumpf
* Make some keys more accessible, prevent mistypings * Add "Gaming" layer which maps L-Ctrl to space (left-handed jumping compatibility-mode for all games)
2018-09-17Make `PREVENT_STUCK_MODIFIERS` the default (#3107)Joe Wasson
* Remove chording as it is not documented, not used, and needs work. * Make Leader Key an optional feature. * Switch from `PREVENT_STUCK_MODIFIERS` to `STRICT_LAYER_RELEASE` * Remove `#define PREVENT_STUCK_MODIFIERS` from keymaps.
2018-09-13Keymap: Add Contra keymap with QWERTY and COLEMAK Mod-DH (#3883)Erovia
* Add own personal Contra layout * Enable auto-shifting * Enable tap dancing and implement Space Cadet-like shift with LSHIFT and ENTER * Implement Colemak Mod-DH layout, clean up Adjust layer * Implement keyboard and keymap refactor More info: https://github.com/qmk/qmk_firmware/pull/3191 * Update the readme.md and keymap.c files for Colemak * Add include guard, make layout description cleaner
2018-08-19Keymap: Added deastiny layout for contra [based on dvorak type II] (#3673)DeastinY
* Added deastiny layout for contra [based on dvorak type II] * added questionmark and slash to another layer * added pragma once
2018-07-31Keymap: Improvements to Maxr1998's Contra keymap (#3535)Max Rumpf
* Add image * Improvements to my Contra layout * Quick fix for Level3 layer
2018-06-30Maxr1998's contra layout (#3267)Max Rumpf
2018-06-15Contra refactor (#3191)noroadsleft
* Readme update * Keyboard Refactor * Keymap refactor * Fixes per drashna * Fixed curly brace
2018-05-18Add Contra layout & cleanup a few things (#2998)Harley Laue
* Have Del become backspace on the bottom layer for grid layouts * Fix modtap for ESC * Add sleep to Adjust layer
2018-04-11Remove bootloader from info.jsonsskullY
2018-04-11More QMK Configurator Warning/Error Fixes (#2720)MechMerlin
* Add readme with brief description Change KEYMAP to LAYOUT * Add readme.md with brief description Use LAYOUT macro * add a readme.md file * Add readme.md with brief description Use LAYOUT macro * Add readme.md with brief description Use LAYOUT macro * Fix "Warning: contra: Missing layout pp macro for ['planck_mit', 'planck_grid']", * Use LAYOUT macro
2018-04-07Pull information from config.h and rules.mk (#2711)skullydazed
* Pull information from config.h and rules.mk * Readd the kbd75 maintainer
2018-03-30Just a multilayered Layout using tapdance (#2645)Ryan McLean
* Ported JJ40 Layout to Contra * Update readme.md
2018-03-23Add a basic keymap for Contra. (#2564)XP
2018-03-20add info.json to support both layouts on the contramechmerlin
2018-03-12Add layout support for contra.Joe Wasson
2018-03-12Add default keymap for contraJoe Wasson
2018-03-09Added Contra keyboard support (#2501)adiron
* Added Contra keyboard support The configuration came from a source distribution of the firmware on the Contra's official website. I have also included a simple MIDI keymap. (And it works!) * Changes to Contra config and README * Readme has been changed as requested by jackhumbert * Config has been changed to add the Cartel and Contra names to the USB configuration.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 10:15:57 +0000