djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8043 from hyx0329/m60-tweak 

Makerdiary M60 keyboard: allow run on battery
This commit is contained in:
Scott Shawcroft 2023-05-30 10:49:12 -07:00 committed by GitHub
parent 7d77f34ae9 d73f390a4d
commit bf67ea3640
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ports/nrf/boards/makerdiary_m60_keyboard/board.c
View File

@ -25,6 +25,39 @@
*/ */
#include "supervisor/board.h" #include "supervisor/board.h"
#include "supervisor/shared/board.h"
#include "mpconfigboard.h"
static void power_on(void) {
// turn on internal battery
nrf_gpio_cfg(POWER_SWITCH_PIN->number,
NRF_GPIO_PIN_DIR_OUTPUT,
NRF_GPIO_PIN_INPUT_DISCONNECT,
NRF_GPIO_PIN_NOPULL,
NRF_GPIO_PIN_S0S1,
NRF_GPIO_PIN_NOSENSE);
nrf_gpio_pin_write(POWER_SWITCH_PIN->number, true);
}
static void preserve_and_release_battery_pin(void) {
// Preserve the battery state. The battery is enabled by default in factory bootloader.
// Reset claimed_pins so user can control pin's state in the vm.
// The code below doesn't actually reset the pin's state, but only set the flags.
reset_pin_number(POWER_SWITCH_PIN->number); // clear claimed_pins and never_reset_pins
never_reset_pin_number(POWER_SWITCH_PIN->number); // set never_reset_pins
}
void board_init(void) {
// As of cpy 8.1.0, board_init() runs after reset_ports() on first run. That means
// never_reset_pins won't be set at boot, the battery pin is reset, causing system
// shutdown.
// So if we need to run on battery, we must enable the battery here.
power_on();
preserve_and_release_battery_pin();
}
void reset_board(void) {
preserve_and_release_battery_pin();
}
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here. // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

2
ports/nrf/boards/makerdiary_m60_keyboard/mpconfigboard.h
View File

@ -49,3 +49,5 @@
#define DEFAULT_I2C_BUS_SCL (&pin_P1_06) #define DEFAULT_I2C_BUS_SCL (&pin_P1_06)
#define DEFAULT_I2C_BUS_SDA (&pin_P1_05) #define DEFAULT_I2C_BUS_SDA (&pin_P1_05)
#define POWER_SWITCH_PIN (&pin_P0_28)

1
ports/nrf/boards/makerdiary_m60_keyboard/pins.c
View File

@ -39,6 +39,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR_CHARGING), MP_ROM_PTR(&pin_P0_03) }, { MP_ROM_QSTR(MP_QSTR_CHARGING), MP_ROM_PTR(&pin_P0_03) },
{ MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_P0_02) }, { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_P0_02) },
{ MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_P0_02) }, { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_P0_02) },
{ MP_ROM_QSTR(MP_QSTR_BATTERY_ENABLE), MP_ROM_PTR(&pin_P0_28) },
{ MP_ROM_QSTR(MP_QSTR_RGB_POWER), MP_ROM_PTR(&pin_P1_04) }, { MP_ROM_QSTR(MP_QSTR_RGB_POWER), MP_ROM_PTR(&pin_P1_04) },