diff --git a/.gitignore b/.gitignore index a4349a7b7982..6baf7d9787e0 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,8 @@ quantum/version.h !uf2boot_f411_8MHz.bin !uf2boot_f103_8MHz.bin !uf2boot_gd32vf103_8MHz.bin +!uf2boot_air32f103xB_8MHz.bin +!uf2boot_air32f103xC_8MHz.bin # Old-style QMK Makefiles /tmk_core/* diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk index e5c3a64534fa..d6cf3e592cac 100644 --- a/builddefs/common_features.mk +++ b/builddefs/common_features.mk @@ -188,7 +188,7 @@ else ifeq ($(PLATFORM),AVR) # Automatically provided by avr-libc, nothing required else ifeq ($(PLATFORM),CHIBIOS) - ifneq ($(filter STM32F3xx_% STM32F1xx_% STM32F4xx_% STM32L4xx_% GD32VF103_% CM32M101A_% AIR32F103_% %_STM32F401xC %_STM32F401xE %_STM32F405xG %_STM32F411xE %_STM32F072xB %_STM32F042x6 %_GD32VF103xB %_GD32VF103x8 ,$(MCU_SERIES)_$(MCU_LDSCRIPT)),) + ifneq ($(filter STM32F3xx_% STM32F1xx_% STM32F4xx_% STM32L4xx_% GD32VF103_% CM32M101A_% AIR32F10x_% %_STM32F401xC %_STM32F401xE %_STM32F405xG %_STM32F411xE %_STM32F072xB %_STM32F042x6 %_GD32VF103xB %_GD32VF103x8 ,$(MCU_SERIES)_$(MCU_LDSCRIPT)),) # Emulated EEPROM OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_FLASH_EMULATED COMMON_VPATH += $(DRIVER_PATH)/eeprom @@ -517,12 +517,13 @@ ifeq ($(strip $(WS2812_DRIVER_REQUIRED)), yes) ifeq ($(strip $(WS2812_DRIVER)), bitbang) SRC += ws2812.c else - SRC += ws2812_$(strip $(WS2812_DRIVER)).c + SRC += ws2812_$(strip $(WS2812_DRIVER)).c ifeq ($(strip $(PLATFORM)), CHIBIOS) ifeq ($(strip $(WS2812_DRIVER)), pwm) OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE OPT_DEFS += -DGD32_DMA_REQUIRED=TRUE + OPT_DEFS += -DAIR32_DMA_REQUIRED=TRUE endif endif endif diff --git a/keyboards/zhaqian/Jane_v2_ce_slot/Jane_v2_ce-slot_via.json b/keyboards/zhaqian/Jane_v2_ce_slot/Jane_v2_ce-slot_via.json new file mode 100644 index 000000000000..a0b9ef26a0d3 --- /dev/null +++ b/keyboards/zhaqian/Jane_v2_ce_slot/Jane_v2_ce-slot_via.json @@ -0,0 +1,230 @@ +{ + "name": "Jane_v2_ce-slot", + "vendorId": "0x00AA", + "productId": "0xAA17", + "lighting": "none", + "matrix": { + "rows": 6, + "cols": 17 + }, + "layouts": { + "labels": [ + "ISO Enter", + ["Bottom Row", "ANSI", "7U"] + ], + "keymap": [ + [ + "0,0", + { + "x": 0.25 + }, + "0,1", + "0,2", + "0,3", + "0,4", + { + "x": 0.25 + }, + "0,5", + "0,6", + "0,7", + "0,8", + { + "x": 0.25 + }, + "0,9", + "0,10", + "0,11", + "0,12", + { + "x": 0.25 + }, + "0,13", + { + "x": 0.25 + }, + "0,14", + "0,15", + "0,16" + ], + [ + { + "y": 0.5 + }, + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "w": 2 + }, + "1,13", + { + "x": 0.25 + }, + "1,14", + "1,15", + "1,16" + ], + [ + { + "w": 1.5 + }, + "2,0", + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + "2,12", + { + "w": 1.5 + }, + "2,13\n\n\n0,0", + { + "x": 0.25 + }, + "2,14", + "2,15", + "2,16", + { + "x": 1, + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "3,13\n\n\n0,1" + ], + [ + { + "w": 1.75 + }, + "3,0", + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + { + "w": 2.25 + }, + "3,13\n\n\n0,0", + { + "x": 3.25 + }, + "2,13\n\n\n0,1" + ], + [ + { + "w": 2.25 + }, + "4,0", + "4,1", + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "4,9", + "4,10", + { + "w": 2.75 + }, + "4,12", + { + "x": 1.25 + }, + "4,15" + ], + [ + { + "w": 1.25 + }, + "5,0\n\n\n1,0", + { + "w": 1.25 + }, + "5,1\n\n\n1,0", + { + "w": 1.25 + }, + "5,2\n\n\n1,0", + { + "w": 6.25 + }, + "5,6\n\n\n1,0", + { + "w": 1.25 + }, + "5,10\n\n\n1,0", + { + "w": 1.25 + }, + "5,11\n\n\n1,0", + { + "w": 1.25 + }, + "5,12\n\n\n1,0", + { + "w": 1.25 + }, + "5,13\n\n\n1,0", + { + "x": 0.25 + }, + "5,14", + "5,15", + "5,16" + ], + [ + { + "w": 1.5 + }, + "5,0\n\n\n1,1", + "5,1\n\n\n1,1", + { + "w": 1.5 + }, + "5,2\n\n\n1,1", + { + "w": 7 + }, + "5,6\n\n\n1,1", + { + "w": 1.5 + }, + "5,10\n\n\n1,1", + "5,12\n\n\n1,1", + { + "w": 1.5 + }, + "5,13\n\n\n1,1" + ] + ] + } + } diff --git a/keyboards/zhaqian/Jane_v2_ce_slot/Jane_v2_ce_slot.c b/keyboards/zhaqian/Jane_v2_ce_slot/Jane_v2_ce_slot.c new file mode 100644 index 000000000000..e03fc758283a --- /dev/null +++ b/keyboards/zhaqian/Jane_v2_ce_slot/Jane_v2_ce_slot.c @@ -0,0 +1,18 @@ +/* Copyright 2022 ZhaQian + * + * 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 . + */ + +#include "Jane_v2_ce_slot.h" + diff --git a/keyboards/zhaqian/Jane_v2_ce_slot/Jane_v2_ce_slot.h b/keyboards/zhaqian/Jane_v2_ce_slot/Jane_v2_ce_slot.h new file mode 100644 index 000000000000..0d4d40cfe8ee --- /dev/null +++ b/keyboards/zhaqian/Jane_v2_ce_slot/Jane_v2_ce_slot.h @@ -0,0 +1,35 @@ +/* Copyright 2022 ZhaQian + * + * 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 . + */ + +#pragma once + +#include "quantum.h" + +#define LAYOUT( \ + K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, \ + K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \ + K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, \ + K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, \ + K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K412, K415, \ + K500, K501, K502, K506, K510, K511, K512, K513, K514, K515, K516 \ +) { \ + { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016 }, \ + { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116 }, \ + { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216 }, \ + { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, KC_NO, KC_NO, KC_NO }, \ + { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, KC_NO, K412, KC_NO, KC_NO, K415, KC_NO }, \ + { K500, K501, K502, KC_NO, KC_NO, KC_NO, K506, KC_NO, KC_NO, KC_NO, K510, K511, K512, K513, K514, K515, K516 } \ +} diff --git a/keyboards/zhaqian/Jane_v2_ce_slot/config.h b/keyboards/zhaqian/Jane_v2_ce_slot/config.h new file mode 100644 index 000000000000..7e2cca65df45 --- /dev/null +++ b/keyboards/zhaqian/Jane_v2_ce_slot/config.h @@ -0,0 +1,43 @@ +/* Copyright 2022 ZhaQian + * + * 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 . + */ + +#pragma once + +#include "config_common.h" + +#define VENDOR_ID 0x00AA +#define PRODUCT_ID 0xAA17 +#define DEVICE_VER 0x0001 +#define MANUFACTURER ZhaQian +#define PRODUCT Jane_v2_ce_slot + +#define MATRIX_ROWS 6 +#define MATRIX_COLS 17 + +#define MATRIX_ROW_PINS { B0, B1, B2, B3, D7, F0 } +#define MATRIX_COL_PINS { D0, D6, D4, D5, D3, D2, D1, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1 } +#define UNUSED_PINS + +#define DIODE_DIRECTION COL2ROW + +#define DEBOUNCE 5 + +#define LOCKING_SUPPORT_ENABLE +#define LOCKING_RESYNC_ENABLE + +// #define QMK_KEYS_PER_SCAN 12 +// #define FORCE_NKRO + diff --git a/keyboards/zhaqian/Jane_v2_ce_slot/keymaps/default/keymap.c b/keyboards/zhaqian/Jane_v2_ce_slot/keymaps/default/keymap.c new file mode 100644 index 000000000000..ce6a1f1a2f1b --- /dev/null +++ b/keyboards/zhaqian/Jane_v2_ce_slot/keymaps/default/keymap.c @@ -0,0 +1,53 @@ +/* Copyright 2022 ZhaQian + * + * 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 . + */ + +#include "Jane_v2_ce_slot.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + LAYOUT( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MO(1), KC_PSCR, KC_SLCK, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_MENU, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + LAYOUT( + RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + +}; diff --git a/keyboards/zhaqian/Jane_v2_ce_slot/keymaps/via/keymap.c b/keyboards/zhaqian/Jane_v2_ce_slot/keymaps/via/keymap.c new file mode 100644 index 000000000000..ce6a1f1a2f1b --- /dev/null +++ b/keyboards/zhaqian/Jane_v2_ce_slot/keymaps/via/keymap.c @@ -0,0 +1,53 @@ +/* Copyright 2022 ZhaQian + * + * 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 . + */ + +#include "Jane_v2_ce_slot.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + LAYOUT( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MO(1), KC_PSCR, KC_SLCK, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_MENU, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + LAYOUT( + RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + +}; diff --git a/keyboards/zhaqian/Jane_v2_ce_slot/keymaps/via/rules.mk b/keyboards/zhaqian/Jane_v2_ce_slot/keymaps/via/rules.mk new file mode 100644 index 000000000000..036bd6d1c3ec --- /dev/null +++ b/keyboards/zhaqian/Jane_v2_ce_slot/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/zhaqian/Jane_v2_ce_slot/readme.md b/keyboards/zhaqian/Jane_v2_ce_slot/readme.md new file mode 100644 index 000000000000..8840da815896 --- /dev/null +++ b/keyboards/zhaqian/Jane_v2_ce_slot/readme.md @@ -0,0 +1,14 @@ +# Jane_v2_ce-slot + +A 80% keyboard. + +* Keyboard Maintainer: [zhaqian](https://github.com/zhaqian12) +* Hardware Supported: Jane_v2_ce_slot +* Hardware Availability: [qmk-zq](https://github.com/zhaqian12/qmk_firmware) + +Make example for this keyboard (after setting up your build environment): + + make zhaqian/Jane_v2_ce_slot:default + make zhaqian/Jane_v2_ce_slot:via + +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). diff --git a/keyboards/zhaqian/Jane_v2_ce_slot/rules.mk b/keyboards/zhaqian/Jane_v2_ce_slot/rules.mk new file mode 100644 index 000000000000..9067cbf82720 --- /dev/null +++ b/keyboards/zhaqian/Jane_v2_ce_slot/rules.mk @@ -0,0 +1,19 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +# Build Options +# comment out to disable the options. +# +BOOTMAGIC_ENABLE = yes +MOUSEKEY_ENABLE = yes +EXTRAKEY_ENABLE = yes +CONSOLE_ENABLE = no +COMMAND_ENABLE = no +SLEEP_LED_ENABLE = no +NKRO_ENABLE = yes +RGBLIGHT_ENABLE = no +KEY_LOCK_ENABLE = no + diff --git a/keyboards/zhaqian/Mpad12/config.h b/keyboards/zhaqian/Mpad12/config.h index 82b92305a771..13e4ee9db09d 100644 --- a/keyboards/zhaqian/Mpad12/config.h +++ b/keyboards/zhaqian/Mpad12/config.h @@ -24,7 +24,6 @@ #define DEVICE_VER 0x0001 #define MANUFACTURER ZhaQian #define PRODUCT Mpad12 -#define DESCRIPTION multifunction pad12 /* key matrix size */ #define MATRIX_ROWS 4 diff --git a/keyboards/zhaqian/comb67/config.h b/keyboards/zhaqian/comb67/config.h index 95faaf531d00..8312c4837920 100644 --- a/keyboards/zhaqian/comb67/config.h +++ b/keyboards/zhaqian/comb67/config.h @@ -23,7 +23,6 @@ #define DEVICE_VER 0x0001 #define MANUFACTURER ZhaQian #define PRODUCT Comb67 -#define DESCRIPTION Keyboard #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/zhaqian/gh60/config.h b/keyboards/zhaqian/gh60/config.h index 8e348b513e84..02dfb365fc18 100644 --- a/keyboards/zhaqian/gh60/config.h +++ b/keyboards/zhaqian/gh60/config.h @@ -22,7 +22,7 @@ #define DEVICE_VER 0x0001 #define MANUFACTURER zhaqian #define PRODUCT gh60_example -#define DESCRIPTION Keyboard + /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/zhaqian/osu/config.h b/keyboards/zhaqian/osu/config.h index 207f085b969e..0a0a70fb8fbf 100644 --- a/keyboards/zhaqian/osu/config.h +++ b/keyboards/zhaqian/osu/config.h @@ -23,7 +23,7 @@ #define DEVICE_VER 0x0001 #define MANUFACTURER ZhaQian #define PRODUCT osu -#define DESCRIPTION Keyboard + #define DIRECT_PINS { \ {B12, B13, B14, A15, B3, B4, B5}, \ diff --git a/keyboards/zhaqian/readme.md b/keyboards/zhaqian/readme.md index c52b7c433278..1045011a1023 100644 --- a/keyboards/zhaqian/readme.md +++ b/keyboards/zhaqian/readme.md @@ -41,6 +41,7 @@ | s80 | 0x00AA | 0xAA14 | Hotswap | ST stm32f103/f103 | RGB | | sp67 | 0x00AA | 0xAA15 | Hotswap | ST stm32f103/f103 | ENCODER | | zq50 | 0x00AA | 0xAA16 | Hotswap | ST stm32f103/f103 | RGB, UGRGB, ENCODER | +| Jane_v2_ce_slot | 0x00AA | 0xAA17 | Hotswap | Atmel atmega32u4 | | | Mpad12 | 0x00AA | 0xAAAA | Hotswap | Atmel atmega32u4 | RGB, UGRGB, JOYSTICK, ENCODER, OLED | | split69 | 0x00AA | 0xAAAB | Solder | Atmel atmega32u4 | SPLIT, UGRGB, OLED, ENCODER | | GH60 | 0xFEED | 0x6060 | Hotswap | ST stm32f103/f103 | RGB | @@ -176,12 +177,12 @@ You can also alternate these defines to control these feature: ``` ## UF2 Bootloader -| Support Devices | -|---------- | -|STM32F103x8| -|STM32F103xB| -|STM32F401xC| -|STM32F411xE| -|GD32VF103xB| - - +| Support Devices | Description | +|---------- | ---------- | +|STM32F103x8|| +|STM32F103xB|| +|STM32F401xC|| +|STM32F411xE|| +|GD32VF103xB|| +|AIR32F103xB| No hardware DP pull-up required| +|AIR32F103xC| No hardware DP pull-up required| diff --git a/keyboards/zhaqian/readme_cn.md b/keyboards/zhaqian/readme_cn.md index bd24f66afcfe..4fb7d68ec1ca 100644 --- a/keyboards/zhaqian/readme_cn.md +++ b/keyboards/zhaqian/readme_cn.md @@ -40,6 +40,7 @@ | s80 | 0x00AA | 0xAA14 | Hotswap | ST stm32f103/f103 | RGB | | sp67 | 0x00AA | 0xAA15 | Hotswap | ST stm32f103/f103 | ENCODER | | zq50 | 0x00AA | 0xAA16 | Hotswap | ST stm32f103/f103 | RGB, UGRGB, ENCODER | +| Jane_v2_ce_slot | 0x00AA | 0xAA17 | Hotswap | Atmel atmega32u4 | | | Mpad12 | 0x00AA | 0xAAAA | Hotswap | Atmel atmega32u4 | RGB, UGRGB, JOYSTICK, ENCODER, OLED | | split69 | 0x00AA | 0xAAAB | Solder | Atmel atmega32u4 | SPLIT, UGRGB, OLED, ENCODER | | GH60 | 0xFEED | 0x6060 | Hotswap | ST stm32f103/f103 | RGB | @@ -170,13 +171,15 @@ UNDERGLOW_RGB_MATRIX_ENABLE = yes ## UF2 Bootloader UF2 Bootloader储存了预编译好的MSC下载方式的引导程序,目前支持以下型号的主控. -| Support Devices | -|---------- | -|STM32F103x8| -|STM32F103xB| -|STM32F401xC| -|STM32F411xE| -|GD32VF103xB| +| 支持的MCU | 描述 | +|---------- | ---------- | +|STM32F103x8|| +|STM32F103xB|| +|STM32F401xC|| +|STM32F411xE|| +|GD32VF103xB|| +|AIR32F103xB| 无需硬件DP上拉| +|AIR32F103xC| 无需硬件DP上拉| # TODO LIST diff --git a/keyboards/zhaqian/s80/config.h b/keyboards/zhaqian/s80/config.h index 8570d1a1b824..6f17ad75ffa2 100644 --- a/keyboards/zhaqian/s80/config.h +++ b/keyboards/zhaqian/s80/config.h @@ -23,7 +23,7 @@ #define DEVICE_VER 0x0001 #define MANUFACTURER ZhaQian #define PRODUCT S80 -#define DESCRIPTION Keyboard + #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/zhaqian/sp67/config.h b/keyboards/zhaqian/sp67/config.h index e4791ec3d0e9..260a0074dda7 100644 --- a/keyboards/zhaqian/sp67/config.h +++ b/keyboards/zhaqian/sp67/config.h @@ -23,7 +23,7 @@ #define DEVICE_VER 0x0001 #define MANUFACTURER ZhaQian #define PRODUCT SP67 -#define DESCRIPTION Keyboard + #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/zhaqian/tester/air32f103/config.h b/keyboards/zhaqian/tester/air32f103/config.h index b28759ffc109..f657de66f842 100644 --- a/keyboards/zhaqian/tester/air32f103/config.h +++ b/keyboards/zhaqian/tester/air32f103/config.h @@ -19,15 +19,15 @@ #include "config_common.h" #define MATRIX_COL_PINS { A9, A0, B15, B14, B13 } -#define MATRIX_ROW_PINS { A10, B6, C14 } +#define MATRIX_ROW_PINS { A1, B6, C14 } #define UNUSED_PINS #ifdef RGB_MATRIX_ENABLE -#define RGB_DI_PIN B3 -#define WS2812_PWM_DRIVER PWMD2 +#define RGB_DI_PIN A10 +#define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_DMA_STREAM AIR32_DMA1_STREAM5 #define WS2812_DMA_CHANNEL 2 #endif @@ -46,8 +46,9 @@ #define UG_RGB_MATRIX_CYCLEOUTIN #undef UG_RGB_MATRIX_WPM_ANIMATIONS #endif + // #define DEBUG_EEPROM_OUTPUT -#define DEBUG_MATRIX_SCAN_RATE +// #define DEBUG_MATRIX_SCAN_RATE // #define SERIAL_DRIVER SD2 // #define SD1_TX_PIN A2 diff --git a/keyboards/zhaqian/tester/air32f103/halconf.h b/keyboards/zhaqian/tester/air32f103/halconf.h new file mode 100644 index 000000000000..ea16f19d0370 --- /dev/null +++ b/keyboards/zhaqian/tester/air32f103/halconf.h @@ -0,0 +1,21 @@ +/* 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 . + */ + +#pragma once + +#define HAL_USE_PWM TRUE +// #define HAL_USE_SERIAL TRUE +#include_next diff --git a/keyboards/zhaqian/tester/air32f103/mcuconf.h b/keyboards/zhaqian/tester/air32f103/mcuconf.h new file mode 100644 index 000000000000..bea3b564b2ef --- /dev/null +++ b/keyboards/zhaqian/tester/air32f103/mcuconf.h @@ -0,0 +1,25 @@ +/* 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 . + */ + +#pragma once + +#include_next + +#undef AIR32_PWM_USE_TIM1 +#define AIR32_PWM_USE_TIM1 TRUE + +// #undef AIR32_SERIAL_USE_USART2 +// #define AIR32_SERIAL_USE_USART2 TRUE \ No newline at end of file diff --git a/keyboards/zhaqian/tester/air32f103/rules.mk b/keyboards/zhaqian/tester/air32f103/rules.mk index e194004d61a5..88cb3592cc2e 100644 --- a/keyboards/zhaqian/tester/air32f103/rules.mk +++ b/keyboards/zhaqian/tester/air32f103/rules.mk @@ -6,6 +6,9 @@ BOOTLOADER = custom OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE +KEYBOARD_SHARED_EP = yes +# WS2812_DRIVER = pwm + SRC += uf2_boot.c diff --git a/keyboards/zhaqian/tester/config.h b/keyboards/zhaqian/tester/config.h index 9a7dcc8db434..6916099a3352 100644 --- a/keyboards/zhaqian/tester/config.h +++ b/keyboards/zhaqian/tester/config.h @@ -23,7 +23,7 @@ #define DEVICE_VER 0x0001 #define MANUFACTURER ZhaQian #define PRODUCT Tester -#define DESCRIPTION Keyboard + #define MATRIX_ROWS 3 #define MATRIX_COLS 5 diff --git a/keyboards/zhaqian/tester/rules.mk b/keyboards/zhaqian/tester/rules.mk index 65009517c187..903cc79501c7 100644 --- a/keyboards/zhaqian/tester/rules.mk +++ b/keyboards/zhaqian/tester/rules.mk @@ -1,6 +1,6 @@ BOOTMAGIC_ENABLE = yes MOUSEKEY_ENABLE = yes EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = yes +CONSOLE_ENABLE = no COMMAND_ENABLE = no NKRO_ENABLE = yes diff --git a/keyboards/zhaqian/zq46/config.h b/keyboards/zhaqian/zq46/config.h index 8748a74619e6..e802f6d6bc46 100644 --- a/keyboards/zhaqian/zq46/config.h +++ b/keyboards/zhaqian/zq46/config.h @@ -23,7 +23,7 @@ #define DEVICE_VER 0x0001 #define MANUFACTURER ZhaQian #define PRODUCT zq46 -#define DESCRIPTION Keyboard + #define MATRIX_ROWS 4 #define MATRIX_COLS 13 diff --git a/keyboards/zhaqian/zq48/config.h b/keyboards/zhaqian/zq48/config.h index 34e8e994a247..893efc82f012 100644 --- a/keyboards/zhaqian/zq48/config.h +++ b/keyboards/zhaqian/zq48/config.h @@ -23,7 +23,7 @@ #define DEVICE_VER 0x0001 #define MANUFACTURER ZhaQian #define PRODUCT zq48 -#define DESCRIPTION Keyboard + #define MATRIX_ROWS 4 #define MATRIX_COLS 14 diff --git a/keyboards/zhaqian/zq50/config.h b/keyboards/zhaqian/zq50/config.h index faefa823b084..c8664bc04258 100644 --- a/keyboards/zhaqian/zq50/config.h +++ b/keyboards/zhaqian/zq50/config.h @@ -21,7 +21,7 @@ #define DEVICE_VER 0x0001 #define MANUFACTURER ZhaQian #define PRODUCT zq50 -#define DESCRIPTION Keyboard + #define MATRIX_ROWS 4 #define MATRIX_COLS 14 diff --git a/keyboards/zhaqian/zq64/config.h b/keyboards/zhaqian/zq64/config.h index 76ebb07ce61c..0a45645b67f6 100644 --- a/keyboards/zhaqian/zq64/config.h +++ b/keyboards/zhaqian/zq64/config.h @@ -23,7 +23,7 @@ #define DEVICE_VER 0x0001 #define MANUFACTURER ZhaQian #define PRODUCT zq64 -#define DESCRIPTION Keyboard + #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/zhaqian/zq68/config.h b/keyboards/zhaqian/zq68/config.h index 34bca0dc3014..174b2b691756 100755 --- a/keyboards/zhaqian/zq68/config.h +++ b/keyboards/zhaqian/zq68/config.h @@ -23,7 +23,7 @@ #define DEVICE_VER 0x0001 #define MANUFACTURER ZhaQian #define PRODUCT zq68 -#define DESCRIPTION Keyboard + #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/zhaqian/zq75v2/config.h b/keyboards/zhaqian/zq75v2/config.h index 1ca71b485c20..5af6f4dbc554 100644 --- a/keyboards/zhaqian/zq75v2/config.h +++ b/keyboards/zhaqian/zq75v2/config.h @@ -24,7 +24,7 @@ #define MANUFACTURER ZhaQian #define PRODUCT 剳牵的ZQ75V2pro -#define DESCRIPTION Keyboard + #define MATRIX_ROWS 6 #define MATRIX_COLS 15 diff --git a/keyboards/zhaqian/zq80/config.h b/keyboards/zhaqian/zq80/config.h index 53e2d6b20d7c..3a7c25e6a1fa 100644 --- a/keyboards/zhaqian/zq80/config.h +++ b/keyboards/zhaqian/zq80/config.h @@ -23,7 +23,7 @@ #define DEVICE_VER 0x0001 #define MANUFACTURER ZhaQian #define PRODUCT zq80 -#define DESCRIPTION Keyboard + #define MATRIX_ROWS 6 #define MATRIX_COLS 15 diff --git a/keyboards/zhaqian/zq89/config.h b/keyboards/zhaqian/zq89/config.h index 4f3369f0ac3e..e93abd661fc1 100644 --- a/keyboards/zhaqian/zq89/config.h +++ b/keyboards/zhaqian/zq89/config.h @@ -23,7 +23,7 @@ #define DEVICE_VER 0x0001 #define MANUFACTURER ZhaQian #define PRODUCT zq89 -#define DESCRIPTION Keyboard + #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/zhaqian/zqlib/uf2_bootloader/uf2boot_air32f103xB_8MHz.bin b/keyboards/zhaqian/zqlib/uf2_bootloader/uf2boot_air32f103xB_8MHz.bin new file mode 100644 index 000000000000..90a9f189d3ff Binary files /dev/null and b/keyboards/zhaqian/zqlib/uf2_bootloader/uf2boot_air32f103xB_8MHz.bin differ diff --git a/keyboards/zhaqian/zqlib/uf2_bootloader/uf2boot_air32f103xC_8MHz.bin b/keyboards/zhaqian/zqlib/uf2_bootloader/uf2boot_air32f103xC_8MHz.bin new file mode 100644 index 000000000000..5ca8533f5885 Binary files /dev/null and b/keyboards/zhaqian/zqlib/uf2_bootloader/uf2boot_air32f103xC_8MHz.bin differ diff --git a/lib/chibios-contrib b/lib/chibios-contrib index 09309b9595ae..eafdffab6854 160000 --- a/lib/chibios-contrib +++ b/lib/chibios-contrib @@ -1 +1 @@ -Subproject commit 09309b9595ae7fe74912131a938c751689e70411 +Subproject commit eafdffab68547b9c18914f8b33cd7be67fc1fdd2 diff --git a/platforms/chibios/boards/GENERIC_AIR32_F103/configs/mcuconf.h b/platforms/chibios/boards/GENERIC_AIR32_F103/configs/mcuconf.h index 4032d571df88..294aaf08a929 100644 --- a/platforms/chibios/boards/GENERIC_AIR32_F103/configs/mcuconf.h +++ b/platforms/chibios/boards/GENERIC_AIR32_F103/configs/mcuconf.h @@ -27,32 +27,13 @@ * driver is enabled in halconf.h. * * IRQ priorities: - * 7...0 Lowest...Highest. + * 3...0 Lowest...Highest. * */ /* * HAL driver system settings. */ -// #define AIR32_NO_INIT FALSE -// #define AIR32_HSI_ENABLED TRUE -// #define AIR32_LSI_ENABLED FALSE -// #define AIR32_HSE_ENABLED TRUE -// #define AIR32_LSE_ENABLED FALSE -// #define AIR32_SW AIR32_SW_PLL -// #define AIR32_PLLSRC AIR32_PLLSRC_HSE -// #define AIR32_PLLXTPRE AIR32_PLLXTPRE_DIV1 -// #define AIR32_PLLMUL_VALUE 9 -// #define AIR32_HPRE AIR32_HPRE_DIV1 -// #define AIR32_PPRE1 AIR32_PPRE1_DIV2 -// #define AIR32_PPRE2 AIR32_PPRE2_DIV2 -// #define AIR32_ADCPRE AIR32_ADCPRE_DIV4 -// #define AIR32_USB_CLOCK_REQUIRED TRUE -// #define AIR32_USBPRE AIR32_USBPRE_DIV1P5 -// #define AIR32_MCOSEL AIR32_MCOSEL_NOCLOCK -// #define AIR32_RTCSEL AIR32_RTCSEL_HSEDIV -// #define AIR32_PVD_ENABLE FALSE -// #define AIR32_PLS AIR32_PLS_LEV0 #define AIR32_NO_INIT FALSE #define AIR32_HSI_ENABLED TRUE #define AIR32_LSI_ENABLED FALSE @@ -78,11 +59,11 @@ */ #define AIR32_ADC_USE_ADC1 FALSE #define AIR32_ADC_ADC1_DMA_PRIORITY 2 -#define AIR32_ADC_ADC1_IRQ_PRIORITY 6 +#define AIR32_ADC_ADC1_IRQ_PRIORITY 2 #define AIR32_ADC_USE_ADC2 FALSE #define AIR32_ADC_ADC2_DMA_PRIORITY 2 -#define AIR32_ADC_ADC2_IRQ_PRIORITY 6 +#define AIR32_ADC_ADC2_IRQ_PRIORITY 2 /* * DAC driver system settings. @@ -90,10 +71,10 @@ #define AIR32_DAC_DUAL_MODE FALSE #define AIR32_DAC_USE_DAC1_CH1 FALSE #define AIR32_DAC_USE_DAC1_CH2 FALSE -#define AIR32_DAC_DAC1_CH1_IRQ_PRIORITY 7 -#define AIR32_DAC_DAC1_CH2_IRQ_PRIORITY 7 -#define AIR32_DAC_DAC1_CH1_DMA_PRIORITY 7 -#define AIR32_DAC_DAC1_CH2_DMA_PRIORITY 7 +#define AIR32_DAC_DAC1_CH1_IRQ_PRIORITY 3 +#define AIR32_DAC_DAC1_CH2_IRQ_PRIORITY 3 +#define AIR32_DAC_DAC1_CH1_DMA_PRIORITY 3 +#define AIR32_DAC_DAC1_CH2_DMA_PRIORITY 3 /* * CAN driver system settings. @@ -104,13 +85,13 @@ /* * EXT driver system settings. */ -#define AIR32_EXT_EXTI0_IRQ_PRIORITY 6 -#define AIR32_EXT_EXTI1_IRQ_PRIORITY 6 -#define AIR32_EXT_EXTI2_IRQ_PRIORITY 6 -#define AIR32_EXT_EXTI3_IRQ_PRIORITY 6 -#define AIR32_EXT_EXTI4_IRQ_PRIORITY 6 -#define AIR32_EXT_EXTI5_9_IRQ_PRIORITY 6 -#define AIR32_EXT_EXTI10_15_IRQ_PRIORITY 6 +#define AIR32_EXT_EXTI0_IRQ_PRIORITY 2 +#define AIR32_EXT_EXTI1_IRQ_PRIORITY 2 +#define AIR32_EXT_EXTI2_IRQ_PRIORITY 2 +#define AIR32_EXT_EXTI3_IRQ_PRIORITY 2 +#define AIR32_EXT_EXTI4_IRQ_PRIORITY 2 +#define AIR32_EXT_EXTI5_9_IRQ_PRIORITY 2 +#define AIR32_EXT_EXTI10_15_IRQ_PRIORITY 2 /* * GPT driver system settings. @@ -120,11 +101,11 @@ #define AIR32_GPT_USE_TIM3 FALSE #define AIR32_GPT_USE_TIM4 FALSE #define AIR32_GPT_USE_TIM5 FALSE -#define AIR32_GPT_TIM1_IRQ_PRIORITY 7 -#define AIR32_GPT_TIM2_IRQ_PRIORITY 7 -#define AIR32_GPT_TIM3_IRQ_PRIORITY 7 -#define AIR32_GPT_TIM4_IRQ_PRIORITY 7 -#define AIR32_GPT_TIM5_IRQ_PRIORITY 7 +#define AIR32_GPT_TIM1_IRQ_PRIORITY 3 +#define AIR32_GPT_TIM2_IRQ_PRIORITY 3 +#define AIR32_GPT_TIM3_IRQ_PRIORITY 3 +#define AIR32_GPT_TIM4_IRQ_PRIORITY 3 +#define AIR32_GPT_TIM5_IRQ_PRIORITY 3 /* * I2C driver system settings. @@ -146,11 +127,11 @@ #define AIR32_ICU_USE_TIM3 FALSE #define AIR32_ICU_USE_TIM4 FALSE #define AIR32_ICU_USE_TIM5 FALSE -#define AIR32_ICU_TIM1_IRQ_PRIORITY 7 -#define AIR32_ICU_TIM2_IRQ_PRIORITY 7 -#define AIR32_ICU_TIM3_IRQ_PRIORITY 7 -#define AIR32_ICU_TIM4_IRQ_PRIORITY 7 -#define AIR32_ICU_TIM5_IRQ_PRIORITY 7 +#define AIR32_ICU_TIM1_IRQ_PRIORITY 3 +#define AIR32_ICU_TIM2_IRQ_PRIORITY 3 +#define AIR32_ICU_TIM3_IRQ_PRIORITY 3 +#define AIR32_ICU_TIM4_IRQ_PRIORITY 3 +#define AIR32_ICU_TIM5_IRQ_PRIORITY 3 /* * PWM driver system settings. @@ -161,16 +142,16 @@ #define AIR32_PWM_USE_TIM3 FALSE #define AIR32_PWM_USE_TIM4 FALSE #define AIR32_PWM_USE_TIM5 FALSE -#define AIR32_PWM_TIM1_IRQ_PRIORITY 7 -#define AIR32_PWM_TIM2_IRQ_PRIORITY 7 -#define AIR32_PWM_TIM3_IRQ_PRIORITY 7 -#define AIR32_PWM_TIM4_IRQ_PRIORITY 7 -#define AIR32_PWM_TIM5_IRQ_PRIORITY 7 +#define AIR32_PWM_TIM1_IRQ_PRIORITY 3 +#define AIR32_PWM_TIM2_IRQ_PRIORITY 3 +#define AIR32_PWM_TIM3_IRQ_PRIORITY 3 +#define AIR32_PWM_TIM4_IRQ_PRIORITY 3 +#define AIR32_PWM_TIM5_IRQ_PRIORITY 3 /* * RTC driver system settings. */ -#define AIR32_RTC_IRQ_PRIORITY 7 +#define AIR32_RTC_IRQ_PRIORITY 3 /* * SERIAL driver system settings. @@ -178,9 +159,9 @@ #define AIR32_SERIAL_USE_USART1 FALSE #define AIR32_SERIAL_USE_USART2 FALSE #define AIR32_SERIAL_USE_USART3 FALSE -#define AIR32_SERIAL_USART1_PRIORITY 12 -#define AIR32_SERIAL_USART2_PRIORITY 12 -#define AIR32_SERIAL_USART3_PRIORITY 12 +#define AIR32_SERIAL_USART1_PRIORITY 6 +#define AIR32_SERIAL_USART2_PRIORITY 6 +#define AIR32_SERIAL_USART3_PRIORITY 6 /* * SPI driver system settings. @@ -191,15 +172,15 @@ #define AIR32_SPI_SPI1_DMA_PRIORITY 1 #define AIR32_SPI_SPI2_DMA_PRIORITY 1 #define AIR32_SPI_SPI3_DMA_PRIORITY 1 -#define AIR32_SPI_SPI1_IRQ_PRIORITY 10 -#define AIR32_SPI_SPI2_IRQ_PRIORITY 10 -#define AIR32_SPI_SPI3_IRQ_PRIORITY 10 +#define AIR32_SPI_SPI1_IRQ_PRIORITY 6 +#define AIR32_SPI_SPI2_IRQ_PRIORITY 6 +#define AIR32_SPI_SPI3_IRQ_PRIORITY 6 #define AIR32_SPI_DMA_ERROR_HOOK(spip) osalSysHalt("DMA failure") /* * ST driver system settings. */ -#define AIR32_ST_IRQ_PRIORITY 8 +#define AIR32_ST_IRQ_PRIORITY 4 #define AIR32_ST_USE_TIMER 2 /* @@ -208,9 +189,9 @@ #define AIR32_UART_USE_USART1 FALSE #define AIR32_UART_USE_USART2 FALSE #define AIR32_UART_USE_USART3 FALSE -#define AIR32_UART_USART1_IRQ_PRIORITY 12 -#define AIR32_UART_USART2_IRQ_PRIORITY 12 -#define AIR32_UART_USART3_IRQ_PRIORITY 12 +#define AIR32_UART_USART1_IRQ_PRIORITY 6 +#define AIR32_UART_USART2_IRQ_PRIORITY 6 +#define AIR32_UART_USART3_IRQ_PRIORITY 6 #define AIR32_UART_USART1_DMA_PRIORITY 0 #define AIR32_UART_USART2_DMA_PRIORITY 0 #define AIR32_UART_USART3_DMA_PRIORITY 0 @@ -221,8 +202,8 @@ */ #define AIR32_USB_USE_USB1 TRUE #define AIR32_USB_LOW_POWER_ON_SUSPEND FALSE -#define AIR32_USB_USB1_HP_IRQ_PRIORITY 13 -#define AIR32_USB_USB1_LP_IRQ_PRIORITY 14 +#define AIR32_USB_USB1_HP_IRQ_PRIORITY 5 +#define AIR32_USB_USB1_LP_IRQ_PRIORITY 6 #endif /* MCUCONF_H */ diff --git a/platforms/chibios/boards/GENERIC_CM32_M101A/board/board.c b/platforms/chibios/boards/GENERIC_CM32_M101A/board/board.c index 13a9f84759ae..60b093480139 100644 --- a/platforms/chibios/boards/GENERIC_CM32_M101A/board/board.c +++ b/platforms/chibios/boards/GENERIC_CM32_M101A/board/board.c @@ -20,7 +20,6 @@ */ #include "hal.h" -#include "../../../../../lib/RTT/SEGGER_RTT.h" /*===========================================================================*/ /* Driver local definitions. */ /*===========================================================================*/ @@ -69,9 +68,7 @@ static void cm32_gpio_init(void) { * any other initialization. */ void __early_init(void) { - SEGGER_RTT_printf(0, "printf Test: %s", "CM32_CLOCK_INIT"); cm32_clock_init(); - SEGGER_RTT_printf(0, "printf Test: %s", "CM32_GPIO_INIT"); cm32_gpio_init(); } /** diff --git a/platforms/chibios/boards/GENERIC_CM32_M101A/configs/chconf.h b/platforms/chibios/boards/GENERIC_CM32_M101A/configs/chconf.h index 97be2e8e4321..295bac53cc60 100644 --- a/platforms/chibios/boards/GENERIC_CM32_M101A/configs/chconf.h +++ b/platforms/chibios/boards/GENERIC_CM32_M101A/configs/chconf.h @@ -1,756 +1,21 @@ -/* - ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -/** - * @file rt/templates/chconf.h - * @brief Configuration file template. - * @details A copy of this file must be placed in each project directory, it - * contains the application specific kernel settings. - * - * @addtogroup config - * @details Kernel related settings and hooks. - * @{ - */ - -#ifndef CHCONF_H -#define CHCONF_H - -#define _CHIBIOS_RT_CONF_ -#define _CHIBIOS_RT_CONF_VER_6_1_ - -/*===========================================================================*/ -/** - * @name System timers settings - * @{ - */ -/*===========================================================================*/ - -/** - * @brief System time counter resolution. - * @note Allowed values are 16, 32 or 64 bits. - */ -#if !defined(CH_CFG_ST_RESOLUTION) -#define CH_CFG_ST_RESOLUTION 32 -#endif - -/** - * @brief System tick frequency. - * @details Frequency of the system timer that drives the system ticks. This - * setting also defines the system tick time unit. - */ -#if !defined(CH_CFG_ST_FREQUENCY) -#define CH_CFG_ST_FREQUENCY 100000 -#endif - -/** - * @brief Time intervals data size. - * @note Allowed values are 16, 32 or 64 bits. - */ -#if !defined(CH_CFG_INTERVALS_SIZE) -#define CH_CFG_INTERVALS_SIZE 32 -#endif - -/** - * @brief Time types data size. - * @note Allowed values are 16 or 32 bits. - */ -#if !defined(CH_CFG_TIME_TYPES_SIZE) -#define CH_CFG_TIME_TYPES_SIZE 32 -#endif - -/** - * @brief Time delta constant for the tick-less mode. - * @note If this value is zero then the system uses the classic - * periodic tick. This value represents the minimum number - * of ticks that is safe to specify in a timeout directive. - * The value one is not valid, timeouts are rounded up to - * this value. - */ -#if !defined(CH_CFG_ST_TIMEDELTA) -#define CH_CFG_ST_TIMEDELTA 0 -#endif - -/** @} */ - -/*===========================================================================*/ -/** - * @name Kernel parameters and options - * @{ - */ -/*===========================================================================*/ - -/** - * @brief Round robin interval. - * @details This constant is the number of system ticks allowed for the - * threads before preemption occurs. Setting this value to zero - * disables the preemption for threads with equal priority and the - * round robin becomes cooperative. Note that higher priority - * threads can still preempt, the kernel is always preemptive. - * @note Disabling the round robin preemption makes the kernel more compact - * and generally faster. - * @note The round robin preemption is not supported in tickless mode and - * must be set to zero in that case. - */ -#if !defined(CH_CFG_TIME_QUANTUM) -#define CH_CFG_TIME_QUANTUM 0 -#endif - -/** - * @brief Idle thread automatic spawn suppression. - * @details When this option is activated the function @p chSysInit() - * does not spawn the idle thread. The application @p main() - * function becomes the idle thread and must implement an - * infinite loop. - */ -#if !defined(CH_CFG_NO_IDLE_THREAD) -#define CH_CFG_NO_IDLE_THREAD FALSE -#endif - -/** @} */ - -/*===========================================================================*/ -/** - * @name Performance options - * @{ - */ -/*===========================================================================*/ - -/** - * @brief OS optimization. - * @details If enabled then time efficient rather than space efficient code - * is used when two possible implementations exist. - * - * @note This is not related to the compiler optimization options. - * @note The default is @p TRUE. - */ -#if !defined(CH_CFG_OPTIMIZE_SPEED) -#define CH_CFG_OPTIMIZE_SPEED TRUE -#endif - -/** @} */ - -/*===========================================================================*/ -/** - * @name Subsystem options - * @{ - */ -/*===========================================================================*/ - -/** - * @brief Time Measurement APIs. - * @details If enabled then the time measurement APIs are included in - * the kernel. - * - * @note The default is @p TRUE. - */ -#if !defined(CH_CFG_USE_TM) -#define CH_CFG_USE_TM FALSE -#endif - -/** - * @brief Threads registry APIs. - * @details If enabled then the registry APIs are included in the kernel. - * - * @note The default is @p TRUE. - */ -#if !defined(CH_CFG_USE_REGISTRY) -#define CH_CFG_USE_REGISTRY FALSE -#endif - -/** - * @brief Threads synchronization APIs. - * @details If enabled then the @p chThdWait() function is included in - * the kernel. - * - * @note The default is @p TRUE. - */ -#if !defined(CH_CFG_USE_WAITEXIT) -#define CH_CFG_USE_WAITEXIT FALSE -#endif - -/** - * @brief Semaphores APIs. - * @details If enabled then the Semaphores APIs are included in the kernel. +/* Copyright 2020 QMK * - * @note The default is @p TRUE. - */ -#if !defined(CH_CFG_USE_SEMAPHORES) -#define CH_CFG_USE_SEMAPHORES TRUE -#endif - -/** - * @brief Semaphores queuing mode. - * @details If enabled then the threads are enqueued on semaphores by - * priority rather than in FIFO order. + * 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. * - * @note The default is @p FALSE. Enable this if you have special - * requirements. - * @note Requires @p CH_CFG_USE_SEMAPHORES. - */ -#if !defined(CH_CFG_USE_SEMAPHORES_PRIORITY) -#define CH_CFG_USE_SEMAPHORES_PRIORITY FALSE -#endif - -/** - * @brief Mutexes APIs. - * @details If enabled then the mutexes APIs are included in the kernel. - * - * @note The default is @p TRUE. - */ -#if !defined(CH_CFG_USE_MUTEXES) -#define CH_CFG_USE_MUTEXES TRUE -#endif - -/** - * @brief Enables recursive behavior on mutexes. - * @note Recursive mutexes are heavier and have an increased - * memory footprint. - * - * @note The default is @p FALSE. - * @note Requires @p CH_CFG_USE_MUTEXES. - */ -#if !defined(CH_CFG_USE_MUTEXES_RECURSIVE) -#define CH_CFG_USE_MUTEXES_RECURSIVE FALSE -#endif - -/** - * @brief Conditional Variables APIs. - * @details If enabled then the conditional variables APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - * @note Requires @p CH_CFG_USE_MUTEXES. - */ -#if !defined(CH_CFG_USE_CONDVARS) -#define CH_CFG_USE_CONDVARS FALSE -#endif - -/** - * @brief Conditional Variables APIs with timeout. - * @details If enabled then the conditional variables APIs with timeout - * specification are included in the kernel. - * - * @note The default is @p TRUE. - * @note Requires @p CH_CFG_USE_CONDVARS. - */ -#if !defined(CH_CFG_USE_CONDVARS_TIMEOUT) -#define CH_CFG_USE_CONDVARS_TIMEOUT TRUE -#endif - -/** - * @brief Events Flags APIs. - * @details If enabled then the event flags APIs are included in the kernel. - * - * @note The default is @p TRUE. - */ -#if !defined(CH_CFG_USE_EVENTS) -#define CH_CFG_USE_EVENTS TRUE -#endif - -/** - * @brief Events Flags APIs with timeout. - * @details If enabled then the events APIs with timeout specification - * are included in the kernel. - * - * @note The default is @p TRUE. - * @note Requires @p CH_CFG_USE_EVENTS. - */ -#if !defined(CH_CFG_USE_EVENTS_TIMEOUT) -#define CH_CFG_USE_EVENTS_TIMEOUT TRUE -#endif - -/** - * @brief Synchronous Messages APIs. - * @details If enabled then the synchronous messages APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - */ -#if !defined(CH_CFG_USE_MESSAGES) -#define CH_CFG_USE_MESSAGES FALSE -#endif - -/** - * @brief Synchronous Messages queuing mode. - * @details If enabled then messages are served by priority rather than in - * FIFO order. - * - * @note The default is @p FALSE. Enable this if you have special - * requirements. - * @note Requires @p CH_CFG_USE_MESSAGES. - */ -#if !defined(CH_CFG_USE_MESSAGES_PRIORITY) -#define CH_CFG_USE_MESSAGES_PRIORITY FALSE -#endif - -/** - * @brief Dynamic Threads APIs. - * @details If enabled then the dynamic threads creation APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - * @note Requires @p CH_CFG_USE_WAITEXIT. - * @note Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS. - */ -#if !defined(CH_CFG_USE_DYNAMIC) -#define CH_CFG_USE_DYNAMIC FALSE -#endif - -/** @} */ - -/*===========================================================================*/ -/** - * @name OSLIB options - * @{ - */ -/*===========================================================================*/ - -/** - * @brief Mailboxes APIs. - * @details If enabled then the asynchronous messages (mailboxes) APIs are - * included in the kernel. - * - * @note The default is @p TRUE. - * @note Requires @p CH_CFG_USE_SEMAPHORES. - */ -#if !defined(CH_CFG_USE_MAILBOXES) -#define CH_CFG_USE_MAILBOXES FALSE -#endif - -/** - * @brief Core Memory Manager APIs. - * @details If enabled then the core memory manager APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - */ -#if !defined(CH_CFG_USE_MEMCORE) -#define CH_CFG_USE_MEMCORE TRUE -#endif - -/** - * @brief Managed RAM size. - * @details Size of the RAM area to be managed by the OS. If set to zero - * then the whole available RAM is used. The core memory is made - * available to the heap allocator and/or can be used directly through - * the simplified core memory allocator. - * - * @note In order to let the OS manage the whole RAM the linker script must - * provide the @p __heap_base__ and @p __heap_end__ symbols. - * @note Requires @p CH_CFG_USE_MEMCORE. - */ -#if !defined(CH_CFG_MEMCORE_SIZE) -#define CH_CFG_MEMCORE_SIZE 0 -#endif - -/** - * @brief Heap Allocator APIs. - * @details If enabled then the memory heap allocator APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - * @note Requires @p CH_CFG_USE_MEMCORE and either @p CH_CFG_USE_MUTEXES or - * @p CH_CFG_USE_SEMAPHORES. - * @note Mutexes are recommended. - */ -#if !defined(CH_CFG_USE_HEAP) -#define CH_CFG_USE_HEAP FALSE -#endif - -/** - * @brief Memory Pools Allocator APIs. - * @details If enabled then the memory pools allocator APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - */ -#if !defined(CH_CFG_USE_MEMPOOLS) -#define CH_CFG_USE_MEMPOOLS FALSE -#endif - -/** - * @brief Objects FIFOs APIs. - * @details If enabled then the objects FIFOs APIs are included - * in the kernel. + * 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. * - * @note The default is @p TRUE. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -#if !defined(CH_CFG_USE_OBJ_FIFOS) -#define CH_CFG_USE_OBJ_FIFOS FALSE -#endif - -/** - * @brief Pipes APIs. - * @details If enabled then the pipes APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - */ -#if !defined(CH_CFG_USE_PIPES) -#define CH_CFG_USE_PIPES FALSE -#endif - -/** - * @brief Objects Caches APIs. - * @details If enabled then the objects caches APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - */ -#if !defined(CH_CFG_USE_OBJ_CACHES) -#define CH_CFG_USE_OBJ_CACHES FALSE -#endif - -/** - * @brief Delegate threads APIs. - * @details If enabled then the delegate threads APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - */ -#if !defined(CH_CFG_USE_DELEGATES) -#define CH_CFG_USE_DELEGATES FALSE -#endif - -/** - * @brief Jobs Queues APIs. - * @details If enabled then the jobs queues APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - */ -#if !defined(CH_CFG_USE_JOBS) -#define CH_CFG_USE_JOBS FALSE -#endif - -/** @} */ - -/*===========================================================================*/ -/** - * @name Objects factory options - * @{ - */ -/*===========================================================================*/ - -/** - * @brief Objects Factory APIs. - * @details If enabled then the objects factory APIs are included in the - * kernel. - * - * @note The default is @p FALSE. - */ -#if !defined(CH_CFG_USE_FACTORY) -#define CH_CFG_USE_FACTORY FALSE -#endif - -/** - * @brief Maximum length for object names. - * @details If the specified length is zero then the name is stored by - * pointer but this could have unintended side effects. - */ -#if !defined(CH_CFG_FACTORY_MAX_NAMES_LENGTH) -#define CH_CFG_FACTORY_MAX_NAMES_LENGTH 8 -#endif - -/** - * @brief Enables the registry of generic objects. - */ -#if !defined(CH_CFG_FACTORY_OBJECTS_REGISTRY) -#define CH_CFG_FACTORY_OBJECTS_REGISTRY FALSE -#endif - -/** - * @brief Enables factory for generic buffers. - */ -#if !defined(CH_CFG_FACTORY_GENERIC_BUFFERS) -#define CH_CFG_FACTORY_GENERIC_BUFFERS FALSE -#endif - -/** - * @brief Enables factory for semaphores. - */ -#if !defined(CH_CFG_FACTORY_SEMAPHORES) -#define CH_CFG_FACTORY_SEMAPHORES FALSE -#endif - -/** - * @brief Enables factory for mailboxes. - */ -#if !defined(CH_CFG_FACTORY_MAILBOXES) -#define CH_CFG_FACTORY_MAILBOXES FALSE -#endif - -/** - * @brief Enables factory for objects FIFOs. - */ -#if !defined(CH_CFG_FACTORY_OBJ_FIFOS) -#define CH_CFG_FACTORY_OBJ_FIFOS FALSE -#endif - -/** - * @brief Enables factory for Pipes. - */ -#if !defined(CH_CFG_FACTORY_PIPES) || defined(__DOXYGEN__) -#define CH_CFG_FACTORY_PIPES FALSE -#endif - -/** @} */ - -/*===========================================================================*/ -/** - * @name Debug options - * @{ - */ -/*===========================================================================*/ - -/** - * @brief Debug option, kernel statistics. - * - * @note The default is @p FALSE. - */ -#if !defined(CH_DBG_STATISTICS) -#define CH_DBG_STATISTICS FALSE -#endif - -/** - * @brief Debug option, system state check. - * @details If enabled the correct call protocol for system APIs is checked - * at runtime. - * - * @note The default is @p FALSE. - */ -#if !defined(CH_DBG_SYSTEM_STATE_CHECK) -#define CH_DBG_SYSTEM_STATE_CHECK FALSE -#endif - -/** - * @brief Debug option, parameters checks. - * @details If enabled then the checks on the API functions input - * parameters are activated. - * - * @note The default is @p FALSE. - */ -#if !defined(CH_DBG_ENABLE_CHECKS) -#define CH_DBG_ENABLE_CHECKS FALSE -#endif - -/** - * @brief Debug option, consistency checks. - * @details If enabled then all the assertions in the kernel code are - * activated. This includes consistency checks inside the kernel, - * runtime anomalies and port-defined checks. - * - * @note The default is @p FALSE. - */ -#if !defined(CH_DBG_ENABLE_ASSERTS) -#define CH_DBG_ENABLE_ASSERTS FALSE -#endif - -/** - * @brief Debug option, trace buffer. - * @details If enabled then the trace buffer is activated. - * - * @note The default is @p CH_DBG_TRACE_MASK_DISABLED. - */ -#if !defined(CH_DBG_TRACE_MASK) -#define CH_DBG_TRACE_MASK CH_DBG_TRACE_MASK_DISABLED -#endif - -/** - * @brief Trace buffer entries. - * @note The trace buffer is only allocated if @p CH_DBG_TRACE_MASK is - * different from @p CH_DBG_TRACE_MASK_DISABLED. - */ -#if !defined(CH_DBG_TRACE_BUFFER_SIZE) -#define CH_DBG_TRACE_BUFFER_SIZE 128 -#endif - -/** - * @brief Debug option, stack checks. - * @details If enabled then a runtime stack check is performed. - * - * @note The default is @p FALSE. - * @note The stack check is performed in a architecture/port dependent way. - * It may not be implemented or some ports. - * @note The default failure mode is to halt the system with the global - * @p panic_msg variable set to @p NULL. - */ -#if !defined(CH_DBG_ENABLE_STACK_CHECK) -#define CH_DBG_ENABLE_STACK_CHECK FALSE -#endif - -/** - * @brief Debug option, stacks initialization. - * @details If enabled then the threads working area is filled with a byte - * value when a thread is created. This can be useful for the - * runtime measurement of the used stack. - * - * @note The default is @p FALSE. - */ -#if !defined(CH_DBG_FILL_THREADS) -#define CH_DBG_FILL_THREADS FALSE -#endif - -/** - * @brief Debug option, threads profiling. - * @details If enabled then a field is added to the @p thread_t structure that - * counts the system ticks occurred while executing the thread. - * - * @note The default is @p FALSE. - * @note This debug option is not currently compatible with the - * tickless mode. - */ -#if !defined(CH_DBG_THREADS_PROFILING) -#define CH_DBG_THREADS_PROFILING FALSE -#endif - -/** @} */ - -/*===========================================================================*/ -/** - * @name Kernel hooks - * @{ - */ -/*===========================================================================*/ - -/** - * @brief System structure extension. - * @details User fields added to the end of the @p ch_system_t structure. - */ -#define CH_CFG_SYSTEM_EXTRA_FIELDS \ - /* Add threads custom fields here.*/ - -/** - * @brief System initialization hook. - * @details User initialization code added to the @p chSysInit() function - * just before interrupts are enabled globally. - */ -#define CH_CFG_SYSTEM_INIT_HOOK() { \ - /* Add threads initialization code here.*/ \ -} - -/** - * @brief Threads descriptor structure extension. - * @details User fields added to the end of the @p thread_t structure. - */ -#define CH_CFG_THREAD_EXTRA_FIELDS \ - /* Add threads custom fields here.*/ - -/** - * @brief Threads initialization hook. - * @details User initialization code added to the @p _thread_init() function. - * - * @note It is invoked from within @p _thread_init() and implicitly from all - * the threads creation APIs. - */ -#define CH_CFG_THREAD_INIT_HOOK(tp) { \ - /* Add threads initialization code here.*/ \ -} - -/** - * @brief Threads finalization hook. - * @details User finalization code added to the @p chThdExit() API. - */ -#define CH_CFG_THREAD_EXIT_HOOK(tp) { \ - /* Add threads finalization code here.*/ \ -} - -/** - * @brief Context switch hook. - * @details This hook is invoked just before switching between threads. - */ -#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) { \ - /* Context switch code here.*/ \ -} - -/** - * @brief ISR enter hook. - */ -#define CH_CFG_IRQ_PROLOGUE_HOOK() { \ - /* IRQ prologue code here.*/ \ -} - -/** - * @brief ISR exit hook. - */ -#define CH_CFG_IRQ_EPILOGUE_HOOK() { \ - /* IRQ epilogue code here.*/ \ -} - -/** - * @brief Idle thread enter hook. - * @note This hook is invoked within a critical zone, no OS functions - * should be invoked from here. - * @note This macro can be used to activate a power saving mode. - */ -#define CH_CFG_IDLE_ENTER_HOOK() { \ - /* Idle-enter code here.*/ \ -} - -/** - * @brief Idle thread leave hook. - * @note This hook is invoked within a critical zone, no OS functions - * should be invoked from here. - * @note This macro can be used to deactivate a power saving mode. - */ -#define CH_CFG_IDLE_LEAVE_HOOK() { \ - /* Idle-leave code here.*/ \ -} - -/** - * @brief Idle Loop hook. - * @details This hook is continuously invoked by the idle thread loop. - */ -#define CH_CFG_IDLE_LOOP_HOOK() { \ - /* Idle loop code here.*/ \ -} - -/** - * @brief System tick event hook. - * @details This hook is invoked in the system tick handler immediately - * after processing the virtual timers queue. - */ -#define CH_CFG_SYSTEM_TICK_HOOK() { \ - /* System tick event code here.*/ \ -} - -/** - * @brief System halt hook. - * @details This hook is invoked in case to a system halting error before - * the system is halted. - */ -#define CH_CFG_SYSTEM_HALT_HOOK(reason) { \ - /* System halt code here.*/ \ -} - -/** - * @brief Trace hook. - * @details This hook is invoked each time a new record is written in the - * trace buffer. - */ -#define CH_CFG_TRACE_HOOK(tep) { \ - /* Trace code here.*/ \ -} - -/** @} */ -/*===========================================================================*/ -/* Port-specific settings (override port settings defaulted in chcore.h). */ -/*===========================================================================*/ +#pragma once -#endif /* CHCONF_H */ +#define CH_CFG_ST_TIMEDELTA 0 -/** @} */ +#include_next \ No newline at end of file diff --git a/platforms/chibios/boards/GENERIC_CM32_M101A/configs/halconf.h b/platforms/chibios/boards/GENERIC_CM32_M101A/configs/halconf.h deleted file mode 100644 index c80f67ee27c1..000000000000 --- a/platforms/chibios/boards/GENERIC_CM32_M101A/configs/halconf.h +++ /dev/null @@ -1,531 +0,0 @@ -/* - ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -/** - * @file templates/halconf.h - * @brief HAL configuration header. - * @details HAL configuration file, this file allows to enable or disable the - * various device drivers from your application. You may also use - * this file in order to override the device drivers default settings. - * - * @addtogroup HAL_CONF - * @{ - */ - -#ifndef HALCONF_H -#define HALCONF_H - -#define _CHIBIOS_HAL_CONF_ -#define _CHIBIOS_HAL_CONF_VER_7_1_ - -#include - -/** - * @brief Enables the PAL subsystem. - */ -#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__) -#define HAL_USE_PAL TRUE -#endif - -/** - * @brief Enables the ADC subsystem. - */ -#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__) -#define HAL_USE_ADC FALSE -#endif - -/** - * @brief Enables the CAN subsystem. - */ -#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__) -#define HAL_USE_CAN FALSE -#endif - -/** - * @brief Enables the cryptographic subsystem. - */ -#if !defined(HAL_USE_CRY) || defined(__DOXYGEN__) -#define HAL_USE_CRY FALSE -#endif - -/** - * @brief Enables the DAC subsystem. - */ -#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__) -#define HAL_USE_DAC FALSE -#endif - -/** - * @brief Enables the EFlash subsystem. - */ -#if !defined(HAL_USE_EFL) || defined(__DOXYGEN__) -#define HAL_USE_EFL FALSE -#endif - -/** - * @brief Enables the GPT subsystem. - */ -#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__) -#define HAL_USE_GPT FALSE -#endif - -/** - * @brief Enables the I2C subsystem. - */ -#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__) -#define HAL_USE_I2C FALSE -#endif - -/** - * @brief Enables the I2S subsystem. - */ -#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__) -#define HAL_USE_I2S FALSE -#endif - -/** - * @brief Enables the ICU subsystem. - */ -#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__) -#define HAL_USE_ICU FALSE -#endif - -/** - * @brief Enables the MAC subsystem. - */ -#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__) -#define HAL_USE_MAC FALSE -#endif - -/** - * @brief Enables the MMC_SPI subsystem. - */ -#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__) -#define HAL_USE_MMC_SPI FALSE -#endif - -/** - * @brief Enables the PWM subsystem. - */ -#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__) -#define HAL_USE_PWM FALSE -#endif - -/** - * @brief Enables the RTC subsystem. - */ -#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__) -#define HAL_USE_RTC FALSE -#endif - -/** - * @brief Enables the SDC subsystem. - */ -#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__) -#define HAL_USE_SDC FALSE -#endif - -/** - * @brief Enables the SERIAL subsystem. - */ -#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__) -#define HAL_USE_SERIAL FALSE -#endif - -/** - * @brief Enables the SERIAL over USB subsystem. - */ -#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__) -#define HAL_USE_SERIAL_USB FALSE -#endif - -/** - * @brief Enables the SIO subsystem. - */ -#if !defined(HAL_USE_SIO) || defined(__DOXYGEN__) -#define HAL_USE_SIO FALSE -#endif - -/** - * @brief Enables the SPI subsystem. - */ -#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__) -#define HAL_USE_SPI FALSE -#endif - -/** - * @brief Enables the TRNG subsystem. - */ -#if !defined(HAL_USE_TRNG) || defined(__DOXYGEN__) -#define HAL_USE_TRNG FALSE -#endif - -/** - * @brief Enables the UART subsystem. - */ -#if !defined(HAL_USE_UART) || defined(__DOXYGEN__) -#define HAL_USE_UART FALSE -#endif - -/** - * @brief Enables the USB subsystem. - */ -#if !defined(HAL_USE_USB) || defined(__DOXYGEN__) -#define HAL_USE_USB TRUE -#endif - -/** - * @brief Enables the WDG subsystem. - */ -#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__) -#define HAL_USE_WDG FALSE -#endif - -/** - * @brief Enables the WSPI subsystem. - */ -#if !defined(HAL_USE_WSPI) || defined(__DOXYGEN__) -#define HAL_USE_WSPI FALSE -#endif - -/*===========================================================================*/ -/* PAL driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Enables synchronous APIs. - * @note Disabling this option saves both code and data space. - */ -#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__) -#define PAL_USE_CALLBACKS FALSE -#endif - -/** - * @brief Enables synchronous APIs. - * @note Disabling this option saves both code and data space. - */ -#if !defined(PAL_USE_WAIT) || defined(__DOXYGEN__) -#define PAL_USE_WAIT FALSE -#endif - -/*===========================================================================*/ -/* ADC driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Enables synchronous APIs. - * @note Disabling this option saves both code and data space. - */ -#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__) -#define ADC_USE_WAIT TRUE -#endif - -/** - * @brief Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs. - * @note Disabling this option saves both code and data space. - */ -#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__) -#define ADC_USE_MUTUAL_EXCLUSION TRUE -#endif - -/*===========================================================================*/ -/* CAN driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Sleep mode related APIs inclusion switch. - */ -#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__) -#define CAN_USE_SLEEP_MODE TRUE -#endif - -/** - * @brief Enforces the driver to use direct callbacks rather than OSAL events. - */ -#if !defined(CAN_ENFORCE_USE_CALLBACKS) || defined(__DOXYGEN__) -#define CAN_ENFORCE_USE_CALLBACKS FALSE -#endif - -/*===========================================================================*/ -/* CRY driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Enables the SW fall-back of the cryptographic driver. - * @details When enabled, this option, activates a fall-back software - * implementation for algorithms not supported by the underlying - * hardware. - * @note Fall-back implementations may not be present for all algorithms. - */ -#if !defined(HAL_CRY_USE_FALLBACK) || defined(__DOXYGEN__) -#define HAL_CRY_USE_FALLBACK FALSE -#endif - -/** - * @brief Makes the driver forcibly use the fall-back implementations. - */ -#if !defined(HAL_CRY_ENFORCE_FALLBACK) || defined(__DOXYGEN__) -#define HAL_CRY_ENFORCE_FALLBACK FALSE -#endif - -/*===========================================================================*/ -/* DAC driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Enables synchronous APIs. - * @note Disabling this option saves both code and data space. - */ -#if !defined(DAC_USE_WAIT) || defined(__DOXYGEN__) -#define DAC_USE_WAIT TRUE -#endif - -/** - * @brief Enables the @p dacAcquireBus() and @p dacReleaseBus() APIs. - * @note Disabling this option saves both code and data space. - */ -#if !defined(DAC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__) -#define DAC_USE_MUTUAL_EXCLUSION TRUE -#endif - -/*===========================================================================*/ -/* I2C driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Enables the mutual exclusion APIs on the I2C bus. - */ -#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__) -#define I2C_USE_MUTUAL_EXCLUSION TRUE -#endif - -/*===========================================================================*/ -/* MAC driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Enables the zero-copy API. - */ -#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__) -#define MAC_USE_ZERO_COPY FALSE -#endif - -/** - * @brief Enables an event sources for incoming packets. - */ -#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__) -#define MAC_USE_EVENTS TRUE -#endif - -/*===========================================================================*/ -/* MMC_SPI driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Delays insertions. - * @details If enabled this options inserts delays into the MMC waiting - * routines releasing some extra CPU time for the threads with - * lower priority, this may slow down the driver a bit however. - * This option is recommended also if the SPI driver does not - * use a DMA channel and heavily loads the CPU. - */ -#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__) -#define MMC_NICE_WAITING TRUE -#endif - -/*===========================================================================*/ -/* SDC driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Number of initialization attempts before rejecting the card. - * @note Attempts are performed at 10mS intervals. - */ -#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__) -#define SDC_INIT_RETRY 100 -#endif - -/** - * @brief Include support for MMC cards. - * @note MMC support is not yet implemented so this option must be kept - * at @p FALSE. - */ -#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__) -#define SDC_MMC_SUPPORT FALSE -#endif - -/** - * @brief Delays insertions. - * @details If enabled this options inserts delays into the MMC waiting - * routines releasing some extra CPU time for the threads with - * lower priority, this may slow down the driver a bit however. - */ -#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__) -#define SDC_NICE_WAITING TRUE -#endif - -/** - * @brief OCR initialization constant for V20 cards. - */ -#if !defined(SDC_INIT_OCR_V20) || defined(__DOXYGEN__) -#define SDC_INIT_OCR_V20 0x50FF8000U -#endif - -/** - * @brief OCR initialization constant for non-V20 cards. - */ -#if !defined(SDC_INIT_OCR) || defined(__DOXYGEN__) -#define SDC_INIT_OCR 0x80100000U -#endif - -/*===========================================================================*/ -/* SERIAL driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Default bit rate. - * @details Configuration parameter, this is the baud rate selected for the - * default configuration. - */ -#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__) -#define SERIAL_DEFAULT_BITRATE 38400 -#endif - -/** - * @brief Serial buffers size. - * @details Configuration parameter, you can change the depth of the queue - * buffers depending on the requirements of your application. - * @note The default is 16 bytes for both the transmission and receive - * buffers. - */ -#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__) -#define SERIAL_BUFFERS_SIZE 128 -#endif - -/*===========================================================================*/ -/* SERIAL_USB driver related setting. */ -/*===========================================================================*/ - -/** - * @brief Serial over USB buffers size. - * @details Configuration parameter, the buffer size must be a multiple of - * the USB data endpoint maximum packet size. - * @note The default is 256 bytes for both the transmission and receive - * buffers. - */ -#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__) -#define SERIAL_USB_BUFFERS_SIZE 1 -#endif - -/** - * @brief Serial over USB number of buffers. - * @note The default is 2 buffers. - */ -#if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__) -#define SERIAL_USB_BUFFERS_NUMBER 2 -#endif - -/*===========================================================================*/ -/* SPI driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Enables synchronous APIs. - * @note Disabling this option saves both code and data space. - */ -#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__) -#define SPI_USE_WAIT TRUE -#endif - -/** - * @brief Enables circular transfers APIs. - * @note Disabling this option saves both code and data space. - */ -#if !defined(SPI_USE_CIRCULAR) || defined(__DOXYGEN__) -#define SPI_USE_CIRCULAR FALSE -#endif - -/** - * @brief Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs. - * @note Disabling this option saves both code and data space. - */ -#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__) -#define SPI_USE_MUTUAL_EXCLUSION TRUE -#endif - -/** - * @brief Handling method for SPI CS line. - * @note Disabling this option saves both code and data space. - */ -#if !defined(SPI_SELECT_MODE) || defined(__DOXYGEN__) -#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD -#endif - -/*===========================================================================*/ -/* UART driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Enables synchronous APIs. - * @note Disabling this option saves both code and data space. - */ -#if !defined(UART_USE_WAIT) || defined(__DOXYGEN__) -#define UART_USE_WAIT FALSE -#endif - -/** - * @brief Enables the @p uartAcquireBus() and @p uartReleaseBus() APIs. - * @note Disabling this option saves both code and data space. - */ -#if !defined(UART_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__) -#define UART_USE_MUTUAL_EXCLUSION FALSE -#endif - -/*===========================================================================*/ -/* USB driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Enables synchronous APIs. - * @note Disabling this option saves both code and data space. - */ -#if !defined(USB_USE_WAIT) || defined(__DOXYGEN__) -#define USB_USE_WAIT TRUE -#endif - -/*===========================================================================*/ -/* WSPI driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Enables synchronous APIs. - * @note Disabling this option saves both code and data space. - */ -#if !defined(WSPI_USE_WAIT) || defined(__DOXYGEN__) -#define WSPI_USE_WAIT TRUE -#endif - -/** - * @brief Enables the @p wspiAcquireBus() and @p wspiReleaseBus() APIs. - * @note Disabling this option saves both code and data space. - */ -#if !defined(WSPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__) -#define WSPI_USE_MUTUAL_EXCLUSION TRUE -#endif - -#endif /* HALCONF_H */ - -/** @} */ diff --git a/platforms/chibios/chibios_config.h b/platforms/chibios/chibios_config.h index c19e9b1d99ae..5edc2dc7ea2e 100644 --- a/platforms/chibios/chibios_config.h +++ b/platforms/chibios/chibios_config.h @@ -80,8 +80,19 @@ # define CPU_CLOCK AIR32_SYSCLK # if defined(AIR32F10x) +# define USE_GPIOV1 +# define USE_I2CV1 # define PAL_MODE_ALTERNATE_OPENDRAIN PAL_MODE_AIR32_ALTERNATE_OPENDRAIN # define PAL_MODE_ALTERNATE_PUSHPULL PAL_MODE_AIR32_ALTERNATE_PUSHPULL +# define STM32_DMA_STREAM(stream) AIR32_DMA_STREAM(stream) +# define STM32_DMA_STREAM_ID(peripheral, channel) AIR32_DMA_STREAM_ID(peripheral, channel) +# define STM32_DMA_CR_DIR_M2P AIR32_DMA_CR_DIR_M2P +# define STM32_DMA_CR_PSIZE_WORD AIR32_DMA_CR_PSIZE_WORD +# define STM32_DMA_CR_MSIZE_WORD AIR32_DMA_CR_MSIZE_WORD +# define STM32_DMA_CR_MINC AIR32_DMA_CR_MINC +# define STM32_DMA_CR_CIRC AIR32_DMA_CR_CIRC +# define STM32_DMA_CR_PL AIR32_DMA_CR_PL +# define STM32_DMA_CR_CHSEL AIR32_DMA_CR_CHSEL # endif #endif diff --git a/platforms/chibios/flash_stm32.c b/platforms/chibios/flash_stm32.c index aa5f3060ab21..192593c61d6e 100644 --- a/platforms/chibios/flash_stm32.c +++ b/platforms/chibios/flash_stm32.c @@ -19,7 +19,7 @@ #include #include "flash_stm32.h" -#if defined(STM32F1XX) || defined(AIR32F10x) +#if defined(STM32F1XX) # define FLASH_SR_WRPERR FLASH_SR_WRPRTERR #endif @@ -66,6 +66,12 @@ static uint8_t ADDR2PAGE(uint32_t Page_Address) { } #endif +#if defined(AIR32F10x) +# define FLASH_SR_WRPERR FLASH_SR_WRPRTERR +# define FLASH_KEY1 0x45670123U +# define FLASH_KEY2 0xCDEF89ABU +#endif + /* Delay definition */ #define EraseTimeout ((uint32_t)0x00000FFF) #define ProgramTimeout ((uint32_t)0x0000001F)