From 0800c45c1245220d8eefee610a9c9e7524c971ea Mon Sep 17 00:00:00 2001 From: Bryan Roe Date: Thu, 14 Jan 2021 01:20:13 -0800 Subject: [PATCH] 1. Fixed bug in linux os.arch() 2. Added MeshAgent.ARCHID --- meshcore/agentcore.c | 1 + microscript/ILibDuktape_ScriptContainer.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meshcore/agentcore.c b/meshcore/agentcore.c index 1cacc77..8360b83 100644 --- a/meshcore/agentcore.c +++ b/meshcore/agentcore.c @@ -1856,6 +1856,7 @@ void ILibDuktape_MeshAgent_PUSH(duk_context *ctx, void *chain) ILibDuktape_CreateInstanceMethod(ctx, "log", ILibDuktape_MeshAgent_log, 1); ILibDuktape_CreateEventWithGetter(ctx, "controlChannelDebug", ILibDuktape_MeshAgent_controlChannelDebug); ILibDuktape_CreateInstanceMethod(ctx, "DataPing", ILibDuktape_MeshAgent_DataPing, DUK_VARARGS); + ILibDuktape_CreateReadonlyProperty_int(ctx, "ARCHID", MESH_AGENTID); #ifdef _LINKVM ILibDuktape_CreateReadonlyProperty_int(ctx, "hasKVM", 1); ILibDuktape_EventEmitter_CreateEventEx(emitter, "kvmConnected"); diff --git a/microscript/ILibDuktape_ScriptContainer.c b/microscript/ILibDuktape_ScriptContainer.c index a7d629b..7c3f4d1 100644 --- a/microscript/ILibDuktape_ScriptContainer.c +++ b/microscript/ILibDuktape_ScriptContainer.c @@ -1677,7 +1677,7 @@ duk_ret_t ILibDuktape_ScriptContainer_OS_arch(duk_context *ctx) duk_push_string(ctx, "x64"); #endif } - if (strcmp(u.machine, "arm64") == 0) + else if (strcmp(u.machine, "arm64") == 0) { duk_push_string(ctx, "arm64"); }