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

implement real diskinfo functionality

This commit is contained in:
foamyguy 2023-03-17 21:36:13 -05:00
parent 408406c84f
commit a1506df805
1 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,6 +49,7 @@
#include "shared-bindings/hashlib/__init__.h" #include "shared-bindings/hashlib/__init__.h"
#include "shared-bindings/hashlib/Hash.h" #include "shared-bindings/hashlib/Hash.h"
#include "lib/oofatfs/diskio.h"
#if CIRCUITPY_MDNS #if CIRCUITPY_MDNS
#include "shared-bindings/mdns/RemoteService.h" #include "shared-bindings/mdns/RemoteService.h"
@ -834,35 +835,21 @@ static void _reply_with_diskinfo_json(socketpool_socket_obj_t *socket, _request
_send_str(socket, "\r\n"); _send_str(socket, "\r\n");
mp_print_t _socket_print = {socket, _print_chunk}; mp_print_t _socket_print = {socket, _print_chunk};
const char *hostname = ""; DWORD free_clusters;
#if CIRCUITPY_MDNS FATFS *fs = filesystem_circuitpy();
if (!common_hal_mdns_server_deinited(&mdns)) { FRESULT blk_result = f_getfree(fs, &free_clusters);
hostname = common_hal_mdns_server_get_hostname(&mdns); uint16_t block_size;
if (blk_result == FR_OK) {
disk_ioctl(fs, GET_SECTOR_SIZE, &block_size);
} }
#endif
_update_encoded_ip(); uint16_t total_size = fs->n_fatent - 2;
// Note: this leverages the fact that C concats consecutive string literals together.
mp_printf(&_socket_print, mp_printf(&_socket_print,
"{\"web_api_version\": 1, " "{\"free\": %d, "
"\"version\": \"" MICROPY_GIT_TAG "\", " "\"block_size\": %d, "
"\"build_date\": \"" MICROPY_BUILD_DATE "\", " "\"total\": %d}", free_clusters * block_size, block_size, total_size * block_size);
"\"board_name\": \"" MICROPY_HW_BOARD_NAME "\", "
"\"mcu_name\": \"" MICROPY_HW_MCU_NAME "\", "
"\"board_id\": \"" CIRCUITPY_BOARD_ID "\", "
"\"creator_id\": %u, "
"\"creation_id\": %u, "
"\"hostname\": \"%s\", "
"\"port\": %d, ", CIRCUITPY_CREATOR_ID, CIRCUITPY_CREATION_ID, hostname, web_api_port, _our_ip_encoded);
#if CIRCUITPY_MICROCONTROLLER && COMMON_HAL_MCU_PROCESSOR_UID_LENGTH > 0
uint8_t raw_id[COMMON_HAL_MCU_PROCESSOR_UID_LENGTH];
common_hal_mcu_processor_get_uid(raw_id);
mp_printf(&_socket_print, "\"UID\": \"");
for (uint8_t i = 0; i < COMMON_HAL_MCU_PROCESSOR_UID_LENGTH; i++) {
mp_printf(&_socket_print, "%02X", raw_id[i]);
}
mp_printf(&_socket_print, "\", ");
#endif
mp_printf(&_socket_print, "\"ip\": \"%s\"}", _our_ip_encoded);
// Empty chunk signals the end of the response. // Empty chunk signals the end of the response.
_send_chunk(socket, ""); _send_chunk(socket, "");
} }