[Keyboard] RS60 Rev2 change to eeprom emulation (#18201)

by xelus
This commit is contained in:
Xelus22 2022-09-04 01:27:00 +10:00 committed by GitHub
parent 0c76a3c7d0
commit 489b287e1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 168 additions and 28 deletions

View file

@ -1,5 +1,5 @@
{ {
"usb": { "usb": {
"device_version": "0.0.1" "device_version": "0.1.0"
} }
} }

View file

@ -1,5 +0,0 @@
{
"usb": {
"device_version": "0.0.2"
}
}

View file

@ -0,0 +1,5 @@
{
"usb": {
"device_version": "0.2.0"
}
}

View file

@ -0,0 +1,20 @@
# RS60 Rev2 Prototype Version
60% PCB with daughterboard in collaboration with Bisoromi and Mekibo
* Keyboard Maintainer: [Xelus22](https://github.com/Xelus22)
* Hardware Supported: RS60
* Hardware Availability: Custom Keyboard Group Buys
Make example for this keyboard (after setting up your build environment):
make xelus/rs60/rev2_0:default
make xelus/rs60/rev2_0:via
Reset your keyboard in 3 ways:
* Software reset on Fn [MO(1)] + Backspace
* Bootmagic reset: hold down the top left key (usually escape) and plugin the keyboard
* Physical reset button: on the back of the PCB, there should be a small golden button you can press
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,4 +1,4 @@
/* Copyright 2021 Harrison Chan (Xelus) /* Copyright 2022 Harrison Chan (Xelus)
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -13,4 +13,4 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "rev2.h" #include "rev2_0.h"

View file

@ -1,4 +1,4 @@
/* Copyright 2021 Harrison Chan (Xelus) /* Copyright 2022 Harrison Chan (Xelus)
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by

View file

@ -17,7 +17,6 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output AUDIO_ENABLE = no # Audio output
EEPROM_DRIVER = i2c EEPROM_DRIVER = i2c
# Save hid interface # Save hid interface

View file

@ -0,0 +1,45 @@
/* Copyright 2022 Harrison Chan (Xelus)
*
* 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
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
#define MATRIX_ROW_PINS { B15, B14, B12, B1, B0 }
#define MATRIX_COL_PINS { B13, A7, A6, A5, A4, A3, A2, B7, B6, B5, B4, B3, A15, A14 }
// COL2ROW or ROW2COL
#define DIODE_DIRECTION COL2ROW
// Set 0 if debouncing isn't needed
#define DEBOUNCE 5
// 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
//Indicator
#define LED_CAPS_LOCK_PIN A1
// Emulated EEPROM
#define WEAR_LEVELING_LOGICAL_SIZE 2048
#define WEAR_LEVELING_BACKING_SIZE WEAR_LEVELING_LOGICAL_SIZE*2
//Force NKRO
#define FORCE_NKRO

View file

@ -0,0 +1,5 @@
{
"usb": {
"device_version": "0.2.1"
}
}

View file

@ -0,0 +1,20 @@
# RS60 Rev2 Production Version
60% PCB with daughterboard in collaboration with Bisoromi and Mekibo
* Keyboard Maintainer: [Xelus22](https://github.com/Xelus22)
* Hardware Supported: RS60
* Hardware Availability: Custom Keyboard Group Buys
Make example for this keyboard (after setting up your build environment):
make xelus/rs60/rev2_1:default
make xelus/rs60/rev2_1:via
Reset your keyboard in 3 ways:
* Software reset on Fn [MO(1)] + Backspace
* Bootmagic reset: hold down the top left key (usually escape) and plugin the keyboard
* Physical reset button: on the back of the PCB, there should be a small golden button you can press
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,4 +1,4 @@
/* Copyright 2022 QMK /* Copyright 2022 Harrison Chan (Xelus)
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -13,18 +13,4 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "rev2_1.h"
/*
* This file was auto-generated by:
* `qmk chibios-confmigrate -i keyboards/acheron/austin/chconf.h -r platforms/chibios/common/configs/chconf.h`
*/
#pragma once
#define CH_CFG_ST_FREQUENCY 10000
#define CH_CFG_OPTIMIZE_SPEED FALSE
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
#include_next <chconf.h>

View file

@ -0,0 +1,34 @@
/* Copyright 2022 Harrison Chan (Xelus)
*
* 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"
#define XXX KC_NO
#define LAYOUT_60_ansi_split_bs_rshift( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3B, K3C, K3D, \
K40, K41, K42, K45, K49, K4A, K4C, K4D \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, XXX, K3B, K3C, K3D }, \
{ K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, XXX, K4C, K4D } \
}

View file

@ -0,0 +1,29 @@
# MCU name
MCU = STM32L412
# Bootloader selection
BOOTLOADER = stm32-dfu
# 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 = yes # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
EEPROM_DRIVER = wear_leveling
WEAR_LEVELING_DRIVER = embedded_flash
# Save hid interface
KEYBOARD_SHARED_EP = yes
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
LAYOUTS = 60_ansi_split_bs_rshift

View file

@ -19,6 +19,8 @@
#if defined(KEYBOARD_xelus_rs60_rev1) #if defined(KEYBOARD_xelus_rs60_rev1)
#include "rev1.h" #include "rev1.h"
#elif defined(KEYBOARD_xelus_rs60_rev2) #elif defined(KEYBOARD_xelus_rs60_rev2_0)
#include "rev2.h" #include "rev2_0.h"
#elif defined(KEYBOARD_xelus_rs60_rev2_1)
#include "rev2_1.h"
#endif #endif