pybricks.common.system.info(): Add program_id.

Fixes pybricks/support#2538.

Author: laurensvalk

CHANGELOG.md

@@ -10,6 +10,7 @@
 - Added preliminary BTstack support for EV3 ([pybricks-micropython#405]).
 - Enabled NXT Light Sensor, NXT Touch Sensor, NXT Sound Sensor on NXT.
 - Added `host_connected_usb` to `hub.system.info()` dictionary.
+- Added `program_id` to `hub.system.info()` dictionary ([support#2538]).
 
 ### Changed
 - Make 3D orientation default for heading and drivebase heading control ([support#1962]).
@@ -48,6 +49,7 @@
 [support#2500]: https://github.com/pybricks/support/issues/2500
 [support#2521]: https://github.com/pybricks/support/issues/2521
 [support#2522]: https://github.com/pybricks/support/issues/2522
+[support#2538]: https://github.com/pybricks/support/issues/2538
 [support#2550]: https://github.com/pybricks/support/issues/2550
 [pybricks-micropython#405]: https://github.com/pybricks/pybricks-micropython/pull/405
 [pybricks-micropython#421]: https://github.com/pybricks/pybricks-micropython/pull/421

lib/pbio/include/pbsys/main.h

@@ -76,7 +76,7 @@ typedef struct _pbsys_main_program_t {
 
 #if PBSYS_CONFIG_MAIN
 
-pbsys_main_program_start_request_type_t pbsys_main_program_get_start_request_type(void);
+void pbsys_main_program_get_info(pbio_pybricks_user_program_id_t *id, pbsys_main_program_start_request_type_t *start_type);
 
 /**
  * Requests a program to be started soon.
@@ -154,8 +154,7 @@ const char *pbsys_main_get_application_version_hash(void);
 
 #else // PBSYS_CONFIG_MAIN
 
-static inline pbsys_main_program_start_request_type_t pbsys_main_program_get_start_request_type(void) {
-    return PBSYS_MAIN_PROGRAM_START_REQUEST_TYPE_NONE;
+static inline void pbsys_main_program_get_info(pbio_pybricks_user_program_id_t *id, pbsys_main_program_start_request_type_t *start_type) {
 }
 
 static inline pbio_error_t pbsys_main_program_request_start(pbio_pybricks_user_program_id_t id, pbsys_main_program_start_request_type_t start_request_type) {

lib/pbio/sys/main.c

@@ -38,8 +38,9 @@ bool pbsys_main_program_start_is_requested() {
  * @param [in]  program A pointer to the main program structure.
  * @returns     The type of start request.
  */
-pbsys_main_program_start_request_type_t pbsys_main_program_get_start_request_type(void) {
-    return program.start_request_type;
+void pbsys_main_program_get_info(pbio_pybricks_user_program_id_t *id, pbsys_main_program_start_request_type_t *start_type) {
+    *id = program.id;
+    *start_type = program.start_request_type;
 }
 
 /**

pybricks/common/pb_type_system.c

@@ -43,6 +43,10 @@ static MP_DEFINE_CONST_FUN_OBJ_0(pb_type_System_reset_reason_obj, pb_type_System
 static mp_obj_t pb_type_System_info(void) {
     const char *hub_name = pbdrv_bluetooth_get_hub_name();
 
+    pbio_pybricks_user_program_id_t program_id;
+    pbsys_main_program_start_request_type_t program_start_type;
+    pbsys_main_program_get_info(&program_id, &program_start_type);
+
     mp_map_elem_t info[] = {
         {MP_OBJ_NEW_QSTR(MP_QSTR_name), mp_obj_new_str(hub_name, strlen(hub_name))},
         #if PBDRV_CONFIG_RESET
@@ -54,7 +58,8 @@ static mp_obj_t pb_type_System_info(void) {
         #if PBDRV_CONFIG_USB
         {MP_OBJ_NEW_QSTR(MP_QSTR_host_connected_usb), mp_obj_new_bool(pbsys_status_test(PBIO_PYBRICKS_STATUS_USB_HOST_CONNECTED))},
         #endif // PBDRV_CONFIG_USB
-        {MP_OBJ_NEW_QSTR(MP_QSTR_program_start_type), mp_obj_new_int(pbsys_main_program_get_start_request_type())},
+        {MP_OBJ_NEW_QSTR(MP_QSTR_program_id), mp_obj_new_int(program_id)},
+        {MP_OBJ_NEW_QSTR(MP_QSTR_program_start_type), mp_obj_new_int(program_start_type)},
     };
     mp_obj_t info_dict = mp_obj_new_dict(MP_ARRAY_SIZE(info));