Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2022-05-11 23:55:09 +00:00
commit 12fe4c49de
8 changed files with 0 additions and 278 deletions

View file

@ -1,100 +0,0 @@
/*
Copyright 2012 Jun Wako <wakojun@gmail.com>
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 upils
#define PRODUCT reddot
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 19
/*
* Keyboard Matrix Assignments
*
* Change this to how you wired your keyboard
* COLS: AVR pins used for columns, left to right
* ROWS: AVR pins used for rows, top to bottom
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
*
*/
#define MATRIX_ROW_PINS { B0, B1, B2, B3, E6 }
#define MATRIX_COL_PINS { B7, D0, D1, D2, D3, C6, C7, D5, D4, D7, B4, B5, B6, F7, F6, F5, F4, F1, F0 }
#define UNUSED_PINS
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
// #define BACKLIGHT_PIN B7
// #define BACKLIGHT_BREATHING
// #define BACKLIGHT_LEVELS 3
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5
/* define if matrix has ghost (lacks anti-ghosting diodes) */
//#define MATRIX_HAS_GHOST
/* 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
/*
* 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

View file

@ -1,106 +0,0 @@
{
"keyboard_name": "handwired/reddot",
"url": "",
"maintainer": "qmk",
"layouts": {
"LAYOUT": {
"layout": [
{"label":"k00 (Esc)", "x":0, "y":0},
{"label":"k01 (F1)", "x":1, "y":0},
{"label":"k02 (F2)", "x":2, "y":0},
{"label":"k03 (F3)", "x":3, "y":0},
{"label":"k04 (F4)", "x":4, "y":0},
{"label":"k05 (F5)", "x":5, "y":0},
{"label":"k06 (Tab)", "x":6, "y":0, "w":2},
{"label":"k07 (Caps Lock)", "x":8, "y":0},
{"label":"k08 (F6)", "x":9, "y":0},
{"label":"k09 (F7)", "x":10, "y":0},
{"label":"k0A (F8)", "x":11, "y":0},
{"label":"k0B (F9)", "x":12, "y":0},
{"label":"k0C (F10)", "x":13, "y":0},
{"label":"k0D (F11)", "x":14, "y":0},
{"label":"k0E (F12)", "x":15, "y":0},
{"label":"k10 (Function)", "x":16.5, "y":0},
{"label":"k11 (Keypad /)", "x":17.5, "y":0},
{"label":"k12 (Keypad *)", "x":18.5, "y":0},
{"label":"k13 (Keypad -)", "x":19.5, "y":0},
{"label":"k20 (Left Alt)", "x":0, "y":1},
{"label":"k21 (1 / FR Ampersand)", "x":1, "y":1},
{"label":"k22 (2 / FR É)", "x":2, "y":1},
{"label":"k23 (3 / FR Quote)", "x":3, "y":1},
{"label":"k24 (4 / FR Apostrophe)", "x":4, "y":1},
{"label":"k25 (5 / FR Left Parenthesis)", "x":5, "y":1},
{"label":"k26 (Backspace)", "x":6, "y":1, "w":2},
{"label":"k27 (Delete)", "x":8, "y":1},
{"label":"k28 (6 / FR Minus)", "x":9, "y":1},
{"label":"k29 (7 / FR È)", "x":10, "y":1},
{"label":"k2A (8 / FR Underscore)", "x":11, "y":1},
{"label":"k2B (9 / FR Ç)", "x":12, "y":1},
{"label":"k2C (0 / FR À)", "x":13, "y":1},
{"label":"k2D (Minus / FR Right Parenthesis)", "x":14, "y":1},
{"label":"k2E (Equals / FR Equals)", "x":15, "y":1},
{"label":"k30 (Insert)", "x":16.5, "y":1},
{"label":"k31 (Home)", "x":17.5, "y":1},
{"label":"k32 (Page Up)", "x":18.5, "y":1},
{"label":"k40 (GUI)", "x":0, "y":2},
{"label":"k41 (Q / FR A)", "x":1, "y":2},
{"label":"k42 (W / FR Z)", "x":2, "y":2},
{"label":"k43 (E)", "x":3, "y":2},
{"label":"k44 (R)", "x":4, "y":2},
{"label":"k45 (T)", "x":5, "y":2},
{"label":"k46 (Shift)", "x":6, "y":2, "h":2},
{"label":"k66 (Enter)", "x":7, "y":2, "h":2},
{"label":"k47 (Enter)", "x":8, "y":2, "h":2},
{"label":"k48 (Y)", "x":9, "y":2},
{"label":"k49 (U)", "x":10, "y":2},
{"label":"k4A (I)", "x":11, "y":2},
{"label":"k4B (O)", "x":12, "y":2},
{"label":"k4C (P)", "x":13, "y":2},
{"label":"k4D (Left Bracket / FR Circumflex)", "x":14, "y":2},
{"label":"k4E (Right Bracket / FR Dollar)", "x":15, "y":2},
{"label":"k50 (Delete)", "x":16.5, "y":2},
{"label":"k51 (End)", "x":17.5, "y":2},
{"label":"k52 (Page Down)", "x":18.5, "y":2},
{"label":"k53 (Keypad +)", "x":19.5, "y":1, "h":2},
{"label":"k60 (Ctrl)", "x":0, "y":3},
{"label":"k61 (A / FR Q)", "x":1, "y":3},
{"label":"k62 (S)", "x":2, "y":3},
{"label":"k63 (D)", "x":3, "y":3},
{"label":"k64 (F)", "x":4, "y":3},
{"label":"k65 (G)", "x":5, "y":3},
{"label":"k68 (H)", "x":9, "y":3},
{"label":"k69 (J)", "x":10, "y":3},
{"label":"k6A (K)", "x":11, "y":3},
{"label":"k6B (L)", "x":12, "y":3},
{"label":"k6C (Semicolon / FR M)", "x":13, "y":3},
{"label":"k6D (Quote / FR Ù)", "x":14, "y":3},
{"label":"k6E (ISO Hash / FR Asterisk)", "x":15, "y":3},
{"label":"k70 (Keypad 1)", "x":16.5, "y":3},
{"label":"k71 (Up)", "x":17.5, "y":3},
{"label":"k72 (Keypad 3)", "x":18.5, "y":3},
{"label":"k80 (ISO Backslash / FR Less Than)", "x":0, "y":4},
{"label":"k81 (Z / FR W)", "x":1, "y":4},
{"label":"k82 (X)", "x":2, "y":4},
{"label":"k83 (C)", "x":3, "y":4},
{"label":"k84 (V)", "x":4, "y":4},
{"label":"k85 (B)", "x":5, "y":4},
{"label":"k86 (Space)", "x":6, "y":4, "w":2},
{"label":"k88 (Space)", "x":8, "y":4, "w":2},
{"label":"k89 (N)", "x":10, "y":4},
{"label":"k8A (M / FR Comma)", "x":11, "y":4},
{"label":"k8B (Comma / FR Semicolon)", "x":12, "y":4},
{"label":"k8C (Period / Colon)", "x":13, "y":4},
{"label":"k8D (Slash / FR Exclaim)", "x":14, "y":4},
{"label":"k8E (Right Alt / FR AltGr)", "x":15, "y":4},
{"label":"k90 (Left)", "x":16.5, "y":4},
{"label":"k91 (Down)", "x":17.5, "y":4},
{"label":"k92 (Right)", "x":18.5, "y":4},
{"label":"k93 (Keypad Enter)", "x":19.5, "y":3, "h":2}
]
}
}
}

View file

@ -1,22 +0,0 @@
#include QMK_KEYBOARD_H
#include "keymap_french.h"
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TAB, KC_CAPS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, TG(1), KC_PSLS, KC_PAST, KC_PMNS,
KC_LALT, FR_AMPR, FR_EACU, FR_DQUO, FR_QUOT, FR_LPRN, KC_BSPC, KC_DEL, FR_MINS, FR_EGRV, FR_UNDS, FR_CCED, FR_AGRV, FR_RPRN, FR_EQL, KC_INS, KC_HOME, KC_PGUP,
KC_LGUI, FR_A, FR_Z, KC_E, KC_R, KC_T, KC_LSFT, KC_ENT, KC_ENT, KC_Y, KC_U, KC_I, KC_O, KC_P, FR_CIRC, FR_DLR, KC_DEL, KC_END, KC_PGDN, KC_PPLS,
KC_LCTL, FR_Q, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, FR_M, FR_UGRV, FR_ASTR, KC_P1, KC_UP, KC_P3,
FR_LABK, FR_W, KC_X, KC_C, KC_V, KC_B, KC_SPC, KC_SPC, KC_N, FR_COMM, FR_SCLN, FR_COLN, FR_EXLM, KC_ALGR, KC_LEFT, KC_DOWN, KC_RGHT, KC_PENT
),
[1] = LAYOUT(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TAB, KC_CAPS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_PSLS, KC_PAST, KC_PMNS,
KC_LALT, FR_AMPR, FR_EACU, FR_DQUO, FR_QUOT, FR_LPRN, KC_BSPC, KC_DEL, FR_MINS, FR_EGRV, FR_UNDS, FR_CCED, FR_AGRV, FR_RPRN, FR_EQL, KC_7, KC_8, KC_9,
KC_LGUI, FR_A, FR_Z, KC_E, KC_R, KC_T, KC_LSFT, KC_ENT, KC_ENT, KC_Y, KC_U, KC_I, KC_O, KC_P, FR_CIRC, FR_DLR, KC_4, KC_5, KC_6, KC_PPLS,
KC_LCTL, FR_Q, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, FR_M, FR_UGRV, FR_ASTR, KC_1, KC_2, KC_3,
FR_LABK, FR_W, KC_X, KC_C, KC_V, KC_B, KC_SPC, KC_SPC, KC_N, FR_COMM, FR_SCLN, FR_COLN, FR_EXLM, KC_ALGR, KC_LEFT, KC_DOWN, KC_RGHT, KC_PENT
),
};

View file

@ -1 +0,0 @@
# The default keymap for handwired/reddot

View file

@ -1,14 +0,0 @@
# RedDot
An ortholinear compact fullsize keyboard configured for French AZERTY layout.
- [Layout](http://www.keyboard-layout-editor.com/##@_plate:true%3B&@_sm=cherry&sb=cherry&st=MX1A-L1xx%3B&=Esc&=F1&=F2&=F3&=F4&=F5&_w:2%3B&=Tab&=Caps%20Lock&=F6&=F7&=F8&=F9&=F10&=F11&=F12&_x:0.5%3B&=Fn&=%2F%2F&=*&=-%3B&@=Alt&=1%0A%2F&&=2%0A%C3%A9%0A%0A~&=3%0A%22%0A%0A%23&=4%0A'%0A%0A%7B&=5%0A(%0A%0A%5B&_w:2%3B&=Back&=Del&=6%0A-%0A%0A%7C&=7%0A%C3%A8%0A%0A%60&=8%0A%2F_%0A%0A%5C&=9%0A%C3%A7%0A%0A%5E&=0%0A%C3%A0%0A%0A%2F@&=%C2%B0%0A)%0A%0A%5D&=+%0A%2F=%0A%0A%7D&_x:0.5%3B&=Insert&=Home&=Page%20Up&_h:2%3B&=+%3B&@=Win&=A&=Z&=E&=R&=T&_h:2%3B&=Shift&_h:2%3B&=Enter&_h:2%3B&=Enter&=Y&=U&=I&=O&=P&=%C2%A8%0A%5E&=%C2%A3%0A$&_x:0.5%3B&=Delete&=End&=Page%20Down%3B&@=Ctrl&=Q&=S&=D&=F&=G&_x:3%3B&=H&=J&=K&=L&=M&=%25%0A%C3%B9&=%C2%B5%0A*&_x:0.5%3B&=1%0AEnd&=Up&=3%0APgDn&_h:2%3B&=Enter%3B&@=%3E%0A%3C&=W&=X&=C&=V&=B&_w:2%3B&=Space&_w:2%3B&=Space&=N&=%3F%0A,&=.%0A%2F%3B&=%2F%2F%0A%2F:&=%C2%A7%0A!&=Alt%20Gr&_x:0.5%3B&=Left&=Down&=Right)
Keyboard Maintainer: [The QMK Community](https://github.com/qmk)
Hardware Supported: RedDot handwired
Make example for this keyboard (after setting up your build environment):
make handwired/reddot:default
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

@ -1 +0,0 @@
#include "reddot.h"

View file

@ -1,17 +0,0 @@
#pragma once
#include "quantum.h"
#define LAYOUT( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k10, k11, k12, k13, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k30, k31, k32, \
k40, k41, k42, k43, k44, k45, k46, k66, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k50, k51, k52, k53, \
k60, k61, k62, k63, k64, k65, k68, k69, k6A, k6B, k6C, k6D, k6E, k70, k71, k72, \
k80, k81, k82, k83, k84, k85, k86, k88, k89, k8A, k8B, k8C, k8D, k8E, k90, k91, k92, k93 \
) { \
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k10, k11, k12, k13 }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k30, k31, k32, KC_NO }, \
{ k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k50, k51, k52, k53 }, \
{ k60, k61, k62, k63, k64, k65, k66, KC_NO, k68, k69, k6A, k6B, k6C, k6D, k6E, k70, k71, k72, KC_NO }, \
{ k80, k81, k82, k83, k84, k85, k86, KC_NO, k88, k89, k8A, k8B, k8C, k8D, k8E, k90, k91, k92, k93 } \
}

View file

@ -1,17 +0,0 @@
# MCU name
MCU = atmega32u4
# Bootloader selection
BOOTLOADER = caterina
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # 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
NKRO_ENABLE = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output