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

Fix creator ID and build order

Browse Source
This commit is contained in:
Scott Shawcroft 2022-06-27 14:40:38 -07:00
parent d19270e318
commit 08c93ad0ce
No known key found for this signature in database
GPG Key ID: 0DFD512649C052DA
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
supervisor/shared/web_workflow/web_workflow.c
View File

@ -636,11 +636,11 @@ static void _reply_with_version_json(socketpool_socket_obj_t *socket, _request *
_send_chunk(socket, "\", \"board_id\": \""); _send_chunk(socket, "\", \"board_id\": \"");
_send_chunk(socket, CIRCUITPY_BOARD_ID); _send_chunk(socket, CIRCUITPY_BOARD_ID);
_send_chunk(socket, "\", \"creator_id\": "); _send_chunk(socket, "\", \"creator_id\": ");
char encoded_id[8]; char encoded_id[11]; // 2 ** 32 is 10 decimal digits plus one for \0
snprintf(encoded_id, sizeof(encoded_id), "%d", CIRCUITPY_CREATOR_ID); snprintf(encoded_id, sizeof(encoded_id), "%u", CIRCUITPY_CREATOR_ID);
_send_chunk(socket, encoded_id); _send_chunk(socket, encoded_id);
_send_chunk(socket, ", \"creation_id\": "); _send_chunk(socket, ", \"creation_id\": ");
snprintf(encoded_id, sizeof(encoded_id), "%d", CIRCUITPY_CREATION_ID); snprintf(encoded_id, sizeof(encoded_id), "%u", CIRCUITPY_CREATION_ID);
_send_chunk(socket, encoded_id); _send_chunk(socket, encoded_id);
_send_chunk(socket, ", \"hostname\": \""); _send_chunk(socket, ", \"hostname\": \"");
_send_chunk(socket, common_hal_mdns_server_get_hostname(&mdns)); _send_chunk(socket, common_hal_mdns_server_get_hostname(&mdns));

2
supervisor/supervisor.mk
View File

@ -161,7 +161,7 @@ endif
STATIC_RESOURCES = $(wildcard $(TOP)/supervisor/shared/web_workflow/static/*) STATIC_RESOURCES = $(wildcard $(TOP)/supervisor/shared/web_workflow/static/*)
$(BUILD)/autogen_web_workflow_static.c: ../../tools/gen_web_workflow_static.py $(STATIC_RESOURCES) $(BUILD)/autogen_web_workflow_static.c: ../../tools/gen_web_workflow_static.py $(STATIC_RESOURCES) | $(HEADER_BUILD)
$(STEPECHO) "GEN $@" $(STEPECHO) "GEN $@"
$(Q)$(PYTHON) $< \ $(Q)$(PYTHON) $< \
--output_c_file $@ \ --output_c_file $@ \