mkbd65/vial-qmk
Watch
1
0
Fork
You've already forked vial-qmk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix rp2040 after merge

Browse source
This commit is contained in:
Ilya Zhuravlev 2022-04-09 22:45:29 -06:00
commit ec3375e040
8 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
builddefs/bootloader.mk
View file

@ -213,6 +213,10 @@ ifeq ($(strip $(BOOTLOADER)), md-boot)
OPT_DEFS += -DBOOTLOADER_MD_BOOT
BOOTLOADER_TYPE = md_boot
endif
ifeq ($(strip $(BOOTLOADER)), RP2040)
OPT_DEFS += -DBOOTLOADER_RP2040
BOOTLOADER_TYPE = RP2040
endif
ifeq ($(strip $(BOOTLOADER_TYPE)),)
$(call CATASTROPHIC_ERROR,Invalid BOOTLOADER,No bootloader specified. Please set an appropriate 'BOOTLOADER' in your keyboard's 'rules.mk' file.)

1
builddefs/common_features.mk
View file

@ -213,6 +213,7 @@ else
SRC += $(PLATFORM_COMMON_DIR)/eeprom_samd.c
SRC += $(PLATFORM_COMMON_DIR)/eeprom.c
else ifeq ($(PLATFORM),PICO_SDK)
OPT_DEFS += -DEEPROM_PICO
SRC += $(PLATFORM_COMMON_DIR)/eeprom.c
SRC += $(PLATFORM_COMMON_DIR)/flash_pico.c
else ifeq ($(PLATFORM),TEST)

2
data/schemas/keyboard.jsonschema
View file

@ -57,7 +57,7 @@
},
"bootloader": {
"type": "string",
"enum": ["atmel-dfu", "bootloadhid", "bootloadHID", "custom", "caterina", "halfkay", "kiibohd", "lufa-dfu", "lufa-ms", "md-boot", "qmk-dfu", "qmk-hid", "stm32-dfu", "stm32duino", "gd32v-dfu", "wb32-dfu", "unknown", "usbasploader", "USBasp", "tinyuf2", "vibl"],
"enum": ["atmel-dfu", "bootloadhid", "bootloadHID", "custom", "caterina", "halfkay", "kiibohd", "lufa-dfu", "lufa-ms", "md-boot", "qmk-dfu", "qmk-hid", "stm32-dfu", "stm32duino", "gd32v-dfu", "wb32-dfu", "unknown", "usbasploader", "USBasp", "tinyuf2", "vibl", "RP2040"],
},
"bootloader_instructions": {
"type": "string",

1
keyboards/vial_example/vial_rp2040/rules.mk
View file

@ -1,6 +1,7 @@
# MCU name
MCU_FAMILY = PICO
MCU_SERIES = RP2040
BOOTLOADER = RP2040
MCU = cortex-m0plus
# Build Options

3
platforms/eeprom.h
View file

@ -48,6 +48,9 @@ void eeprom_update_block(const void *__src, void *__dst, size_t __n);
#elif defined(EEPROM_SAMD)
# include "eeprom_samd.h"
# define TOTAL_EEPROM_BYTE_COUNT (EEPROM_SIZE)
#elif defined(EEPROM_PICO)
# include "eeprom_pico_defs.h"
# define TOTAL_EEPROM_BYTE_COUNT (FEE_DENSITY_BYTES)
#elif defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega16U4__) || defined(__AVR_AT90USB162__) || defined(__AVR_ATtiny85__)
# define TOTAL_EEPROM_BYTE_COUNT 512
#elif defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega32U4__) || defined(__AVR_ATmega328P__) || defined(__AVR_ATmega32A__)

0
platforms/pico/bootloaders/none.c → platforms/pico/bootloaders/RP2040.c
View file

1
platforms/pico/eeprom_pico_defs.h
View file

@ -10,3 +10,4 @@
#define FEE_PAGE_BASE_ADDRESS \
(PICO_FLASH_SIZE_BYTES - FEE_PAGE_SIZE * FEE_PAGE_COUNT)
#define FEE_DENSITY_BYTES (FEE_PAGE_COUNT * FEE_PAGE_SIZE / 2)

9
platforms/pico/suspend.c
View file

@ -85,15 +85,6 @@ void suspend_power_down(void) {
__attribute__((weak)) void matrix_power_up(void) {}
__attribute__((weak)) void matrix_power_down(void) {}
bool suspend_wakeup_condition(void) {
matrix_power_up();
matrix_scan();
matrix_power_down();
for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
if (matrix_get_row(r)) return true;
}
return false;
}
/** \brief run user level code immediately after wakeup
*