19016791193

Committed 02 Nov 2025 06:40PM UTC coverage: 57.167% (-2.6%) from 59.744%

Build # 19016791193

Build Type

Pull #406

github

Committed by

laurensvalk

Commit Message

bricks/virtualhub: Replace with embedded simulation.

Instead of using the newly introduced simhub alongside the virtualhub, we'll just replace the old one entirely now that it has reached feature parity. We can keep calling it the virtualhub.

Pull Request Pull Request #406: New virtual hub for more effective debugging

Run Details

41 of 48 new or added lines in 7 files covered. (85.42%)

414 existing lines in 53 files now uncovered.

4479 of 7835 relevant lines covered (57.17%)

17178392.75 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

33.33

/pybricks/pybricks.c

// SPDX-License-Identifier: MIT
// Copyright (c) 2018-2023 The Pybricks Authors

#include <string.h>

#include "py/mpconfig.h"
#include "py/obj.h"
#include "py/objmodule.h"
#include "py/objstr.h"
#include "py/objtuple.h"
#include "py/runtime.h"

#include <pbdrv/bluetooth.h>
#include <pbio/version.h>
#include <pbsys/host.h>
#include <pbsys/status.h>

#include <pybricks/common.h>
#include <pybricks/hubs.h>
#include <pybricks/parameters.h>
#include <pybricks/pupdevices.h>
#include <pybricks/common/pb_type_device.h>
#include <pybricks/tools.h>

#include "genhdr/mpversion.h"

static const MP_DEFINE_STR_OBJ(pybricks_info_hub_obj, PYBRICKS_HUB_NAME);
static const MP_DEFINE_STR_OBJ(pybricks_info_release_obj, PBIO_VERSION_STR);
static const MP_DEFINE_STR_OBJ(pybricks_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);

static const mp_rom_obj_tuple_t pybricks_info_obj = {
    {&mp_type_tuple},
    3,
    {
        MP_ROM_PTR(&pybricks_info_hub_obj),
        MP_ROM_PTR(&pybricks_info_release_obj),
        MP_ROM_PTR(&pybricks_info_version_obj),
    }
};

#if MICROPY_MODULE_ATTR_DELEGATION
void pb_package_pybricks_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
    // This will get called when external imports tries to store the module
    // as an attribute to this package. This is not currently supported, but
    // it should not cause an exception, so indicate success.
    dest[0] = MP_OBJ_NULL;
}
#endif

#if MICROPY_MODULE_BUILTIN_SUBPACKAGES
#if PYBRICKS_PY_EXPERIMENTAL
extern const mp_obj_module_t pb_module_experimental;
#endif
#if PYBRICKS_PY_HUBS
extern const mp_obj_module_t pb_module_hubs;
#endif
#if PYBRICKS_PY_NXTDEVICES
extern const mp_obj_module_t pb_module_nxtdevices;
#endif
#if PYBRICKS_PY_EV3DEVICES
extern const mp_obj_module_t pb_module_ev3devices;
#endif
#if PYBRICKS_PY_PUPDEVICES
extern const mp_obj_module_t pb_module_pupdevices;
#endif
#if PYBRICKS_PY_IODEVICES
extern const mp_obj_module_t pb_module_iodevices;
#endif
#if PYBRICKS_PY_PARAMETERS
extern const mp_obj_module_t pb_module_parameters;
#endif
#if PYBRICKS_PY_TOOLS
extern const mp_obj_module_t pb_module_tools;
#endif
#if PYBRICKS_PY_ROBOTICS
extern const mp_obj_module_t pb_module_robotics;
#endif
#endif

static const mp_rom_map_elem_t pybricks_globals_table[] = {
    { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_pybricks) },
    { MP_ROM_QSTR(MP_QSTR_version),             MP_ROM_PTR(&pybricks_info_obj)},
    #if MICROPY_MODULE_BUILTIN_SUBPACKAGES
    #if PYBRICKS_PY_EXPERIMENTAL
    { MP_ROM_QSTR(MP_QSTR_experimental), MP_ROM_PTR(&pb_module_experimental) },
    #endif
    #if PYBRICKS_PY_HUBS
    { MP_ROM_QSTR(MP_QSTR_hubs), MP_ROM_PTR(&pb_module_hubs) },
    #endif
    #if PYBRICKS_PY_NXTDEVICES
    { MP_ROM_QSTR(MP_QSTR_nxtdevices), MP_ROM_PTR(&pb_module_nxtdevices) },
    #endif
    #if PYBRICKS_PY_EV3DEVICES
    { MP_ROM_QSTR(MP_QSTR_ev3devices), MP_ROM_PTR(&pb_module_ev3devices) },
    #endif
    #if PYBRICKS_PY_PUPDEVICES
    { MP_ROM_QSTR(MP_QSTR_pupdevices), MP_ROM_PTR(&pb_module_pupdevices) },
    #endif
    #if PYBRICKS_PY_IODEVICES
    { MP_ROM_QSTR(MP_QSTR_iodevices), MP_ROM_PTR(&pb_module_iodevices) },
    #endif
    #if PYBRICKS_PY_PARAMETERS
    { MP_ROM_QSTR(MP_QSTR_parameters), MP_ROM_PTR(&pb_module_parameters) },
    #endif
    #if PYBRICKS_PY_TOOLS
    { MP_ROM_QSTR(MP_QSTR_tools), MP_ROM_PTR(&pb_module_tools) },
    #endif
    #if PYBRICKS_PY_ROBOTICS
    { MP_ROM_QSTR(MP_QSTR_robotics), MP_ROM_PTR(&pb_module_robotics) },
    #endif
    #endif
};
static MP_DEFINE_CONST_DICT(pb_package_pybricks_globals, pybricks_globals_table);

const mp_obj_module_t pb_package_pybricks = {
    .base = { &mp_type_module },
    .globals = (mp_obj_dict_t *)&pb_package_pybricks_globals,
};

MP_REGISTER_MODULE(MP_QSTR_pybricks, pb_package_pybricks);
MP_REGISTER_MODULE_DELEGATION(pb_package_pybricks, pb_package_pybricks_attr);

#if PYBRICKS_OPT_COMPILER
/**
 * Import all MicroPython modules and import * from Pybricks modules.
 */
static void pb_package_import_all(void) {

    // Go through all modules in mp_builtin_module_map.
    for (size_t i = 0; i < mp_builtin_module_map.used; i++) {
        // This is a constant map of modules, so we can skip checks for
        // filled slots or confirming that we have module types.
        qstr module_name = MP_OBJ_QSTR_VALUE(mp_builtin_module_map.table[i].key);
        mp_obj_t module = mp_builtin_module_map.table[i].value;
        if (!strncmp("pybricks", qstr_str(module_name), 8)) {
            // Import everything from a Pybricks module.
            mp_import_all(module);
        } else {
            // Otherwise import just the module.
            mp_store_global(module_name, module);
        }
    }

    #if PYBRICKS_PY_HUBS
    // Initialize hub instance
    const mp_obj_t args;
    mp_store_name(MP_QSTR_hub, MP_OBJ_TYPE_GET_SLOT(&pb_type_ThisHub, make_new)(&pb_type_ThisHub, 0, 0, &args));
    #endif
}

/**
 * Prepares Pybricks MicroPython environment.
 *
 * @param [in]  import_all      Whether to import * from all pybricks.* modules.
 */

void pb_package_pybricks_init(bool import_all) {

    nlr_buf_t nlr;
    if (nlr_push(&nlr) == 0) {
        // Initialize the package.
        #if PYBRICKS_PY_PARAMETERS
        pb_type_Color_reset();
        #endif
        #if PYBRICKS_PY_TOOLS
        pb_module_tools_init();
        #endif
        // Import all if requested.
        if (import_all) {
            pb_package_import_all();
        }
        nlr_pop();
    } else {
        // Print initialization or import exception.
        mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(nlr.ret_val));
    }
}
#else
// Cheaper implementation of the above. This is sufficient on builds without
// the compiler, since the following deterministic action should not raise
// exceptions as it is only called before executing anything else.
void pb_package_pybricks_init(bool import_all) {
    pb_type_Color_reset();
    pb_module_tools_init();
}
#endif // PYBRICKS_OPT_COMPILER

1	// SPDX-License-Identifier: MIT
2	// Copyright (c) 2018-2023 The Pybricks Authors
3
4	#include <string.h>
5
6	#include "py/mpconfig.h"
7	#include "py/obj.h"
8	#include "py/objmodule.h"
9	#include "py/objstr.h"
10	#include "py/objtuple.h"
11	#include "py/runtime.h"
12
13	#include <pbdrv/bluetooth.h>
14	#include <pbio/version.h>
15	#include <pbsys/host.h>
16	#include <pbsys/status.h>
17
18	#include <pybricks/common.h>
19	#include <pybricks/hubs.h>
20	#include <pybricks/parameters.h>
21	#include <pybricks/pupdevices.h>
22	#include <pybricks/common/pb_type_device.h>
23	#include <pybricks/tools.h>
24
25	#include "genhdr/mpversion.h"
26
27	static const MP_DEFINE_STR_OBJ(pybricks_info_hub_obj, PYBRICKS_HUB_NAME);
28	static const MP_DEFINE_STR_OBJ(pybricks_info_release_obj, PBIO_VERSION_STR);
29	static const MP_DEFINE_STR_OBJ(pybricks_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);
30
31	static const mp_rom_obj_tuple_t pybricks_info_obj = {
32	{&mp_type_tuple},
33	3,
34	{
35	MP_ROM_PTR(&pybricks_info_hub_obj),
36	MP_ROM_PTR(&pybricks_info_release_obj),
37	MP_ROM_PTR(&pybricks_info_version_obj),
38	}
39	};
40
41	#if MICROPY_MODULE_ATTR_DELEGATION
UNCOV 42	void pb_package_pybricks_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {	×
43	// This will get called when external imports tries to store the module
44	// as an attribute to this package. This is not currently supported, but
45	// it should not cause an exception, so indicate success.
UNCOV 46	dest[0] = MP_OBJ_NULL;	×
UNCOV 47	}	×
48	#endif
49
50	#if MICROPY_MODULE_BUILTIN_SUBPACKAGES
51	#if PYBRICKS_PY_EXPERIMENTAL
52	extern const mp_obj_module_t pb_module_experimental;
53	#endif
54	#if PYBRICKS_PY_HUBS
55	extern const mp_obj_module_t pb_module_hubs;
56	#endif
57	#if PYBRICKS_PY_NXTDEVICES
58	extern const mp_obj_module_t pb_module_nxtdevices;
59	#endif
60	#if PYBRICKS_PY_EV3DEVICES
61	extern const mp_obj_module_t pb_module_ev3devices;
62	#endif
63	#if PYBRICKS_PY_PUPDEVICES
64	extern const mp_obj_module_t pb_module_pupdevices;
65	#endif
66	#if PYBRICKS_PY_IODEVICES
67	extern const mp_obj_module_t pb_module_iodevices;
68	#endif
69	#if PYBRICKS_PY_PARAMETERS
70	extern const mp_obj_module_t pb_module_parameters;
71	#endif
72	#if PYBRICKS_PY_TOOLS
73	extern const mp_obj_module_t pb_module_tools;
74	#endif
75	#if PYBRICKS_PY_ROBOTICS
76	extern const mp_obj_module_t pb_module_robotics;
77	#endif
78	#endif
79
80	static const mp_rom_map_elem_t pybricks_globals_table[] = {
81	{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_pybricks) },
82	{ MP_ROM_QSTR(MP_QSTR_version), MP_ROM_PTR(&pybricks_info_obj)},
83	#if MICROPY_MODULE_BUILTIN_SUBPACKAGES
84	#if PYBRICKS_PY_EXPERIMENTAL
85	{ MP_ROM_QSTR(MP_QSTR_experimental), MP_ROM_PTR(&pb_module_experimental) },
86	#endif
87	#if PYBRICKS_PY_HUBS
88	{ MP_ROM_QSTR(MP_QSTR_hubs), MP_ROM_PTR(&pb_module_hubs) },
89	#endif
90	#if PYBRICKS_PY_NXTDEVICES
91	{ MP_ROM_QSTR(MP_QSTR_nxtdevices), MP_ROM_PTR(&pb_module_nxtdevices) },
92	#endif
93	#if PYBRICKS_PY_EV3DEVICES
94	{ MP_ROM_QSTR(MP_QSTR_ev3devices), MP_ROM_PTR(&pb_module_ev3devices) },
95	#endif
96	#if PYBRICKS_PY_PUPDEVICES
97	{ MP_ROM_QSTR(MP_QSTR_pupdevices), MP_ROM_PTR(&pb_module_pupdevices) },
98	#endif
99	#if PYBRICKS_PY_IODEVICES
100	{ MP_ROM_QSTR(MP_QSTR_iodevices), MP_ROM_PTR(&pb_module_iodevices) },
101	#endif
102	#if PYBRICKS_PY_PARAMETERS
103	{ MP_ROM_QSTR(MP_QSTR_parameters), MP_ROM_PTR(&pb_module_parameters) },
104	#endif
105	#if PYBRICKS_PY_TOOLS
106	{ MP_ROM_QSTR(MP_QSTR_tools), MP_ROM_PTR(&pb_module_tools) },
107	#endif
108	#if PYBRICKS_PY_ROBOTICS
109	{ MP_ROM_QSTR(MP_QSTR_robotics), MP_ROM_PTR(&pb_module_robotics) },
110	#endif
111	#endif
112	};
113	static MP_DEFINE_CONST_DICT(pb_package_pybricks_globals, pybricks_globals_table);
114
115	const mp_obj_module_t pb_package_pybricks = {
116	.base = { &mp_type_module },
117	.globals = (mp_obj_dict_t *)&pb_package_pybricks_globals,
118	};
119
120	MP_REGISTER_MODULE(MP_QSTR_pybricks, pb_package_pybricks);
121	MP_REGISTER_MODULE_DELEGATION(pb_package_pybricks, pb_package_pybricks_attr);
122
123	#if PYBRICKS_OPT_COMPILER
124	/**
125	* Import all MicroPython modules and import * from Pybricks modules.
126	*/
UNCOV 127	static void pb_package_import_all(void) {	×
128
129	// Go through all modules in mp_builtin_module_map.
UNCOV 130	for (size_t i = 0; i < mp_builtin_module_map.used; i++) {	×
131	// This is a constant map of modules, so we can skip checks for
132	// filled slots or confirming that we have module types.
UNCOV 133	qstr module_name = MP_OBJ_QSTR_VALUE(mp_builtin_module_map.table[i].key);	×
UNCOV 134	mp_obj_t module = mp_builtin_module_map.table[i].value;	×
UNCOV 135	if (!strncmp("pybricks", qstr_str(module_name), 8)) {	×
136	// Import everything from a Pybricks module.
UNCOV 137	mp_import_all(module);	×
138	} else {
139	// Otherwise import just the module.
UNCOV 140	mp_store_global(module_name, module);	×
141	}
142	}
143
144	#if PYBRICKS_PY_HUBS
145	// Initialize hub instance
146	const mp_obj_t args;
UNCOV 147	mp_store_name(MP_QSTR_hub, MP_OBJ_TYPE_GET_SLOT(&pb_type_ThisHub, make_new)(&pb_type_ThisHub, 0, 0, &args));	×
148	#endif
UNCOV 149	}	×
150
151	/**
152	* Prepares Pybricks MicroPython environment.
153	*
154	* @param [in] import_all Whether to import * from all pybricks.* modules.
155	*/
156
157	void pb_package_pybricks_init(bool import_all) {	25✔
158
159	nlr_buf_t nlr;
160	if (nlr_push(&nlr) == 0) {	25✔
161	// Initialize the package.
162	#if PYBRICKS_PY_PARAMETERS
163	pb_type_Color_reset();	25✔
164	#endif
165	#if PYBRICKS_PY_TOOLS
166	pb_module_tools_init();	25✔
167	#endif
168	// Import all if requested.
169	if (import_all) {	25✔
UNCOV 170	pb_package_import_all();	×
171	}
172	nlr_pop();	25✔
173	} else {
174	// Print initialization or import exception.
175	mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(nlr.ret_val));	×
176	}
177	}	25✔
178	#else
179	// Cheaper implementation of the above. This is sufficient on builds without
180	// the compiler, since the following deterministic action should not raise
181	// exceptions as it is only called before executing anything else.
182	void pb_package_pybricks_init(bool import_all) {
183	pb_type_Color_reset();
184	pb_module_tools_init();
185	}
186	#endif // PYBRICKS_OPT_COMPILER

pybricks / pybricks-micropython / 19016791193

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous