Skip to content

Commit 29c26d4

Browse files
Deomid Ryabkovcesantabot
authored andcommitted
Add mg_version and mg_id to Sys.GetInfo
PUBLISHED_FROM=b427207667863853348fe139194dd68c7449d8fe
1 parent 3d40428 commit 29c26d4

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

src/mgos_rpc.c

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@
5151
static char *s_acl_file = NULL;
5252
static struct mg_rpc *s_global_mg_rpc;
5353

54+
extern const char *mg_build_id;
55+
extern const char *mg_build_version;
56+
5457
void mg_rpc_net_ready(int ev, void *evd, void *arg) {
5558
if (ev != MGOS_NET_EV_IP_ACQUIRED) return;
5659
mg_rpc_connect(s_global_mg_rpc);
@@ -158,8 +161,8 @@ int mgos_print_sys_info(struct json_out *out) {
158161

159162
int len = json_printf(
160163
out,
161-
"{app: %Q, fw_version: %Q, fw_id: %Q, mac: %Q, "
162-
"arch: %Q, uptime: %lu, "
164+
"{app: %Q, fw_version: %Q, fw_id: %Q, mg_version: %Q, mg_id: %Q, "
165+
"mac: %Q, arch: %Q, uptime: %lu, "
163166
"ram_size: %u, ram_free: %u, ram_min_free: %u, "
164167
"fs_size: %u, fs_free: %u"
165168
#ifdef MGOS_HAVE_WIFI
@@ -170,12 +173,12 @@ int mgos_print_sys_info(struct json_out *out) {
170173
#endif
171174
"}",
172175
MGOS_APP, mgos_sys_ro_vars_get_fw_version(), mgos_sys_ro_vars_get_fw_id(),
173-
mgos_sys_ro_vars_get_mac_address(), mgos_sys_ro_vars_get_arch(),
174-
(unsigned long) mgos_uptime(), mgos_get_heap_size(),
175-
mgos_get_free_heap_size(), mgos_get_min_free_heap_size(),
176-
mgos_get_fs_size(), mgos_get_free_fs_size()
176+
mg_build_version, mg_build_id, mgos_sys_ro_vars_get_mac_address(),
177+
mgos_sys_ro_vars_get_arch(), (unsigned long) mgos_uptime(),
178+
mgos_get_heap_size(), mgos_get_free_heap_size(),
179+
mgos_get_min_free_heap_size(), mgos_get_fs_size(), mgos_get_free_fs_size()
177180
#ifdef MGOS_HAVE_WIFI
178-
,
181+
,
179182
sta_ip, ap_ip, status == NULL ? "" : status, ssid == NULL ? "" : ssid
180183
#endif
181184
#ifdef MGOS_HAVE_ETHERNET

0 commit comments

Comments
 (0)