Compare commits

..

32 Commits

Author SHA1 Message Date
84b8cdc1a4 Fix bit loss in cie_lightness() when doing division to resolve #15331 (#15344)
* Fix bit loss in cie_lightness() when doing division.

* Use the right types

* Format

Co-authored-by: zvecr <git@zvecr.com>
2021-11-29 15:07:36 +00:00
23d3ebd78a [Keyboard] Minor typo and broken link fix (#14847) 2021-11-29 00:30:26 -08:00
e6e501aaa0 [Keyboard] Add Wete R2 (#14873)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-11-29 00:29:57 -08:00
c4710fa74b [Keyboard] Add Meow65 PCB (#14937)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-11-29 00:29:14 -08:00
ea9fead229 Update VIA keymap for "EndZone34" (#15077) 2021-11-29 00:28:54 -08:00
9cc97302ab [Keyboard] add odin keyboard (#15150)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-11-29 00:28:00 -08:00
4c0ecd4910 [Keyboard] Add FJLabs 7V Hotswap PCBs (#15175)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-11-29 00:26:32 -08:00
1b6673de1f [Keyboard] Add Noxary Valhalla support (#15197) 2021-11-29 00:25:53 -08:00
32c5c97ee3 [Keyboard] Add mw65_black support (#15198) 2021-11-29 00:25:19 -08:00
fd86f8c94d [Keyboard] Add swap hands support and readme updates for Architeuthis Dux (#15227)
Co-authored-by: filterpaper <filterpaper@localhost>
2021-11-29 00:24:43 -08:00
d4b07be012 [Keyboard] Add swap hands support and readme update for Cradio (#15226)
Co-authored-by: filterpaper <filterpaper@localhost>
2021-11-29 00:24:12 -08:00
d8324e8a9c Document swap-hands tap-toggle feature (#15229)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: filterpaper <filterpaper@localhost>
2021-11-29 00:23:37 -08:00
f9e21a654c [Keyboard] Add swap hands support for 3w6 rev2 (#15230)
Co-authored-by: filterpaper <filterpaper@localhost>
2021-11-29 00:23:09 -08:00
f6a5731300 [Keyboard] Fix layout + led state for Krush (#15231) 2021-11-29 00:22:31 -08:00
bcf2632a29 [Keyboard] Add define GPIO into Dosa40RGB (#15252)
Co-authored-by: NOOB Maker <93704375+noobmakers@users.noreply.github.com>
2021-11-29 00:21:29 -08:00
b12acfb630 [Keyboard] Add mousekey support for Technik variants (#15258)
Co-authored-by: filterpaper <filterpaper@localhost>
2021-11-29 00:20:56 -08:00
47764132f1 [Keyboard] Add "DogTag" (#15259)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-11-29 00:20:15 -08:00
a7bc02bf69 [Keyboard] Sweep swap hand feature and pin documentation (#15264)
Co-authored-by: filterpaper <filterpaper@localhost>
2021-11-29 00:19:00 -08:00
35a18a8bcd [Keyboard] Code updates for macro3 (#15280)
Co-authored-by: filterpaper <filterpaper@localhost>
2021-11-29 00:18:33 -08:00
690a879d77 feat: adding carlosala keymap (#15281) 2021-11-29 00:18:05 -08:00
047fe0a8f9 [Keyboard] Add Galatea TKL PCB. (#15290) 2021-11-29 00:17:26 -08:00
b90d94755c [Keyboard] Add Vertex 40% (#15323) 2021-11-29 00:16:38 -08:00
5b5b36421a [Keymap] Unicode and cursor sync - drashna keymap (#15328) 2021-11-28 23:41:59 -08:00
4ee33f1ffd Fix keyboard level use of OLED_DRIVER_ENABLE (#15343) 2021-11-28 21:00:02 +00:00
097ae9d817 fixed oled in bongocat keymap and fixed encoder direction (#15232)
* fixed oled in bongocat keymap (#13454) and fixed encoder direction for prod parts

* updated readme for launch later today
2021-11-28 20:45:24 +00:00
b29b482741 Add TRNS to LOWER layer (#15288)
This commit makes the mode keys transparent in the LOWER layer instead
of disabled.

Before this commit, the following sequence of key presses `LGUI+LOWER+l`
would translate into `Cmd+right` in macOS and, therefore, move the
cursor to the end of line.

But, pressing `LOWER+LGUI+l` would completely ignore the `LGUI` and,
therefore, move the cursor one letter to the right.

With this change, pressing `LOWER+LGUI+l` produces the same result as
`LGUI+LOWER+l`.

This is also true for multiple other combinations, like
`RALT+SHIFT+LOWER+l`, `LOWER+RALT+SHIFT+l`, `SHIFT+LOWER+RALT+l`, etc.

Co-authored-by: Gaston Jorquera <gjorquera@gmail.com>
2021-11-28 20:28:15 +00:00
9beee82825 Enable RGB Matrix animations being used (#15338) 2021-11-28 20:00:37 +00:00
35b6d1e992 [Keyboard] Add Nozbe Macropad (#14803)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-11-27 22:44:00 -08:00
d4690d0c23 Meridian LED update (#15329)
* Meridian first update

* Update README, adjust timing settings

* Update README
2021-11-28 17:26:50 +11:00
99c6829bf0 [Keyboard] Add 40percent.club's 'polypad' PCB (#15158)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-11-27 21:52:53 -08:00
99ec5e39cf Fix last merge date (#15327) 2021-11-28 12:59:48 +11:00
eaf17b3260 [Bug] Xelus Keyboards 400kHz i2c fix (#15315)
* 400khz fix

* fix valor rev2 timing

* keep consistent
2021-11-28 12:12:04 +11:00
224 changed files with 6371 additions and 259 deletions

View File

@ -24,7 +24,7 @@ The next Breaking Change is scheduled for February 26, 2022.
### Important Dates
* [x] 2022 Nov 27 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
* [x] 2021 Nov 27 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
* [ ] 2022 Jan 31 - `develop` closed to new PR's.
* [ ] 2022 Jan 31 - Call for testers.
* [ ] 2022 Feb 12 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes

View File

@ -27,5 +27,7 @@ Note that the array indices are reversed same as the matrix and the values are o
|`SH_MON` |Swaps hands when pressed, returns to normal when released (momentary). |
|`SH_MOFF` |Momentarily turns off swap. |
|`SH_TG` |Toggles swap on and off with every key press. |
|`SH_TT` |Toggles with a tap; momentary when held. |
|`SH_TT` |Momentary swap when held, toggles with repeated taps (see below). |
|`SH_OS` |One shot swap hands: toggles while pressed or until next key press. |
`SH_TT` swap-hands tap-toggle key is similar to [layer tap-toggle](feature_layers.md?id=switching-and-toggling-layers). Tapping repeatedly (5 taps by default) will toggle swap-hands on or off, like `SH_TG`. Tap-toggle count can be changed by defining a value for `TAPPING_TOGGLE`.

View File

@ -48,7 +48,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DIODE_DIRECTION COL2ROW
#define TAP_CODE_DELAY 10
#define ENCODER_DIRECTION_FLIP
#define ENCODER_RESOLUTION 4
#define ENCODERS_PAD_A { D0 }
#define ENCODERS_PAD_B { D1 }

View File

@ -107,7 +107,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
#endif
/* oled stuff :) */
#ifdef OLED_DRIVER_ENABLE
#ifdef OLED_ENABLE
#define IDLE_FRAMES 5
#define IDLE_SPEED 20 // below this wpm value your animation will idle
#define TAP_FRAMES 2

View File

@ -4,7 +4,7 @@ Macro keypad
* Keyboard Maintainer: [Conor Burns](https://github.com/conor-burns)
* Hardware Supported: https://github.com/0xCB-dev/0xcb-static
* Hardware Availability: Soon on tindie or order your own parts - the hardware in the repo is Open Source :D
* Hardware Availability: On CandyKeys or order your own parts - the hardware in the repo is Open Source :D
* PCB renders :)
![](https://github.com/0xCB-dev/0xcb-static/blob/main/PCB/rev1.0/top.png)

View File

@ -15,3 +15,20 @@
*/
#include "rev2.h"
#ifdef SWAP_HANDS_ENABLE
__attribute__ ((weak))
const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
// Left
{{4, 4}, {3, 4}, {2, 4}, {1, 4}, {0, 4}},
{{4, 5}, {3, 5}, {2, 5}, {1, 5}, {0, 5}},
{{4, 6}, {3, 6}, {2, 6}, {1, 6}, {0, 6}},
{{4, 7}, {3, 7}, {2, 7}, {1, 7}, {0, 7}},
// Right
{{4, 0}, {3, 0}, {2, 0}, {1, 0}, {0, 0}},
{{4, 1}, {3, 1}, {2, 1}, {1, 1}, {0, 1}},
{{4, 2}, {3, 2}, {2, 2}, {1, 2}, {0, 2}},
{{4, 3}, {3, 3}, {2, 3}, {1, 3}, {0, 3}}
};
#endif

View File

@ -0,0 +1,90 @@
/* Copyright 2021
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x6060
#define DEVICE_VER 0x0001
#define MANUFACTURER di0ib
#define PRODUCT Polypad
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5
//more detailed config options start below:
/* define if matrix has ghost (lacks anti-ghosting diodes) */
//#define MATRIX_HAS_GHOST
/* number of backlight levels */
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
* This is userful for the Windows task manager shortcut (ctrl+shift+esc).
*/
// #define GRAVE_ESC_CTRL_OVERRIDE
/*
* Force NKRO
*
* Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
* state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
* makefile for this to work.)
*
* If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
* until the next keyboard reset.
*
* NKRO may prevent your keystrokes from being detected in the BIOS, but it is
* fully operational during normal computer usage.
*
* For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
* or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
* bootmagic, NKRO mode will always be enabled until it is toggled again during a
* power-up.
*
*/
//#define FORCE_NKRO
/*
* Feature disable options
* These options are also useful to firmware size reduction.
*/
/* disable debug print */
//#define NO_DEBUG
/* disable print */
//#define NO_PRINT
/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION
/* Bootmagic Lite key configuration */
// #define BOOTMAGIC_LITE_ROW 0
// #define BOOTMAGIC_LITE_COLUMN 0

View File

@ -0,0 +1,27 @@
{
"keyboard_name": "Polyandry",
"url": "",
"maintainer": "QMK",
"layouts": {
"LAYOUT": {
"layout": [
{"label": "k000", "x": 0, "y": 0},
{"label": "k001", "x": 1, "y": 0},
{"label": "k002", "x": 2, "y": 0},
{"label": "k003", "x": 0, "y": 1},
{"label": "k004", "x": 1, "y": 1},
{"label": "k005", "x": 2, "y": 1},
{"label": "k006", "x": 0, "y": 2},
{"label": "k007", "x": 1, "y": 2},
{"label": "k008", "x": 2, "y": 2},
{"label": "k009", "x": 0, "y": 3},
{"label": "k010", "x": 1, "y": 3},
{"label": "k011", "x": 2, "y": 3}
]
}
}
}

View File

@ -0,0 +1,30 @@
/* Copyright 2021
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LAYOUT(
KC_1, KC_2, KC_3,
KC_4, KC_5, KC_6,
KC_7, KC_8, KC_9,
KC_0, KC_A, KC_B
),
};

View File

@ -0,0 +1,16 @@
/* Copyright 2021
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "polyandry.h"

View File

@ -0,0 +1,24 @@
/* Copyright 2021
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "quantum.h"
#ifdef KEYBOARD_40percentclub_polyandry_promicro
#include "promicro.h"
#elif KEYBOARD_40percentclub_polyandry_teensy2
#include "teensy2.h"
#endif

View File

@ -0,0 +1,34 @@
/* Copyright 2021
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 1
#define MATRIX_COLS 12
/* key matrix pins
* Direct pins is not used because there is not a shared ground position
* between all compatible microcontrollers.
*/
#define MATRIX_ROW_PINS { D7 }
#define MATRIX_COL_PINS { D1, D0, D4, C6, E6, B4, F4, F5, F6, F7, B3, B2 }
#define UNUSED_PINS
/* doesn't really matter lol */
#define DIODE_DIRECTION COL2ROW

View File

@ -0,0 +1,16 @@
/* Copyright 2021
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "promicro.h"

View File

@ -0,0 +1,27 @@
/* Copyright 2021
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "polyandry.h"
#define LAYOUT( \
K000, K001, K002, \
K003, K004, K005, \
K006, K007, K008, \
K009, K010, K011 \
) { \
{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 } \
}

View File

@ -0,0 +1,5 @@
# MCU name
MCU = atmega32u4
# Bootloader selection
BOOTLOADER = caterina

View File

@ -0,0 +1,53 @@
# Polyandry/polypad
![Polyandry](https://1.bp.blogspot.com/-97uoICZvZec/XSdpvCVFFlI/AAAAAAACVZY/BlCRjxjDqDAxOZa6C5ddQr0OsFQ9VZv5wCLcBGAs/s1600/d1.jpg)
===
3x4/4x3 grid layout, multiple controllers supported
- Pro Micro
- PJRC Teensy 2.0
(**The below are not currently ported:**)
- PJRC Teensy LC/3.2
- PJRC Teensy 3.5/3.6
- Adafruit ItsyBitsy ATMega32u4
- Adafruit ItsyBitsy M0
- Adafruit ItsyBitsy M4
The matrix is electrically 1x12 with no diodes, with a thirteenth pin used for the column rather than a ground in order to be compatible with all the listed microcontrollers..
The default keymap is a testing keymap that is intended to make sure all of the keys on the matrix are working and properly assigned.
[The original (minimal arduino sketch) firmware, with support for some unsupported controllers](https://git.40percent.club/di0ib/Misc/src/branch/master/polyandry)
Keyboard Maintainer: QMK Community
Hardware Supported: Polyandry PCB
Hardware Availability: [Polyandry gerbers are on 40percent.club](https://www.40percent.club/2019/07/polyandry.html)
Make example for this keyboard (after setting up your build environment):
make 40percentclub/polyandry:default
or
qmk compile -kb 40percentclub/polyandry -km default
Default firmware is for an Arduino Pro Micro knockoff.
If you would like to specify a controller:
make 40percentclub/polyandry/promicro:default
or
qmk compile -kb 40percentclub/polyandry/promicro -km default
make 40percentclub/polyandry/teensy2:default
or
qmk compile -kb 40percentclub/polyandry/teensy2 -km default
## Bootloader
Enter the bootloader in 3 ways:
* **Bootmagic reset**: Hold down the top left key of the keyboard (top right or bottom left in horizontal configuration)
* **Physical reset**: Briefly press the button on the bottom of the microcontroller or, if not present short the pin marked RST to a GND.
* **Keycode in layout**: Press the key mapped to `RESET` if it is available
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

View File

@ -0,0 +1,17 @@
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
NKRO_ENABLE = no # USB Nkey Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
DEFAULT_FOLDER = 40percentclub/polyandry/promicro

View File

@ -0,0 +1,36 @@
/* Copyright 2021
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 1
#define MATRIX_COLS 12
/* key matrix pins */
// Note from original contributor (ryjelsum):
// Untested - don't have teensy2. if some keys do not function or are in wrong place,
// please check the pin definitions. I may have screwed up. :)
#define MATRIX_ROW_PINS { D3 }
#define MATRIX_COL_PINS { B7, D0, D1, D2, C6, C7, F6, F7, B6, B5, D7, D6 }
#define UNUSED_PINS
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW

View File

@ -0,0 +1,5 @@
# MCU name
MCU = atmega32u4
# Bootloader selection
BOOTLOADER = halfkay

View File

@ -0,0 +1,16 @@
/* Copyright 2021
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "teensy2.h"

View File

@ -0,0 +1,32 @@
/* Copyright 2021
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
//NOTE TO FUTURE FROM RYJELSUM (original contributor):
//This has been unchanged from the promicro.h file.
//I DO NOT HAVE A TEENSY 2.0 TO TEST WITH.
//I believe this should still work - but it's not a sure thing.
#include "polyandry.h"
#define LAYOUT( \
K000, K001, K002, \
K003, K004, K005, \
K006, K007, K008, \
K009, K010, K011 \
) { \
{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 } \
}

View File

@ -1,4 +1,8 @@
/* Copyright 2018-2020 ENDO Katsuhiro <ka2hiro@curlybracket.co.jp> David Philip Barr <@davidphilipbarr> Pierre Chevalier <pierrechevalier83@gmail.com>
/* Copyright 2018-2020
* ENDO Katsuhiro <ka2hiro@curlybracket.co.jp>
* David Philip Barr <@davidphilipbarr>
* Pierre Chevalier <pierrechevalier83@gmail.com>
* @filterpaper
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -14,3 +18,20 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "a_dux.h"
#ifdef SWAP_HANDS_ENABLE
__attribute__ ((weak))
const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
// Left
{{4, 4}, {3, 4}, {2, 4}, {1, 4}, {0, 4}},
{{4, 5}, {3, 5}, {2, 5}, {1, 5}, {0, 5}},
{{4, 6}, {3, 6}, {2, 6}, {1, 6}, {0, 6}},
{{1, 7}, {0, 7}, {2, 7}, {3, 7}, {4, 7}},
// Right
{{4, 0}, {3, 0}, {2, 0}, {1, 0}, {0, 0}},
{{4, 1}, {3, 1}, {2, 1}, {1, 1}, {0, 1}},
{{4, 2}, {3, 2}, {2, 2}, {1, 2}, {0, 2}},
{{1, 3}, {0, 3}, {2, 3}, {3, 3}, {4, 3}}
};
#endif

View File

@ -28,7 +28,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
## Setting Handedness
Keyboard uses [handedness by EEPROM](https://docs.qmk.fm/#/feature_split_keyboard?id=handedness-by-eeprom) as default. The make commands are:
Firmware uses [handedness by EEPROM](https://docs.qmk.fm/#/feature_split_keyboard?id=handedness-by-eeprom) as default and it must be *configured once* on each side. The make commands are:
make a_dux:default:dfu-split-left
make a_dux:default:dfu-split-right

View File

@ -8,7 +8,7 @@ BOOTLOADER = atmel-dfu
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration

View File

@ -8,7 +8,7 @@ BOOTLOADER = atmel-dfu
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration

View File

@ -2,6 +2,7 @@
* ENDO Katsuhiro <ka2hiro@curlybracket.co.jp>
* David Philip Barr <@davidphilipbarr>
* Pierre Chevalier <pierrechevalier83@gmail.com>
* @filterpaper
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -18,3 +19,20 @@
*/
#include "cradio.h"
#ifdef SWAP_HANDS_ENABLE
__attribute__ ((weak))
const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
// Left
{{4, 4}, {3, 4}, {2, 4}, {1, 4}, {0, 4}},
{{4, 5}, {3, 5}, {2, 5}, {1, 5}, {0, 5}},
{{4, 6}, {3, 6}, {2, 6}, {1, 6}, {0, 6}},
{{1, 7}, {0, 7}, {2, 7}, {3, 7}, {4, 7}},
// Right
{{4, 0}, {3, 0}, {2, 0}, {1, 0}, {0, 0}},
{{4, 1}, {3, 1}, {2, 1}, {1, 1}, {0, 1}},
{{4, 2}, {3, 2}, {2, 2}, {1, 2}, {0, 2}},
{{1, 3}, {0, 3}, {2, 3}, {3, 3}, {4, 3}}
};
#endif

View File

@ -8,7 +8,8 @@ Cradio are low-profile 34-key split-keyboards designed by [@davidphilipbarr](htt
* Keyboard Maintainer: [davidphilipbarr](https://github.com/davidphilipbarr)
* Hardware Supported:
* [Sweep](https://github.com/davidphilipbarr/Sweep) (all versions)
* [Cradio](https://github.com/davidphilipbarr/36keys/tree/master/34Keys)
* [Sweep](https://github.com/davidphilipbarr/Sweep)
* [Hypergarlic](https://github.com/davidphilipbarr/hypergolic/tree/main/hypergarlic)
* [Paroxysm](https://github.com/davidphilipbarr/hypergolic/tree/main/paroxysm)
* Variants of the same 34-key direct pin PCB
@ -22,7 +23,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
## Setting Handedness
Keyboard uses [handedness by EEPROM](https://docs.qmk.fm/#/feature_split_keyboard?id=handedness-by-eeprom) as default. The make commands are:
Firmware uses [handedness by EEPROM](https://docs.qmk.fm/#/feature_split_keyboard?id=handedness-by-eeprom) as default and it must be *configured once* on each side. The make commands are:
make cradio:default:dfu-split-left
make cradio:default:dfu-split-right
@ -36,3 +37,24 @@ Enter the bootloader in 3 ways:
* **Bootmagic reset**: Hold down the top left key on the left half (or the top right right key on the right half) and plug in the controller on that side.
* **Physical reset button**: Briefly press the reset button soldered on the PCB.
* **Keycode in layout**: Press the key mapped to `RESET` if it is configured.
## Swapped Pins
If you have one of the PCB variant with swapped letters `Q` and `B` / `P` and `N`, add the following code to your keymap's `config.h` to swap pins `E6` and `D7` in the firmware:
```c
#undef DIRECT_PINS
#define DIRECT_PINS { \
{ D7, F7, F6, F5, F4 }, \
{ B1, B3, B2, B6, D3 }, \
{ D1, D0, D4, C6, E6 }, \
{ B4, B5, NO_PIN, NO_PIN, NO_PIN } \
}
#undef DIRECT_PINS_RIGHT
#define DIRECT_PINS_RIGHT { \
{ F4, F5, F6, F7, D7 }, \
{ D3, B6, B2, B3, B1 }, \
{ E6, C6, D4, D0, D1 }, \
{ B5, B4, NO_PIN, NO_PIN, NO_PIN } \
}
```

View File

@ -67,3 +67,8 @@ void rgb_matrix_indicators_user(void)
rgb_matrix_set_color(22, 200, 0, 200);
}
}
void keyboard_pre_init_user(void) {
setPinOutput(B5);
writePinLow(B5);
}

View File

@ -8,9 +8,8 @@ A version of the Ferris keyboard that uses a daughterboard, designed by the fant
## Keyboard Info
* Keyboard Maintainer: [Pierre Chevalier](https://github.com/pierrechevalier83)
* Hardware Supported:
* Ferris sweep (With pro-micro. Comes in a couple of PCB edge cuts shapes, but with identical pinout)
* Hardware Availability: @iamnotyourbroom in the 40% discord chat server may have some spares for you.
* Hardware Supported: [Sweep](https://github.com/davidphilipbarr/Sweep) (all versions)
* Hardware Availability: Print the PCB with gerber files from the repository
Make example for this keyboard (after setting up your build environment):
@ -20,7 +19,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
## Setting Handedness
Keyboard uses [handedness by EEPROM](https://docs.qmk.fm/#/feature_split_keyboard?id=handedness-by-eeprom) as default. The make commands are:
Firmware uses [handedness by EEPROM](https://docs.qmk.fm/#/feature_split_keyboard?id=handedness-by-eeprom) as default and it must be *configured once* on each side. The make commands are:
make ferris/sweep:default:avrdude-split-left
make ferris/sweep:default:avrdude-split-right
@ -35,3 +34,22 @@ Enter the bootloader in 3 ways:
* **Physical reset button**: Briefly press the reset button soldered on the PCB.
* **Keycode in layout**: Press the key mapped to `RESET` if it is configured.
## Swapped Pins
If you printed one of the PCB variant with swapped letters `Q` and `B` / `P` and `N`, add the following code to your keymap's `config.h` to swap pins `E6` and `D7` in the firmware:
```c
#undef DIRECT_PINS
#define DIRECT_PINS { \
{ D7, F7, F6, F5, F4 }, \
{ B1, B3, B2, B6, D3 }, \
{ D1, D0, D4, C6, E6 }, \
{ B4, B5, NO_PIN, NO_PIN, NO_PIN } \
}
#undef DIRECT_PINS_RIGHT
#define DIRECT_PINS_RIGHT { \
{ F4, F5, F6, F7, D7 }, \
{ D3, B6, B2, B3, B1 }, \
{ E6, C6, D4, D0, D1 }, \
{ B5, B4, NO_PIN, NO_PIN, NO_PIN } \
}
```

View File

@ -14,3 +14,20 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "sweep.h"
#ifdef SWAP_HANDS_ENABLE
__attribute__ ((weak))
const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
// Left
{{4, 4}, {3, 4}, {2, 4}, {1, 4}, {0, 4}},
{{4, 5}, {3, 5}, {2, 5}, {1, 5}, {0, 5}},
{{4, 6}, {3, 6}, {2, 6}, {1, 6}, {0, 6}},
{{1, 7}, {0, 7}, {2, 7}, {3, 7}, {4, 7}},
// Right
{{4, 0}, {3, 0}, {2, 0}, {1, 0}, {0, 0}},
{{4, 1}, {3, 1}, {2, 1}, {1, 1}, {0, 1}},
{{4, 2}, {3, 2}, {2, 2}, {1, 2}, {0, 2}},
{{1, 3}, {0, 3}, {2, 3}, {3, 3}, {4, 3}}
};
#endif

Some files were not shown because too many files have changed in this diff Show More