aboutsummaryrefslogtreecommitdiff
path: root/keyboards/jm60
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2021-01-20 00:35:24 +1100
committerGitHub <noreply@github.com>2021-01-20 00:35:24 +1100
commit19c180ef88168df25a9f6d680143319c79a3cac0 (patch)
tree69d507828c4b56f7d574edee35f9023b6f8c2423 /keyboards/jm60
parentd85b27bbbc6b086db469570cf741b515695dd816 (diff)
downloadqmk_firmware-19c180ef88168df25a9f6d680143319c79a3cac0.tar.gz
qmk_firmware-19c180ef88168df25a9f6d680143319c79a3cac0.zip
ChibiOS conf migrations... take 10 (#11617)
* ChibiOS conf upgrade for akegata_denki/device_one akegata_denki/device_one - 0d9f891416decbbb533c6c1147632ef7c55a2d9f * ChibiOS conf upgrade for chavdai40 chavdai40/rev1 - 06bca6ec34948c8005e73254299488cdba3429f8 chavdai40/rev2 - f55650a8d7aa755eb72564e95a144910dd902a73 * ChibiOS conf upgrade for ergodox_stm32 ergodox_stm32 - 04433b80e4cd231c15163ace77428db72b5483ad * ChibiOS conf upgrade for jm60 jm60 - a127e6cfccad74ed1a9e47e9213dc41cf0d26f1d * ChibiOS conf upgrade for matrix/m20add matrix/m20add - e2e556dad666ed9b1eea09e46d0eb14e19bda8b8 * ChibiOS conf upgrade for matrix/noah matrix/noah - c6fd3caf0b7d444085283d4f0a9204ab283d5202
Diffstat (limited to 'keyboards/jm60')
-rw-r--r--keyboards/jm60/board.h37
-rw-r--r--keyboards/jm60/boards/JM60_BOARD/board.c49
-rw-r--r--keyboards/jm60/boards/JM60_BOARD/board.h142
-rw-r--r--keyboards/jm60/boards/JM60_BOARD/board.mk5
-rw-r--r--keyboards/jm60/rules.mk2
5 files changed, 38 insertions, 197 deletions
diff --git a/keyboards/jm60/board.h b/keyboards/jm60/board.h
new file mode 100644
index 000000000..23f949578
--- /dev/null
+++ b/keyboards/jm60/board.h
@@ -0,0 +1,37 @@
1/*
2Copyright 2021 QMK
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#include_next <board.h>
19
20#ifdef STM32_LSECLK
21#undef STM32_LSECLK
22#endif // STM32_LSECLK
23#define STM32_LSECLK 32768
24
25#ifdef STM32_HSECLK
26#undef STM32_HSECLK
27#endif // STM32_HSECLK
28#define STM32_HSECLK 8000000
29
30#undef VAL_GPIOACRL
31#define VAL_GPIOACRL 0x88888888
32
33#undef VAL_GPIOAODR
34#define VAL_GPIOAODR 0xFFFFFFFF
35
36#undef VAL_GPIOCCRH
37#define VAL_GPIOCCRH 0x88888888
diff --git a/keyboards/jm60/boards/JM60_BOARD/board.c b/keyboards/jm60/boards/JM60_BOARD/board.c
deleted file mode 100644
index 41a603b95..000000000
--- a/keyboards/jm60/boards/JM60_BOARD/board.c
+++ /dev/null
@@ -1,49 +0,0 @@
1/*
2 ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
3
4 Licensed under the Apache License, Version 2.0 (the "License");
5 you may not use this file except in compliance with the License.
6 You may obtain a copy of the License at
7
8 http://www.apache.org/licenses/LICENSE-2.0
9
10 Unless required by applicable law or agreed to in writing, software
11 distributed under the License is distributed on an "AS IS" BASIS,
12 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 See the License for the specific language governing permissions and
14 limitations under the License.
15*/
16
17#include <hal.h>
18
19/**
20 * @brief PAL setup.
21 * @details Digital I/O ports static configuration as defined in @p board.h.
22 * This variable is used by the HAL when initializing the PAL driver.
23 */
24#if HAL_USE_PAL || defined(__DOXYGEN__)
25const PALConfig pal_default_config =
26{
27 {VAL_GPIOAODR, VAL_GPIOACRL, VAL_GPIOACRH},
28 {VAL_GPIOBODR, VAL_GPIOBCRL, VAL_GPIOBCRH},
29 {VAL_GPIOCODR, VAL_GPIOCCRL, VAL_GPIOCCRH},
30 {VAL_GPIODODR, VAL_GPIODCRL, VAL_GPIODCRH},
31 {VAL_GPIOEODR, VAL_GPIOECRL, VAL_GPIOECRH},
32};
33#endif
34
35/*
36 * Early initialization code.
37 * This initialization must be performed just after stack setup and before
38 * any other initialization.
39 */
40void __early_init(void) {
41
42 stm32_clock_init();
43}
44
45/*
46 * Board-specific initialization code.
47 */
48void boardInit(void) {
49}
diff --git a/keyboards/jm60/boards/JM60_BOARD/board.h b/keyboards/jm60/boards/JM60_BOARD/board.h
deleted file mode 100644
index 74815122c..000000000
--- a/keyboards/jm60/boards/JM60_BOARD/board.h
+++ /dev/null
@@ -1,142 +0,0 @@
1/*
2 ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
3
4 Licensed under the Apache License, Version 2.0 (the "License");
5 you may not use this file except in compliance with the License.
6 You may obtain a copy of the License at
7
8 http://www.apache.org/licenses/LICENSE-2.0
9
10 Unless required by applicable law or agreed to in writing, software
11 distributed under the License is distributed on an "AS IS" BASIS,
12 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 See the License for the specific language governing permissions and
14 limitations under the License.
15*/
16
17#ifndef _BOARD_H_
18#define _BOARD_H_
19
20/*
21 * Board identifier.
22 */
23#define BOARD_JM60
24#define BOARD_NAME "JM60 keyboard"
25
26/*
27 * Board frequencies.
28 */
29#define STM32_LSECLK 32768
30#define STM32_HSECLK 8000000
31
32/*
33 * MCU type, supported types are defined in ./os/hal/platforms/hal_lld.h.
34 *
35 * Only xB (128KB Flash) is defined, but it's identical to the
36 * x8 version (64KB Flash) except for the Flash region size in the
37 * linker script. For x8 parts use xB here and change to the x8 linker
38 * script in the project Makefile.
39 */
40#define STM32F103xB
41
42/*
43 * IO pins assignments
44 *
45 * numbering is sorted by onboard/connectors, as from the schematics in
46 * http://www.vcc-gnd.com/read.php?tid=369
47 */
48
49/* on-board */
50#define GPIOA_USBDM 11 // pin 8
51#define GPIOA_USBDP 12 // pin 9
52
53#define GPIOC_OSC32_IN 14
54#define GPIOC_OSC32_OUT 15
55
56/*
57 * I/O ports initial setup, this configuration is established soon after reset
58 * in the initialization code.
59 *
60 * The digits have the following meaning:
61 * 0 - Analog input.
62 * 1 - Push Pull output 10MHz.
63 * 2 - Push Pull output 2MHz.
64 * 3 - Push Pull output 50MHz.
65 * 4 - Digital input.
66 * 5 - Open Drain output 10MHz.
67 * 6 - Open Drain output 2MHz.
68 * 7 - Open Drain output 50MHz.
69 * 8 - Digital input with PullUp or PullDown resistor depending on ODR.
70 * 9 - Alternate Push Pull output 10MHz.
71 * A - Alternate Push Pull output 2MHz.
72 * B - Alternate Push Pull output 50MHz.
73 * C - Reserved.
74 * D - Alternate Open Drain output 10MHz.
75 * E - Alternate Open Drain output 2MHz.
76 * F - Alternate Open Drain output 50MHz.
77 * Please refer to the STM32 Reference Manual for details.
78 */
79
80/*
81 * Port A setup.
82 * Everything input with pull-up except:
83 */
84#define VAL_GPIOACRL 0x88888888 /* PA7...PA0 */
85#define VAL_GPIOACRH 0x88888888 /* PA15...PA8 */
86#define VAL_GPIOAODR 0xFFFFFFFF
87
88/*
89 * Port B setup.
90 * Everything input with pull-up except:
91 */
92#define VAL_GPIOBCRL 0x88888888 /* PB7...PB0 */
93#define VAL_GPIOBCRH 0x88888888 /* PB15...PB8 */
94#define VAL_GPIOBODR 0xFFFFFFFF
95
96/*
97 * Port C setup.
98 * Everything input with pull-up except:
99 */
100#define VAL_GPIOCCRL 0x88888888 /* PC7...PC0 */
101#define VAL_GPIOCCRH 0x88888888 /* PC15...PC8 */
102#define VAL_GPIOCODR 0xFFFFFFFF
103
104/*
105 * Port D setup.
106 * Everything input with pull-up except:
107 * PD0 - Normal input (XTAL).
108 * PD1 - Normal input (XTAL).
109 */
110#define VAL_GPIODCRL 0x88888844 /* PD7...PD0 */
111#define VAL_GPIODCRH 0x88888888 /* PD15...PD8 */
112#define VAL_GPIODODR 0xFFFFFFFF
113
114/*
115 * Port E setup.
116 * Everything input with pull-up except:
117 */
118#define VAL_GPIOECRL 0x88888888 /* PE7...PE0 */
119#define VAL_GPIOECRH 0x88888888 /* PE15...PE8 */
120#define VAL_GPIOEODR 0xFFFFFFFF
121
122/*
123 * USB bus activation macro, required by the USB driver.
124 */
125#define usb_lld_connect_bus(usbp) /* always connected */
126
127/*
128 * USB bus de-activation macro, required by the USB driver.
129 */
130#define usb_lld_disconnect_bus(usbp) /* always connected */
131
132#if !defined(_FROM_ASM_)
133#ifdef __cplusplus
134extern "C" {
135#endif
136 void boardInit(void);
137#ifdef __cplusplus
138}
139#endif
140#endif /* _FROM_ASM_ */
141
142#endif /* _BOARD_H_ */
diff --git a/keyboards/jm60/boards/JM60_BOARD/board.mk b/keyboards/jm60/boards/JM60_BOARD/board.mk
deleted file mode 100644
index e2f051c31..000000000
--- a/keyboards/jm60/boards/JM60_BOARD/board.mk
+++ /dev/null
@@ -1,5 +0,0 @@
1# List of all the board related files.
2BOARDSRC = $(BOARD_PATH)/boards/JM60_BOARD/board.c
3
4# Required include directories
5BOARDINC = $(BOARD_PATH)/boards/JM60_BOARD
diff --git a/keyboards/jm60/rules.mk b/keyboards/jm60/rules.mk
index 5992cc055..6aa824bae 100644
--- a/keyboards/jm60/rules.mk
+++ b/keyboards/jm60/rules.mk
@@ -2,7 +2,7 @@
2MCU = STM32F103 2MCU = STM32F103
3 3
4MCU_LDSCRIPT = jm60_bootloader 4MCU_LDSCRIPT = jm60_bootloader
5BOARD = JM60_BOARD 5BOARD = ST_NUCLEO64_F103RB
6 6
7# Build Options 7# Build Options
8# change yes to no to disable 8# change yes to no to disable
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-19 11:03:10 +0000