Fixup EFL and F4's sector selection. (#19221)
Nick Brassel
GitHub
parent
f98a7e8ffe
commit
cf3c26533c
|
|
@ -230,7 +230,7 @@ else
|
|||
# Wear-leveling EEPROM implementation, backed by MCU flash
|
||||
OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
|
||||
SRC += eeprom_driver.c eeprom_wear_leveling.c
|
||||
WEAR_LEVELING_DRIVER = embedded_flash
|
||||
WEAR_LEVELING_DRIVER ?= embedded_flash
|
||||
else ifneq ($(filter $(MCU_SERIES),STM32L0xx STM32L1xx),)
|
||||
# True EEPROM on STM32L0xx, L1xx
|
||||
OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_L0_L1
|
||||
|
|
@ -239,7 +239,7 @@ else
|
|||
# Wear-leveling EEPROM implementation, backed by RP2040 flash
|
||||
OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
|
||||
SRC += eeprom_driver.c eeprom_wear_leveling.c
|
||||
WEAR_LEVELING_DRIVER = rp2040_flash
|
||||
WEAR_LEVELING_DRIVER ?= rp2040_flash
|
||||
else ifneq ($(filter $(MCU_SERIES),KL2x K20x),)
|
||||
# Teensy EEPROM implementations
|
||||
OPT_DEFS += -DEEPROM_KINETIS_FLEXRAM
|
||||
|
|
|
|||
|
|
@ -14,25 +14,8 @@
|
|||
* 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>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* Copyright 2019
|
||||
/* Copyright 2021 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
|
||||
|
|
@ -25,3 +25,7 @@
|
|||
#define ADC_PIN A0
|
||||
|
||||
#define RGB_CI_PIN A2
|
||||
|
||||
#define SOLENOID_PIN B12
|
||||
#define SOLENOID_PINS { B12, B13, B14, B15 }
|
||||
#define SOLENOID_PINS_ACTIVE_STATE { high, high, low }
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* Copyright 2020 QMK
|
||||
/* Copyright 2021 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
|
||||
|
|
@ -14,11 +14,6 @@
|
|||
* 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_ADC TRUE
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* Copyright 2020 Nick Brassel (tzarc)
|
||||
/* Copyright 2021 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
|
||||
|
|
|
|||
|
|
@ -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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#define CH_CFG_ST_FREQUENCY 10000
|
||||
|
||||
#include_next <chconf.h>
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
/* Copyright 2021 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/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "config_common.h"
|
||||
|
||||
#define BACKLIGHT_PWM_DRIVER PWMD5
|
||||
#define BACKLIGHT_PWM_CHANNEL 1
|
||||
#define BACKLIGHT_PAL_MODE 2
|
||||
|
||||
#define ADC_PIN A0
|
||||
|
||||
#define RGB_CI_PIN A2
|
||||
|
||||
#define SOLENOID_PIN B12
|
||||
#define SOLENOID_PINS { B12, B13, B14, B15 }
|
||||
#define SOLENOID_PINS_ACTIVE_STATE { high, high, low }
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
/* Copyright 2021 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/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#define HAL_USE_ADC TRUE
|
||||
|
||||
#define HAL_USE_I2C TRUE
|
||||
|
||||
#define HAL_USE_PWM TRUE
|
||||
|
||||
#include_next <halconf.h>
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
{
|
||||
"keyboard_name": "Onekey Blackpill STM32F401 TinyUF2",
|
||||
"processor": "STM32F401",
|
||||
"bootloader": "tinyuf2",
|
||||
"board": "BLACKPILL_STM32_F401",
|
||||
"matrix_pins": {
|
||||
"cols": ["B0"],
|
||||
"rows": ["A7"]
|
||||
},
|
||||
"backlight": {
|
||||
"pin": "A0"
|
||||
},
|
||||
"rgblight": {
|
||||
"pin": "A1"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
/* Copyright 2021 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 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_ADC_USE_ADC1
|
||||
#define STM32_ADC_USE_ADC1 TRUE
|
||||
|
||||
#undef STM32_I2C_USE_I2C1
|
||||
#define STM32_I2C_USE_I2C1 TRUE
|
||||
|
||||
#undef STM32_PWM_USE_TIM5
|
||||
#define STM32_PWM_USE_TIM5 TRUE
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
# F401 Blackpill onekey
|
||||
|
||||
* Supported Hardware: STM32F401CCU6 WeAct v1.3
|
||||
|
||||
To trigger keypress, short together pins *B0* and *A7*.
|
||||
|
||||
This variant requires the TinyUF2 bootloader to be installed. This can be downloaded from the [tinyuf2 releases page](https://github.com/adafruit/tinyuf2/releases). The F401 blackpill binary works for both F401- and F411-based blackpill devices.
|
||||
|
||||
Double-tap reset to enter bootloader mode. Copy the built uf2 file to the device by dragging the file to the new USB disk.
|
||||
|
|
@ -0,0 +1 @@
|
|||
KEYBOARD_SHARED_EP = yes
|
||||
|
|
@ -14,25 +14,8 @@
|
|||
* 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_f411/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>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* Copyright 2019
|
||||
/* Copyright 2021 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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* Copyright 2020 QMK
|
||||
/* Copyright 2021 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
|
||||
|
|
@ -14,11 +14,6 @@
|
|||
* 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_f411/halconf.h -r platforms/chibios/common/configs/halconf.h`
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#define HAL_USE_ADC TRUE
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* Copyright 2020 Nick Brassel (tzarc)
|
||||
/* Copyright 2021 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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* Copyright 2021 QMK
|
||||
/* 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
|
||||
|
|
|
|||
|
|
@ -25,3 +25,7 @@
|
|||
#define ADC_PIN A0
|
||||
|
||||
#define RGB_CI_PIN A2
|
||||
|
||||
#define SOLENOID_PIN B12
|
||||
#define SOLENOID_PINS { B12, B13, B14, B15 }
|
||||
#define SOLENOID_PINS_ACTIVE_STATE { high, high, low }
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
// Copyright 2018-2022 Nick Brassel (@tzarc)
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||
#pragma once
|
||||
|
||||
#define DEBUG_EEPROM_OUTPUT
|
||||
#define WEAR_LEVELING_DEBUG_OUTPUT
|
||||
|
|
@ -0,0 +1,65 @@
|
|||
// Copyright 2018-2022 Nick Brassel (@tzarc)
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
LAYOUT_ortho_1x1(QK_BOOT)
|
||||
};
|
||||
|
||||
#ifdef DEBUG_EEPROM_OUTPUT
|
||||
|
||||
# ifdef WEAR_LEVELING_ENABLE
|
||||
# include "wear_leveling.h"
|
||||
# endif // WEAR_LEVELING_ENABLE
|
||||
|
||||
uint8_t prng(void) {
|
||||
static uint8_t s = 0xAA, a = 0;
|
||||
s ^= s << 3;
|
||||
s ^= s >> 5;
|
||||
s ^= a++ >> 2;
|
||||
return s;
|
||||
}
|
||||
|
||||
void keyboard_post_init_user(void) {
|
||||
debug_enable = true;
|
||||
debug_matrix = true;
|
||||
debug_keyboard = true;
|
||||
}
|
||||
|
||||
void matrix_scan_user(void) {
|
||||
static uint32_t last_eeprom_access = 0;
|
||||
uint32_t now = timer_read32();
|
||||
if (now - last_eeprom_access > 5000) {
|
||||
dprint("reading eeprom\n");
|
||||
last_eeprom_access = now;
|
||||
|
||||
union {
|
||||
uint8_t bytes[4];
|
||||
uint32_t raw;
|
||||
} tmp;
|
||||
extern uint8_t prng(void);
|
||||
tmp.bytes[0] = prng();
|
||||
tmp.bytes[1] = prng();
|
||||
tmp.bytes[2] = prng();
|
||||
tmp.bytes[3] = prng();
|
||||
|
||||
eeconfig_update_user(tmp.raw);
|
||||
uint32_t value = eeconfig_read_user();
|
||||
if (value != tmp.raw) {
|
||||
dprint("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
|
||||
dprint("!! EEPROM readback mismatch!\n");
|
||||
dprint("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
|
||||
}
|
||||
}
|
||||
|
||||
# ifdef WEAR_LEVELING_ENABLE
|
||||
static uint32_t last_wear_leveling_init = 0;
|
||||
if (now - last_wear_leveling_init > 30000) {
|
||||
dprint("init'ing wear-leveling\n");
|
||||
last_wear_leveling_init = now;
|
||||
wear_leveling_init();
|
||||
}
|
||||
# endif // WEAR_LEVELING_ENABLE
|
||||
}
|
||||
|
||||
#endif // DEBUG_EEPROM_OUTPUT
|
||||
|
|
@ -0,0 +1 @@
|
|||
CONSOLE_ENABLE = yes
|
||||
|
|
@ -28,3 +28,13 @@
|
|||
#ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
|
||||
# define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
|
||||
#endif
|
||||
|
||||
#ifdef WEAR_LEVELING_EMBEDDED_FLASH
|
||||
# ifndef WEAR_LEVELING_EFL_FIRST_SECTOR
|
||||
# ifdef BOOTLOADER_TINYUF2
|
||||
# define WEAR_LEVELING_EFL_FIRST_SECTOR 3
|
||||
# else
|
||||
# define WEAR_LEVELING_EFL_FIRST_SECTOR 1
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -28,3 +28,13 @@
|
|||
#ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
|
||||
# define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
|
||||
#endif
|
||||
|
||||
#ifdef WEAR_LEVELING_EMBEDDED_FLASH
|
||||
# ifndef WEAR_LEVELING_EFL_FIRST_SECTOR
|
||||
# ifdef BOOTLOADER_TINYUF2
|
||||
# define WEAR_LEVELING_EFL_FIRST_SECTOR 3
|
||||
# else
|
||||
# define WEAR_LEVELING_EFL_FIRST_SECTOR 1
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -20,3 +20,13 @@
|
|||
#ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
|
||||
# define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
|
||||
#endif
|
||||
|
||||
#ifdef WEAR_LEVELING_EMBEDDED_FLASH
|
||||
# ifndef WEAR_LEVELING_EFL_FIRST_SECTOR
|
||||
# ifdef BOOTLOADER_TINYUF2
|
||||
# define WEAR_LEVELING_EFL_FIRST_SECTOR 3
|
||||
# else
|
||||
# define WEAR_LEVELING_EFL_FIRST_SECTOR 1
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -20,3 +20,13 @@
|
|||
#ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
|
||||
# define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
|
||||
#endif
|
||||
|
||||
#ifdef WEAR_LEVELING_EMBEDDED_FLASH
|
||||
# ifndef WEAR_LEVELING_EFL_FIRST_SECTOR
|
||||
# ifdef BOOTLOADER_TINYUF2
|
||||
# define WEAR_LEVELING_EFL_FIRST_SECTOR 3
|
||||
# else
|
||||
# define WEAR_LEVELING_EFL_FIRST_SECTOR 1
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ static flash_sector_t first_sector = UINT16_MAX;
|
|||
static flash_sector_t sector_count = UINT16_MAX;
|
||||
static BaseFlash * flash;
|
||||
|
||||
#ifndef WEAR_LEVELING_EFL_FIRST_SECTOR
|
||||
// "Automatic" detection of the flash size -- ideally ChibiOS would have this already, but alas, it doesn't.
|
||||
static inline uint32_t detect_flash_size(void) {
|
||||
#if defined(WEAR_LEVELING_EFL_FLASH_SIZE)
|
||||
|
|
@ -37,7 +36,6 @@ static inline uint32_t detect_flash_size(void) {
|
|||
return 0;
|
||||
#endif
|
||||
}
|
||||
#endif // WEAR_LEVELING_EFL_FIRST_SECTOR
|
||||
|
||||
bool backing_store_init(void) {
|
||||
bs_dprintf("Init\n");
|
||||
|
|
@ -48,6 +46,7 @@ bool backing_store_init(void) {
|
|||
|
||||
const flash_descriptor_t *desc = flashGetDescriptor(flash);
|
||||
uint32_t counter = 0;
|
||||
uint32_t flash_size = detect_flash_size();
|
||||
|
||||
#if defined(WEAR_LEVELING_EFL_FIRST_SECTOR)
|
||||
|
||||
|
|
@ -68,7 +67,6 @@ bool backing_store_init(void) {
|
|||
#else // defined(WEAR_LEVELING_EFL_FIRST_SECTOR)
|
||||
|
||||
// Work out how many sectors we want to use, working backwards from the end of the flash
|
||||
uint32_t flash_size = detect_flash_size();
|
||||
flash_sector_t last_sector = desc->sectors_count;
|
||||
for (flash_sector_t i = 0; i < desc->sectors_count; ++i) {
|
||||
first_sector = desc->sectors_count - i - 1;
|
||||
|
|
|
|||
Loading…
Reference in New Issue