1
0
Fork 0

Rework as per 9824 (#13898)

This commit is contained in:
Nick Brassel 2021-08-06 08:14:43 +10:00 committed by GitHub
parent bcb6e23387
commit 6aaf3e84e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 7 additions and 7 deletions

View file

@ -0,0 +1,27 @@
/* Copyright 2020 QMK
*
* 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/>.
*/
/*
* This file was auto-generated by:
* `qmk chibios-confmigrate -i keyboards/peiorisboards/ixora/chconf.h -r platforms/chibios/common/configs/chconf.h`
*/
#pragma once
#define CH_CFG_ST_FREQUENCY 10000
#include_next <chconf.h>

View file

@ -0,0 +1,27 @@
#pragma once
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x0C61
#define DEVICE_VER 0x00C6
#define MANUFACTURER PeiorisBoards
#define PRODUCT Ixora Rev1
/* key matrix size */
#define MATRIX_ROWS 1
#define MATRIX_COLS 6
#define MATRIX_ROW_PINS { A0 }
#define MATRIX_COL_PINS { B4, A15, B3, A1, B6, B5 }
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 0
#define LED_NUM_LOCK_PIN A9
#define LED_CAPS_LOCK_PIN A10
#define LED_SCROLL_LOCK_PIN A8

View file

@ -0,0 +1,37 @@
/* Copyright 2020 QMK
*
* 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/>.
*/
/*
* This file was auto-generated by:
* `qmk chibios-confmigrate -i keyboards/peiorisboards/ixora/halconf.h -r platforms/chibios/common/configs/halconf.h`
*/
#pragma once
#define HAL_USE_SERIAL_USB TRUE
#define ADC_USE_WAIT FALSE
#define ADC_USE_MUTUAL_EXCLUSION FALSE
#define SERIAL_USB_BUFFERS_SIZE 256
#define SPI_USE_WAIT FALSE
#define SPI_USE_MUTUAL_EXCLUSION FALSE
#include_next <halconf.h>

View file

@ -0,0 +1,21 @@
{
"keyboard_name": "Ixora",
"url": "",
"maintainer": "Peioris",
"width": 3,
"height": 2,
"layouts": {
"LAYOUT_full": {
"layout": [{"label":"1", "x":0, "y":0}, {"label":"2", "x":1, "y":0}, {"label":"3", "x":2, "y":0}, {"label":"Caps Lock", "x":0, "y":1}, {"label":"Num Lock", "x":1, "y":1}, {"label":"Scroll Lock", "x":2, "y":1}]
},
"LAYOUT_blocker_right": {
"layout": [{"label":"1", "x":0, "y":0}, {"label":"2", "x":1, "y":0}, {"label":"Caps Lock", "x":0, "y":1}, {"label":"Num Lock", "x":1, "y":1}, {"label":"Scroll Lock", "x":2, "y":1}]
},
"LAYOUT_blocker_left": {
"layout": [{"label":"2", "x":1, "y":0}, {"label":"3", "x":2, "y":0}, {"label":"Caps Lock", "x":0, "y":1}, {"label":"Num Lock", "x":1, "y":1}, {"label":"Scroll Lock", "x":2, "y":1}]
},
"LAYOUT_arrows": {
"layout": [{"label":"\u2191", "x":1, "y":0}, {"label":"\u2190", "x":0, "y":1}, {"label":"\u2193", "x":1, "y":1}, {"label":"\u2192", "x":2, "y":1}]
}
}
}

View file

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

View file

@ -0,0 +1,40 @@
#pragma once
#define XXX KC_NO
#include "quantum.h"
// This a shortcut to help you visually see your layout.
#define LAYOUT_full( \
K00, K01, K02, \
K03, K04, K05 \
) \
{ \
{ K00, K01, K02, K03, K04, K05 } \
}
#define LAYOUT_blocker_right( \
K00, K01, \
K03, K04, K05 \
) \
{ \
{ K00, K01, XXX, K03, K04, K05 } \
}
#define LAYOUT_blocker_left( \
K01, K02, \
K03, K04, K05 \
) \
{ \
{ XXX, K01, K02, K03, K04, K05 } \
}
#define LAYOUT_arrows( \
K01, \
K03, K04, K05 \
) \
{ \
{ XXX, K01, XXX, K03, K04, K05 } \
}

View file

@ -0,0 +1,42 @@
/* Copyright 2018 Peioris
*
* 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] = {
/* Keymap _BL: (Base Layer) Default Layer
* ,-----------------.
* |RESET| 2 | 3 |
* |-----------------|
* |Caps |NmLk |ScLk |
* `-----------------'
*/
[0] = LAYOUT_full(
RESET, KC_2, KC_3,
KC_CAPS, KC_NLCK, KC_SLCK)
};
void matrix_init_user(void) {
//user initialization
}
void matrix_scan_user(void) {
//user matrix
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}

View file

@ -0,0 +1,26 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Keymap _BL: (Base Layer) Default Layer
* ,-----------------.
* |RESET| 2 | 3 |
* |-----------------|
* |Caps |NmLk |ScLk |
* `-----------------'
*/
[0] = LAYOUT_full(
KC_PSCR, KC_MUTE, LGUI(KC_1),
KC_MPRV, KC_MPLY, KC_MNXT)
};
void matrix_init_user(void) {
//user initialization
}
void matrix_scan_user(void) {
//user matrix
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}

View file

@ -0,0 +1,22 @@
Ixora
=========
[Ixora](https://i.imgur.com/GqDk3XY.png)
Ixora is an ARM-powered 6-key macropad with a USB connector, hotswap sockets, and indicator LEDs.
Keyboard Maintainer: [Coarse](https://github.com/coarse)
Hardware Supported: Ixora PCB
Hardware Availability: [Coarse](https://github.com/coarse)
Make example for this keyboard (after setting up your build environment):
make coarse/ixora:default
See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
#### Developer's Note
STM32F042xx chips does not allow jumping to bootloader without BOOT0 being set to high, therefore it is impossible to enter the bootloader from sending a `RESET` keycode nor using bootmagic or bootmagic lite.
The only way to enter bootloader is to hold the BOOT0 button while the keyboard is powering up or after a power reset (done by pressing the reset switch or sending a `RESET` keycode).

View file

@ -0,0 +1,21 @@
# MCU name
MCU = STM32F042
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options
# comment out to disable the options.
#
BACKLIGHT_ENABLE = no
BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
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 = yes # USB Nkey Rollover
NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE