From 572c01a51f26a367d2a270843c10c982ce4d05f4 Mon Sep 17 00:00:00 2001 From: Arjan van Vught Date: Thu, 21 Dec 2023 18:47:28 +0100 Subject: [PATCH] Sync with local development --- firmware-template-gd32/Includes.mk | 3 +- .../include/sofware_version_id.h | 2 +- .../include/sofware_version_id.h | 2 +- .../include/sofware_version_id.h | 2 +- .../include/sofware_version_id.h | 2 +- .../include/sofware_version_id.h | 3 +- .../include/sofware_version_id.h | 3 +- lib-configstore/.cproject | 2 - lib-configstore/Rules.mk | 2 +- lib-configstore/include/storepca9685.h | 61 ---------------- lib-configstore/include/storerdmdevice.h | 70 ------------------- lib-configstore/src/rdm/storerdmdevice.cpp | 43 ------------ lib-debug/.settings/language.settings.xml | 2 +- lib-rdm/include/rdmhandler.h | 3 + lib-remoteconfig/Rules.mk | 4 +- 15 files changed, 14 insertions(+), 190 deletions(-) delete mode 100755 lib-configstore/include/storepca9685.h delete mode 100644 lib-configstore/include/storerdmdevice.h delete mode 100644 lib-configstore/src/rdm/storerdmdevice.cpp diff --git a/firmware-template-gd32/Includes.mk b/firmware-template-gd32/Includes.mk index 31e427f..95b8d6f 100644 --- a/firmware-template-gd32/Includes.mk +++ b/firmware-template-gd32/Includes.mk @@ -1,12 +1,11 @@ $(info "Includes.mk") -INCLUDES:=-I./include -I../include -I../lib-hal/include -I../lib-debug/include +INCLUDES:=-I./include -I../include -I../lib-configstore/include -I../lib-flash/include -I../lib-flashcode/include -I../lib-hal/include -I../lib-debug/include INCLUDES+=$(addprefix -I,$(EXTRA_INCLUDES)) INCLUDES+=-I../firmware-template-gd32/include INCLUDES+=-I../firmware-template-gd32/template INCLUDES+=-I../CMSIS/Core/Include INCLUDES+=-I../lib-gd32/${FAMILY}/${FAMILY_UC}_standard_peripheral/Include -#INCLUDES+=-I../lib-gd32/${FAMILY}/CMSIS INCLUDES+=-I../lib-gd32/${FAMILY}/CMSIS/GD/${FAMILY_UC}/Include INCLUDES+=-I../lib-gd32/include diff --git a/gd32_emac_artnet_pixel_dmx_multi/include/sofware_version_id.h b/gd32_emac_artnet_pixel_dmx_multi/include/sofware_version_id.h index 68b52b5..0bacf1c 100644 --- a/gd32_emac_artnet_pixel_dmx_multi/include/sofware_version_id.h +++ b/gd32_emac_artnet_pixel_dmx_multi/include/sofware_version_id.h @@ -1 +1 @@ -constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1702811908; +constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1703179673; diff --git a/gd32_emac_artnet_pixel_multi/include/sofware_version_id.h b/gd32_emac_artnet_pixel_multi/include/sofware_version_id.h index 68b52b5..0d8b20a 100644 --- a/gd32_emac_artnet_pixel_multi/include/sofware_version_id.h +++ b/gd32_emac_artnet_pixel_multi/include/sofware_version_id.h @@ -1 +1 @@ -constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1702811908; +constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1703179698; diff --git a/gd32_emac_ddp_pixel_dmx_multi/include/sofware_version_id.h b/gd32_emac_ddp_pixel_dmx_multi/include/sofware_version_id.h index 081a99f..78da856 100644 --- a/gd32_emac_ddp_pixel_dmx_multi/include/sofware_version_id.h +++ b/gd32_emac_ddp_pixel_dmx_multi/include/sofware_version_id.h @@ -1 +1 @@ -constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1702811913; +constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1703179706; diff --git a/gd32_emac_ddp_pixel_multi/include/sofware_version_id.h b/gd32_emac_ddp_pixel_multi/include/sofware_version_id.h index 22af23d..b986fef 100644 --- a/gd32_emac_ddp_pixel_multi/include/sofware_version_id.h +++ b/gd32_emac_ddp_pixel_multi/include/sofware_version_id.h @@ -1 +1 @@ -constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1702811915; +constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1703179714; diff --git a/gd32_emac_e131_pixel_dmx_multi/include/sofware_version_id.h b/gd32_emac_e131_pixel_dmx_multi/include/sofware_version_id.h index c08f99c..58656c9 100644 --- a/gd32_emac_e131_pixel_dmx_multi/include/sofware_version_id.h +++ b/gd32_emac_e131_pixel_dmx_multi/include/sofware_version_id.h @@ -1,2 +1 @@ -// Generated do 14 sep 2023 12:39:45 CEST -constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1694687985; +constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1703179728; diff --git a/gd32_emac_e131_pixel_multi/include/sofware_version_id.h b/gd32_emac_e131_pixel_multi/include/sofware_version_id.h index f678b71..16a1483 100644 --- a/gd32_emac_e131_pixel_multi/include/sofware_version_id.h +++ b/gd32_emac_e131_pixel_multi/include/sofware_version_id.h @@ -1,2 +1 @@ -// Generated do 14 sep 2023 12:39:46 CEST -constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1694687986; +constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1703179736; diff --git a/lib-configstore/.cproject b/lib-configstore/.cproject index 0b561f1..d41c89e 100755 --- a/lib-configstore/.cproject +++ b/lib-configstore/.cproject @@ -76,7 +76,6 @@ - @@ -185,7 +184,6 @@ - diff --git a/lib-configstore/Rules.mk b/lib-configstore/Rules.mk index 2a121a6..fc13568 100644 --- a/lib-configstore/Rules.mk +++ b/lib-configstore/Rules.mk @@ -1,6 +1,6 @@ $(info $$MAKE_FLAGS [${MAKE_FLAGS}]) -EXTRA_INCLUDES =../lib-flashcode/include ../lib-flash/include +EXTRA_INCLUDES =../lib-flashcode/include EXTRA_INCLUDES+=../lib-hal/include ../lib-properties/include ../lib-lightset/include ../lib-network/include ifneq ($(MAKE_FLAGS),) diff --git a/lib-configstore/include/storepca9685.h b/lib-configstore/include/storepca9685.h deleted file mode 100755 index a154adb..0000000 --- a/lib-configstore/include/storepca9685.h +++ /dev/null @@ -1,61 +0,0 @@ -/** - * @file storepca9685.h - * - */ -/* Copyright (C) 2023 by Arjan van Vught mailto:info@orangepi-dmx.nl - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#ifndef STOREPCA9685_H_ -#define STOREPCA9685_H_ - -#include -#include - -#include "pca9685dmxparams.h" -#include "pca9685dmxstore.h" - -#include "configstore.h" - -class StorePCA9685 final: public PCA9685DmxParamsStore, public PCA9685DmxStore { -public: - StorePCA9685(); - - void Update(const struct pca9685dmxparams::Params *pParams) override { - ConfigStore::Get()->Update(configstore::Store::PCA9685, pParams, sizeof(struct pca9685dmxparams::Params)); - } - - void Copy(struct pca9685dmxparams::Params *pParams) override { - ConfigStore::Get()->Copy(configstore::Store::PCA9685, pParams, sizeof(struct pca9685dmxparams::Params)); - } - - void SaveDmxStartAddress(uint16_t nDmxStartAddress) override { - ConfigStore::Get()->Update(configstore::Store::PCA9685, offsetof(struct pca9685dmxparams::Params, nDmxStartAddress), &nDmxStartAddress, sizeof(uint32_t), pca9685dmxparams::Mask::DMX_START_ADDRESS); - } - - static StorePCA9685 *Get() { - return s_pThis; - } - -private: - static StorePCA9685 *s_pThis; -}; - -#endif /* STOREPCA9685_H_ */ diff --git a/lib-configstore/include/storerdmdevice.h b/lib-configstore/include/storerdmdevice.h deleted file mode 100644 index a2273eb..0000000 --- a/lib-configstore/include/storerdmdevice.h +++ /dev/null @@ -1,70 +0,0 @@ -/** - * @file storerdmdevice.h - * - */ -/* Copyright (C) 2019-2023 by Arjan van Vught mailto:info@orangepi-dmx.nl - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#ifndef STORERDMDEVICE_H_ -#define STORERDMDEVICE_H_ - -#include -#include - -#include "rdmdeviceparams.h" - -#include "configstore.h" - -class StoreRDMDevice { -public: - static StoreRDMDevice& Get() { - static StoreRDMDevice instance; - return instance; - } - - void Update(const struct rdm::deviceparams::Params *pParams) { - Get().IUpdate(pParams); - } - - void Copy(struct rdm::deviceparams::Params *pRDMDeviceParams) { - Get().ICopy(pRDMDeviceParams); - } - - void SaveLabel(const char *pLabel, uint8_t nLength) { - Get().ISaveLabel(pLabel, nLength); - } - -private: - void IUpdate(const struct rdm::deviceparams::Params *pParams) { - ConfigStore::Get()->Update(configstore::Store::RDMDEVICE, pParams, sizeof(struct rdm::deviceparams::Params)); - } - - void ICopy(struct rdm::deviceparams::Params *pRDMDeviceParams) { - ConfigStore::Get()->Copy(configstore::Store::RDMDEVICE, pRDMDeviceParams, sizeof(struct rdm::deviceparams::Params)); - } - - void ISaveLabel(const char *pLabel, uint8_t nLength) { - ConfigStore::Get()->Update(configstore::Store::RDMDEVICE, offsetof(struct rdm::deviceparams::Params, aDeviceRootLabel), pLabel, nLength, rdm::deviceparams::Mask::LABEL); - ConfigStore::Get()->Update(configstore::Store::RDMDEVICE, offsetof(struct rdm::deviceparams::Params, nDeviceRootLabelLength), &nLength, sizeof(uint8_t), rdm::deviceparams::Mask::LABEL); - } -}; - -#endif /* STORERDMDEVICE_H_ */ diff --git a/lib-configstore/src/rdm/storerdmdevice.cpp b/lib-configstore/src/rdm/storerdmdevice.cpp deleted file mode 100644 index f7232a9..0000000 --- a/lib-configstore/src/rdm/storerdmdevice.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file storerdmdevice.cpp - * - */ -/* Copyright (C) 2019-2020 by Arjan van Vught mailto:info@orangepi-dmx.nl - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include - -#include "storerdmdevice.h" - -#include "debug.h" - -StoreRDMDevice *StoreRDMDevice::s_pThis = nullptr; - -StoreRDMDevice::StoreRDMDevice() { - DEBUG_ENTRY - - assert(s_pThis == nullptr); - s_pThis = this; - - DEBUG_PRINTF("%p", reinterpret_cast(s_pThis)); - DEBUG_EXIT -} - diff --git a/lib-debug/.settings/language.settings.xml b/lib-debug/.settings/language.settings.xml index f2ef5ad..1113617 100644 --- a/lib-debug/.settings/language.settings.xml +++ b/lib-debug/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + diff --git a/lib-rdm/include/rdmhandler.h b/lib-rdm/include/rdmhandler.h index 172bf0b..681fa37 100644 --- a/lib-rdm/include/rdmhandler.h +++ b/lib-rdm/include/rdmhandler.h @@ -128,6 +128,9 @@ class RDMHandler { #endif #if defined (ENABLE_RDM_PRESET_PLAYBACK) void SetPresetPlayback(bool IsBroadcast, uint16_t nSubDevice); +#endif +#if defined (ENABLE_RDM_MANUFACTURER_PIDS) + void SetManufacturerPid(bool IsBroadcast, uint16_t nSubDevice); #endif // ANSI E1.37-1 void SetIdentifyMode(bool IsBroadcast, uint16_t nSubDevice); diff --git a/lib-remoteconfig/Rules.mk b/lib-remoteconfig/Rules.mk index b6d4c53..748b69b 100644 --- a/lib-remoteconfig/Rules.mk +++ b/lib-remoteconfig/Rules.mk @@ -1,7 +1,7 @@ $(info $$MAKE_FLAGS [${MAKE_FLAGS}]) -EXTRA_INCLUDES=../lib-hal/include ../lib-network/include ../lib-properties/include ../lib-display/include ../lib-lightset/include ../lib-configstore/include -EXTRA_INCLUDES+=../lib-flash/include ../lib-flashcode/include ../lib-flashcodeinstall/include +EXTRA_INCLUDES=../lib-network/include ../lib-properties/include ../lib-display/include ../lib-lightset/include ../lib-configstore/include +EXTRA_INCLUDES+=../lib-flashcode/include ../lib-flashcodeinstall/include ifneq ($(MAKE_FLAGS),) ifneq (,$(findstring ENABLE_HTTPD,$(MAKE_FLAGS)))