Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kinesis80 #16678

Closed
wants to merge 35 commits into from
Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
889eb8e
info.json, readme
DmNosachev Mar 17, 2022
e8ebc81
cr dates
DmNosachev Mar 17, 2022
db8dce4
clean up
DmNosachev Mar 17, 2022
ce1cbe8
Update keyboards/kinesis80/blackpill103/blackpill103.h
DmNosachev Mar 18, 2022
17bff5e
Update keyboards/kinesis80/blackpill401/blackpill401.h
DmNosachev Mar 18, 2022
341ad1a
Update keyboards/kinesis80/blackpill411/blackpill411.h
DmNosachev Mar 18, 2022
ca317b9
Update keyboards/kinesis80/config.h
DmNosachev Mar 18, 2022
406dc55
Update keyboards/kinesis80/keymaps/andrew/keymap.c
DmNosachev Mar 18, 2022
a17637b
Update keyboards/kinesis80/keymaps/default/keymap.c
DmNosachev Mar 18, 2022
344eee9
changes requested by reviewers
DmNosachev Mar 18, 2022
ee81925
rename to kin80
DmNosachev Mar 18, 2022
efd201a
added encoder support to quart64 keymap
DmNosachev Mar 23, 2022
05d35d3
Update keyboards/kin80/blackpill103/config.h
DmNosachev Mar 24, 2022
c43a533
Update keyboards/kin80/blackpill103/blackpill103.c
DmNosachev Mar 24, 2022
fb274e3
Update keyboards/kin80/keymaps/quartz64/keymap.c
DmNosachev Mar 24, 2022
06e04f3
Update keyboards/kin80/keymaps/default/keymap.c
DmNosachev Mar 24, 2022
28994d8
Update keyboards/kin80/keymaps/quartz64/keymap.c
DmNosachev Mar 24, 2022
158dead
Update keyboards/kin80/rules.mk
DmNosachev Mar 24, 2022
ddcc2b7
Update keyboards/kin80/blackpill103/rules.mk
DmNosachev Mar 24, 2022
3de0b70
Update keyboards/kin80/blackpill411/rules.mk
DmNosachev Mar 24, 2022
1de4b2b
Update keyboards/kin80/keymaps/andrew/keymap.c
DmNosachev Mar 24, 2022
94638e0
Update keyboards/kin80/keymaps/roman/keymap.c
DmNosachev Mar 24, 2022
e63f6b4
Update keyboards/kin80/keymaps/maxim/keymap.c
DmNosachev Mar 24, 2022
2427e08
Update keyboards/kin80/keymaps/maxim/keymap.c
DmNosachev Mar 24, 2022
91be075
updated Readme
DmNosachev Mar 24, 2022
6f2e67c
LED pin naming
DmNosachev Mar 24, 2022
16e31a0
Renamed PCB repo
DmNosachev Mar 25, 2022
fedf3ad
LED config
DmNosachev Mar 25, 2022
40173c0
Update keyboards/kin80/keymaps/debug/rules.mk
DmNosachev Mar 28, 2022
c4be944
Update keyboards/kin80/keymaps/maxim/keymap.c
DmNosachev Mar 28, 2022
ca5a480
Update keyboards/kin80/keymaps/quartz64/keymap.c
DmNosachev Mar 28, 2022
912da0b
Update keyboards/kin80/micro/rules.mk
DmNosachev Mar 28, 2022
a6d4c2f
Update keyboards/kin80/readme.md
DmNosachev Mar 28, 2022
58bd77a
Update keyboards/kin80/blackpill103/blackpill103.c
DmNosachev Mar 28, 2022
58a2505
Update keyboards/kin80/blackpill401/rules.mk
DmNosachev Mar 28, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions keyboards/kinesis80/blackpill103/blackpill103.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/* Copyright 2022 DmNosachev
*
* 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 "blackpill103.h"

void matrix_init_kb(void) {
/* Disable JTAG (PB3, PA15) */
//AFIO->MAPR |= AFIO_MAPR_SWJ_CFG_JTAGDISABLE;

/* LED pins setup */
setPinOutput(NUM_LOCK_LED_PIN);
setPinOutput(CAPS_LOCK_LED_PIN);
setPinOutput(SCROLL_LOCK_LED_PIN);
setPinOutput(LED4_PIN);

writePinLow(NUM_LOCK_LED_PIN);
writePinLow(CAPS_LOCK_LED_PIN);
writePinLow(SCROLL_LOCK_LED_PIN);
writePinLow(LED4_PIN);

matrix_init_user();
}

bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if(res) {
writePin(NUM_LOCK_LED_PIN, led_state.num_lock);
writePin(CAPS_LOCK_LED_PIN, led_state.caps_lock);
writePin(SCROLL_LOCK_LED_PIN, led_state.scroll_lock);
}
return res;
}
19 changes: 19 additions & 0 deletions keyboards/kinesis80/blackpill103/blackpill103.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/* Copyright 2022 DmNosachev
*
* 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 "../kinesis80.h"
DmNosachev marked this conversation as resolved.
Show resolved Hide resolved
28 changes: 28 additions & 0 deletions keyboards/kinesis80/blackpill103/chconf.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/* 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/handwired/onekey/bluepill/chconf.h -r platforms/chibios/common/configs/chconf.h`
*/

#pragma once

#define CH_CFG_ST_TIMEDELTA 0

#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE

#include_next <chconf.h>
34 changes: 34 additions & 0 deletions keyboards/kinesis80/blackpill103/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
Copyright 2022 DmNosachev

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

#define DEVICE_VER 0x0002

#undef MATRIX_ROW_PINS
#undef MATRIX_COL_PINS

//v.1.0
//#define MATRIX_ROW_PINS { B8, B9, C13, B7, B6, B4, B3 }
//v.1.1
#define MATRIX_ROW_PINS { B8, B9, C13, B7, B6, B5, B4 }
#define MATRIX_COL_PINS { A6, A7, B0, B1, B10, B11, A0, A1, A2, A3, A4, A5 }

#define NUM_LOCK_LED_PIN B14
#define CAPS_LOCK_LED_PIN B13
#define SCROLL_LOCK_LED_PIN B15
#define LED4_PIN A8
26 changes: 26 additions & 0 deletions keyboards/kinesis80/blackpill103/halconf.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/* 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/handwired/onekey/bluepill/halconf.h -r platforms/chibios/common/configs/halconf.h`
*/

#pragma once

#define HAL_USE_PWM TRUE

#include_next <halconf.h>
30 changes: 30 additions & 0 deletions keyboards/kinesis80/blackpill103/mcuconf.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/* 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/handwired/onekey/bluepill/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
*/

#pragma once

#include_next <mcuconf.h>

#undef STM32_PWM_USE_TIM2
#define STM32_PWM_USE_TIM2 TRUE

#undef STM32_SPI_USE_SPI2
#define STM32_SPI_USE_SPI2 FALSE
10 changes: 10 additions & 0 deletions keyboards/kinesis80/blackpill103/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# MCU name
MCU = STM32F103

# Bootloader selection
BOOTLOADER = stm32duino

# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

FIRMWARE_FORMAT = bin
43 changes: 43 additions & 0 deletions keyboards/kinesis80/blackpill401/blackpill401.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/* Copyright 2022 DmNosachev
*
* 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 "blackpill401.h"

void matrix_init_kb(void) {

/* LED pins setup */
setPinOutput(NUM_LOCK_LED_PIN);
setPinOutput(CAPS_LOCK_LED_PIN);
setPinOutput(SCROLL_LOCK_LED_PIN);
setPinOutput(LED4_PIN);

writePinHigh(NUM_LOCK_LED_PIN);
writePinHigh(CAPS_LOCK_LED_PIN);
writePinHigh(SCROLL_LOCK_LED_PIN);
writePinHigh(LED4_PIN);

matrix_init_user();
}

bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if(res) {
writePin(NUM_LOCK_LED_PIN, !led_state.num_lock);
writePin(CAPS_LOCK_LED_PIN, !led_state.caps_lock);
writePin(SCROLL_LOCK_LED_PIN, !led_state.scroll_lock);
}
return res;
}
19 changes: 19 additions & 0 deletions keyboards/kinesis80/blackpill401/blackpill401.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/* Copyright 2022 DmNosachev
*
* 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 "../kinesis80.h"
DmNosachev marked this conversation as resolved.
Show resolved Hide resolved
38 changes: 38 additions & 0 deletions keyboards/kinesis80/blackpill401/chconf.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/* 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/handwired/onekey/blackpill_f401/chconf.h -r platforms/chibios/common/configs/chconf.h`
*/

#pragma once

#define CH_CFG_ST_FREQUENCY 10000

#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE

#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE

#define CH_CFG_FACTORY_SEMAPHORES TRUE

#define CH_CFG_FACTORY_MAILBOXES TRUE

#define CH_CFG_FACTORY_OBJ_FIFOS TRUE

#define CH_CFG_FACTORY_PIPES TRUE

#include_next <chconf.h>
31 changes: 31 additions & 0 deletions keyboards/kinesis80/blackpill401/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*
Copyright 2022 DmNosachev

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

#define DEVICE_VER 0x0003

#undef MATRIX_ROW_PINS
#undef MATRIX_COL_PINS

#define MATRIX_ROW_PINS { A4, B12, B13, B14, B15, A8, B5 }
#define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A5, A6, A7, B0, B1, B10 }

#define NUM_LOCK_LED_PIN B4
#define CAPS_LOCK_LED_PIN C13
#define SCROLL_LOCK_LED_PIN B3
#define LED4_PIN A15
28 changes: 28 additions & 0 deletions keyboards/kinesis80/blackpill401/halconf.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/* 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/handwired/onekey/blackpill_f401/halconf.h -r platforms/chibios/common/configs/halconf.h`
*/

#pragma once

#define HAL_USE_I2C TRUE

#define HAL_USE_PWM TRUE

#include_next <halconf.h>
25 changes: 25 additions & 0 deletions keyboards/kinesis80/blackpill401/mcuconf.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/* Copyright 2020 Nick Brassel (tzarc)
*
* 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 3 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 <https://www.gnu.org/licenses/>.
*/

#pragma once

#include_next "mcuconf.h"

#undef STM32_I2C_USE_I2C1
#define STM32_I2C_USE_I2C1 TRUE

#undef STM32_PWM_USE_TIM5
#define STM32_PWM_USE_TIM5 TRUE
9 changes: 9 additions & 0 deletions keyboards/kinesis80/blackpill401/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# MCU name
MCU = STM32F401

# Bootloader selection
BOOTLOADER = stm32-dfu

KEYBOARD_SHARED_EP = yes

FIRMWARE_FORMAT = bin
Loading