From 8fd570ed2be6ed79ae38f714dfd238a6aa7e9b37 Mon Sep 17 00:00:00 2001 From: Michal Moskal Date: Wed, 30 Nov 2022 13:04:04 -0800 Subject: [PATCH] jacscript->devicescript rename --- jacdac-c | 2 +- jacdac-stm32x0 | 2 +- targets/lora-e5-88-4.0/profile/base.c | 8 ++++---- .../star-brain/profile/{jacscript.c => devicescript.c} | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) rename targets/star-brain/profile/{jacscript.c => devicescript.c} (62%) diff --git a/jacdac-c b/jacdac-c index c78532d..db17984 160000 --- a/jacdac-c +++ b/jacdac-c @@ -1 +1 @@ -Subproject commit c78532d1097ca193a1c767ee94a2d9990b520ac9 +Subproject commit db17984241cb04106dbb5fef8cdd2cd6b8a63541 diff --git a/jacdac-stm32x0 b/jacdac-stm32x0 index 160c0f5..05f7b69 160000 --- a/jacdac-stm32x0 +++ b/jacdac-stm32x0 @@ -1 +1 @@ -Subproject commit 160c0f5dab861e9a44c4f1e3bd8c364106516237 +Subproject commit 05f7b6913a0f6cfcd7a15252daff773ead2834da diff --git a/targets/lora-e5-88-4.0/profile/base.c b/targets/lora-e5-88-4.0/profile/base.c index 1fa0bae..93d7232 100644 --- a/targets/lora-e5-88-4.0/profile/base.c +++ b/targets/lora-e5-88-4.0/profile/base.c @@ -2,14 +2,14 @@ #include "tinyhw.h" #include "jd_client.h" -#include "jacscript/jacscript.h" +#include "devicescript/devicescript.h" FIRMWARE_IDENTIFIER(0x30085c3f, "JM-Lora E5 88 v4.0"); #define PROG_SIZE JD_FLASH_SETTINGS_SIZE #define PROG_START (0x08000000 + (JD_FLASH_SIZE - BL_SIZE - PROG_SIZE)) -static const jacscriptmgr_cfg_t jacs_cfg = { +static const devicescriptmgr_cfg_t devs_cfg = { .program_base = (void *)PROG_START, .max_program_size = PROG_SIZE, }; @@ -18,8 +18,8 @@ void app_init_services() { extcloud_init(); jd_role_manager_init(); - jacscriptmgr_init(&jacs_cfg); + devicescriptmgr_init(&devs_cfg); - jacscloud_init(&extcloud); + devscloud_init(&extcloud); tsagg_init(&extcloud); } diff --git a/targets/star-brain/profile/jacscript.c b/targets/star-brain/profile/devicescript.c similarity index 62% rename from targets/star-brain/profile/jacscript.c rename to targets/star-brain/profile/devicescript.c index bf12bdb..a203823 100644 --- a/targets/star-brain/profile/jacscript.c +++ b/targets/star-brain/profile/devicescript.c @@ -2,14 +2,14 @@ #include "tinyhw.h" #include "jd_client.h" -#include "jacscript/jacscript.h" +#include "devicescript/devicescript.h" -FIRMWARE_IDENTIFIER(0x3d1fe52f, "JM-Jacscript Star-Brain v3.3"); +FIRMWARE_IDENTIFIER(0x3d1fe52f, "JM-DeviceScript Star-Brain v3.3"); #define PROG_SIZE JD_FLASH_SETTINGS_SIZE #define PROG_START (0x08000000 + (JD_FLASH_SIZE - BL_SIZE - PROG_SIZE)) -static const jacscriptmgr_cfg_t jacs_cfg = { +static const devicescriptmgr_cfg_t devs_cfg = { .program_base = (void *)PROG_START, .max_program_size = PROG_SIZE, }; @@ -18,8 +18,8 @@ void app_init_services() { extcloud_init(); jd_role_manager_init(); - jacscriptmgr_init(&jacs_cfg); + devicescriptmgr_init(&devs_cfg); - jacscloud_init(&extcloud); + devscloud_init(&extcloud); tsagg_init(&extcloud); }