feat(endpoints): add "no endpoint" value (#3140)

feat(endpoints): add "no endpoint" value

This adds ZMK_TRANSPORT_NONE, which can be set as the preferred
endpoint transport if you wish to prevent the keyboard from sending any
output. More usefully, it also is used to indicate that the preferred
endpoint is not available and it could not fall back to an available
one. To go along with this, many endpoint functions are renamed for
consistency, and a few new functions are added:

- zmk_endpoint_get_preferred_transport() returns the value that was set
  with zmk_endpoint_set_preferred_transport().

- zmk_endpoint_get_preferred() returns the endpoint that will be used
  if it is available. This endpoint always has the same transport as
  zmk_endpoint_get_preferred_transport().

- zmk_endpoint_is_connected() is a shortcut to check if the keyboard is
  actually connected to an endpoint.

This change is based on #2572 but without the option to disable endpoint
fallback. It does refactor code to allow adding that feature later.

fix(endpoints): Add endpoint setting upgrade

Adding ZMK_TRANSPORT_NONE at the start of enum zmk_transport results in
the preferred transport setting no longer representing the same values
when it is saved with earlier firmware and loaded with newer firmware.

To fix this, the "endpoints/preferred" setting is now deprecated and
replaced by "endpoints/preferred2". If the old setting is present, it
is interpreted as the old enum type, upgraded to the new type, and saved
immediately to the new setting. The old setting is then deleted.

To avoid this happening again in the future, enum zmk_transport now has
explicit values assigned to identifier, and a comment is also added to
explain that existing values must not be changed.

fix: Set default transport according to enabled transports

The default value for preferred_transport is now set to USB only if
CONFIG_ZMK_USB is enabled. If not, it falls back to BLE if
CONFIG_ZMK_BLE is enabled, then to "none" if nothing is enabled.
This commit is contained in:
Joel Spadin
2026-02-12 00:51:42 -06:00
committed by GitHub
parent ac7f75b859
commit 6e7e0de2b6
14 changed files with 289 additions and 94 deletions

View File

@@ -14,6 +14,8 @@
*/
#define ZMK_ENDPOINT_STR_LEN 10
#define ZMK_ENDPOINT_NONE_COUNT 1
#ifdef CONFIG_ZMK_USB
#define ZMK_ENDPOINT_USB_COUNT 1
#else
@@ -33,7 +35,8 @@
* Note that this value may change between firmware versions, so it should not
* be used in any persistent storage.
*/
#define ZMK_ENDPOINT_COUNT (ZMK_ENDPOINT_USB_COUNT + ZMK_ENDPOINT_BLE_COUNT)
#define ZMK_ENDPOINT_COUNT \
(ZMK_ENDPOINT_NONE_COUNT + ZMK_ENDPOINT_USB_COUNT + ZMK_ENDPOINT_BLE_COUNT)
bool zmk_endpoint_instance_eq(struct zmk_endpoint_instance a, struct zmk_endpoint_instance b);
@@ -57,21 +60,53 @@ int zmk_endpoint_instance_to_str(struct zmk_endpoint_instance endpoint, char *st
int zmk_endpoint_instance_to_index(struct zmk_endpoint_instance endpoint);
/**
* Sets the preferred endpoint transport to use. (If the preferred endpoint is
* not available, a different one may automatically be selected.)
* Sets the preferred endpoint transport to use.
*
* If the preferred endpoint is not available, zmk_endpoint_get_selected() may
* automatically fall back to another transport.
*/
int zmk_endpoints_select_transport(enum zmk_transport transport);
int zmk_endpoints_toggle_transport(void);
int zmk_endpoint_set_preferred_transport(enum zmk_transport transport);
enum zmk_transport zmk_endpoint_get_preferred_transport(void);
/**
* Gets the currently-selected endpoint.
* If the preferred endpoint transport is USB, sets it to BLE, else sets it to USB.
*/
struct zmk_endpoint_instance zmk_endpoints_selected(void);
int zmk_endpoint_toggle_preferred_transport(void);
int zmk_endpoints_send_report(uint16_t usage_page);
/**
* Gets the endpoint instance that will be preferred if it is connected.
*/
struct zmk_endpoint_instance zmk_endpoint_get_preferred(void);
/**
* Gets the endpoint instance that is currently in use.
*
* This may differ from zmk_endpoint_get_preferred(), for example if the preferred
* endpoint is not connected, then this will return an instance for ZMK_TRANSPORT_NONE.
*/
struct zmk_endpoint_instance zmk_endpoint_get_selected(void);
/**
* Returns whether the keyboard is connected to an endpoint.
*
* This is equivalent to zmk_endpoint_get_selected().transport != ZMK_TRANSPORT_NONE
*/
bool zmk_endpoint_is_connected(void);
/**
* Sends the HID report for the given usage page to the selected endpoint.
*/
int zmk_endpoint_send_report(uint16_t usage_page);
#if IS_ENABLED(CONFIG_ZMK_POINTING)
int zmk_endpoints_send_mouse_report();
/**
* Sends the HID mouse report to the selected endpoint.
*/
int zmk_endpoint_send_mouse_report();
#endif // IS_ENABLED(CONFIG_ZMK_POINTING)
void zmk_endpoints_clear_current(void);
/**
* Clears all HID reports for the selected endpoint.
*/
void zmk_endpoint_clear_reports(void);

View File

@@ -8,10 +8,12 @@
/**
* The method by which data is sent.
* @note This type is used in settings. Do not modify existing values.
*/
enum zmk_transport {
ZMK_TRANSPORT_USB,
ZMK_TRANSPORT_BLE,
ZMK_TRANSPORT_NONE = 0,
ZMK_TRANSPORT_USB = 1,
ZMK_TRANSPORT_BLE = 2,
};
/**