clockworkpi/PicoCalc
1
0
Fork 0
mirror of https://github.com/clockworkpi/PicoCalc.git synced 2025-12-12 18:28:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

sd_boot: move readboot logic to bootloader.

Browse Source
This commit is contained in:
Yatao Li 2025-06-15 18:36:30 +08:00
parent fa3ad399d7
commit 7f62e15f55
3 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Code/pico_multi_booter/sd_boot/i2ckbd/i2ckbd.c
View File

@ -83,25 +83,3 @@ int read_battery() {
}
return -1;
}
int read_bootmode() {
int retval;
unsigned char msg[2];
msg[0] = 0x0e; // REG_ID_BOOT
if (i2c_inited == 0) return -1;
retval = i2c_write_timeout_us(I2C_KBD_MOD, I2C_KBD_ADDR, msg, 1, false, 500000);
if (retval == PICO_ERROR_GENERIC || retval == PICO_ERROR_TIMEOUT) {
DEBUG_PRINT("Boot I2C write err\n");
return -1;
}
sleep_ms(16);
retval = i2c_read_timeout_us(I2C_KBD_MOD, I2C_KBD_ADDR, (unsigned char *) msg, 2, false, 500000);
if (retval == PICO_ERROR_GENERIC || retval == PICO_ERROR_TIMEOUT || msg[0] != 0x0e) {
DEBUG_PRINT("Boot I2C read err\n");
return -1;
}
return msg[1];
}

1
Code/pico_multi_booter/sd_boot/i2ckbd/i2ckbd.h
View File

@ -16,7 +16,6 @@
void init_i2c_kbd();
int read_i2c_kbd();
int read_battery();
int read_bootmode();
#define bitRead(value, bit) (((value) >> (bit)) & 0x01)
#define bitClear(value, bit) ((value) &= ~(1 << (bit)))

21
Code/pico_multi_booter/sd_boot/main.c
View File

@ -314,6 +314,27 @@ void final_selection_callback(const char *path)
load_firmware_by_path(path);
}
int read_bootmode()
{
int key = keypad_get_key();
int _x;
DEBUG_PRINT("read_bootmode key = %d\n", key);
while((_x = keypad_get_key()) > 0) {
// drain the keypad input buffer
DEBUG_PRINT("read_bootmode subsequent key = %d\n", _x);
}
int bootmode = 0; // Default boot mode
if (key == KEY_ARROW_UP)
{
bootmode = 1; // SD card boot mode
}
else if (key == KEY_ARROW_DOWN)
{
bootmode = 2; // Firmware update mode
}
return bootmode;
}
int main()
{
uint32_t cur_time,last_time=0;