Skip to content

remove reboot while switching endpoints #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jroopam wants to merge 1 commit into
base: keychron_bpro
Choose a base branch
from
Draft

remove reboot while switching endpoints #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 2 additions & 69 deletions app/src/behaviors/behavior_outputs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,51 +57,15 @@ static int on_keymap_binding_pressed(struct zmk_behavior_binding *binding,
LOG_ERR("out ble");
reset_led_power_on();
hardware_select_transport = ZMK_TRANSPORT_BLE;
// nrf_power_gpregret_set(NRF_POWER,REBOOT_ENDPOINT_BLE);
// if(zmk_usb_is_powered()) return 0;
uint8_t type = nrf_power_gpregret_get(NRF_POWER);
LOG_DBG("reboot type:%02x", type);
if (type == REBOOT_ENDPOINT_BLE)
{
// bt_24g_switch_pulldown(0);
zmk_endpoints_select_transport(ZMK_TRANSPORT_BLE);

}
else
{
nrf_power_gpregret_set(NRF_POWER,REBOOT_ENDPOINT_BLE);
LOG_ERR("set:%x",REBOOT_ENDPOINT_BLE);
LOG_DBG("REBOOT");

k_msleep(200);
sys_reboot(REBOOT_ENDPOINT_BLE);
}
zmk_endpoints_select_transport(ZMK_TRANSPORT_BLE);
return 0;
}
case OUT_24G:
{
LOG_ERR("out 24g");
reset_led_power_on();
hardware_select_transport = ZMK_TRANSPORT_24G;
// nrf_power_gpregret_set(NRF_POWER,REBOOT_ENDPOINT_24G);
// if(zmk_usb_is_powered()) return 0;
uint8_t type = nrf_power_gpregret_get(NRF_POWER);

LOG_DBG("reboot type:%02x", type);
if (type == REBOOT_ENDPOINT_24G)
{
// bt_24g_switch_pulldown(1);
zmk_endpoints_select_transport(ZMK_TRANSPORT_24G);

}
else
{
nrf_power_gpregret_set(NRF_POWER,REBOOT_ENDPOINT_24G);
LOG_ERR("set:%x",REBOOT_ENDPOINT_24G);
LOG_DBG("REBOOT");
k_msleep(200);
sys_reboot(REBOOT_ENDPOINT_24G);
}
zmk_endpoints_select_transport(ZMK_TRANSPORT_24G);
return 0;
}
case OUT_CHG:
Expand Down Expand Up @@ -151,39 +115,8 @@ static int on_keymap_binding_released(struct zmk_behavior_binding *binding,
case OUT_USB:
break;
case OUT_BLE:
LOG_ERR("switch off:%d",binding->param1);
zmk_ble_endpoint_disconnect();
if(zmk_usb_is_powered()&&get_mode_status()==0x03)
{
hardware_select_transport=ZMK_TRANSPORT_USB;
reset_led_power_on();
zmk_endpoints_select_transport(ZMK_TRANSPORT_USB);
}
else
{
LOG_ERR("select transport none");
zmk_endpoints_select_transport(ZMK_TRANSPORT_NONE);
}
return 0;
case OUT_24G:
LOG_ERR("switch off:%d",binding->param1);
// if(skip_switch_change())
// {
// LOG_ERR("skip");
// return 0;
// }
zmk_24g_endpoint_disconnect();
if(zmk_usb_is_powered()&&get_mode_status()==0x03)
{
hardware_select_transport=ZMK_TRANSPORT_USB;
reset_led_power_on();
zmk_endpoints_select_transport(ZMK_TRANSPORT_USB);
}
else
{
LOG_ERR("select transport none");
zmk_endpoints_select_transport(ZMK_TRANSPORT_NONE);
}
return 0;
// hardware_select_transport=ZMK_TRANSPORT_USB;
// return zmk_endpoints_select_transport(ZMK_TRANSPORT_USB);
Expand Down
11 changes: 1 addition & 10 deletions app/src/endpoints.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,7 @@ static int zmk_endpoints_init(const struct device *_arg) {
}

current_instance.transport =ZMK_TRANSPORT_NONE;//ZMK_TRANSPORT_USB;
preferred_transport = ZMK_TRANSPORT_24G;

return 0;
}
Expand Down Expand Up @@ -452,16 +453,6 @@ static int endpoint_listener(const zmk_event_t *eh) {
keyboad_led_set_onoff(0);
}
}
if(get_hardware_select_transport()==0 && get_mode_status()==3)
{
preferred_transport = ZMK_TRANSPORT_USB;
update_current_endpoint();
}
}
else if(ev->conn_state == ZMK_USB_CONN_NONE)
{
preferred_transport =get_hardware_select_transport();
update_current_endpoint();
}

}
Expand Down