From d95dfa010c2ab62c43c58fa29403fde5758df359 Mon Sep 17 00:00:00 2001 From: BlueAndi Date: Wed, 30 Oct 2024 23:51:44 +0100 Subject: [PATCH 1/2] * Workflow added for a test compilation on CI. * License file renamed, so its recognized by the Arduino library manager. * Examples updated for latest libraries. * Architecture set to any. * Some copyright dates fixed. * Backslashes in include paths fixed (should be posix slashes). --- .github/workflows/testCompile.yml | 43 +++++++ LICENSE.md => LICENSE | 0 examples/Generic/Generic.ino | 2 +- .../LampAndButtonTest/LampAndButtonTest.ino | 4 +- .../Seeed-Studio-CAN_BUS_Shield.ino | 15 ++- .../Sparkfun_CAN-BUS_Shield.ino | 105 ++++++++---------- library.properties | 2 +- src/VSCP.cpp | 2 +- src/framework/events/vscp_evt_alarm.c | 6 +- src/framework/events/vscp_evt_alarm.h | 2 +- src/framework/events/vscp_evt_aol.c | 6 +- src/framework/events/vscp_evt_aol.h | 2 +- src/framework/events/vscp_evt_configuration.c | 6 +- src/framework/events/vscp_evt_configuration.h | 2 +- src/framework/events/vscp_evt_control.c | 6 +- src/framework/events/vscp_evt_control.h | 2 +- src/framework/events/vscp_evt_data.c | 8 +- src/framework/events/vscp_evt_data.h | 2 +- src/framework/events/vscp_evt_diagnostic.c | 6 +- src/framework/events/vscp_evt_diagnostic.h | 2 +- src/framework/events/vscp_evt_display.c | 6 +- src/framework/events/vscp_evt_display.h | 2 +- src/framework/events/vscp_evt_error.c | 6 +- src/framework/events/vscp_evt_error.h | 2 +- src/framework/events/vscp_evt_gnss.c | 6 +- src/framework/events/vscp_evt_gnss.h | 2 +- src/framework/events/vscp_evt_information.c | 6 +- src/framework/events/vscp_evt_information.h | 2 +- src/framework/events/vscp_evt_ir.c | 6 +- src/framework/events/vscp_evt_ir.h | 2 +- src/framework/events/vscp_evt_log.c | 6 +- src/framework/events/vscp_evt_log.h | 2 +- src/framework/events/vscp_evt_measurement.c | 8 +- src/framework/events/vscp_evt_measurement.h | 2 +- src/framework/events/vscp_evt_measurement32.c | 6 +- src/framework/events/vscp_evt_measurement32.h | 2 +- src/framework/events/vscp_evt_measurement64.c | 6 +- src/framework/events/vscp_evt_measurement64.h | 2 +- src/framework/events/vscp_evt_measurezone.c | 8 +- src/framework/events/vscp_evt_measurezone.h | 2 +- src/framework/events/vscp_evt_multimedia.c | 6 +- src/framework/events/vscp_evt_multimedia.h | 2 +- src/framework/events/vscp_evt_phone.c | 6 +- src/framework/events/vscp_evt_phone.h | 2 +- src/framework/events/vscp_evt_protocol.c | 6 +- src/framework/events/vscp_evt_protocol.h | 2 +- src/framework/events/vscp_evt_security.c | 6 +- src/framework/events/vscp_evt_security.h | 2 +- src/framework/events/vscp_evt_setvaluezone.c | 6 +- src/framework/events/vscp_evt_setvaluezone.h | 2 +- src/framework/events/vscp_evt_weather.c | 6 +- src/framework/events/vscp_evt_weather.h | 2 +- .../events/vscp_evt_weather_forecast.c | 6 +- .../events/vscp_evt_weather_forecast.h | 2 +- src/framework/events/vscp_evt_wireless.c | 6 +- src/framework/events/vscp_evt_wireless.h | 2 +- 56 files changed, 200 insertions(+), 171 deletions(-) create mode 100644 .github/workflows/testCompile.yml rename LICENSE.md => LICENSE (100%) diff --git a/.github/workflows/testCompile.yml b/.github/workflows/testCompile.yml new file mode 100644 index 0000000..7de5f00 --- /dev/null +++ b/.github/workflows/testCompile.yml @@ -0,0 +1,43 @@ +name: Test Compile Script + +# Controls when the action will run. +on: + push: + branches: [ '**' ] + # Allows you to run this workflow manually from the Actions tab. + workflow_dispatch: + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # The introduction just shows some useful informations. + intro: + # The type of runner that the job will run on. + runs-on: ubuntu-latest + # Steps represent a sequence of tasks that will be executed as part of the job. + steps: + - run: echo "The job was automatically triggered by a ${{ github.event_name }} event." + - run: echo "The name of the branch is ${{ github.ref }} and the repository is ${{ github.repository }}." + + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Checkout repository as custom library + uses: actions/checkout@v4 + with: + path: CustomLibrary # must contain string "Custom" + # No need to put "Custom" library in the required-libraries list + + - name: Checkout autowp-mcp2515 as custom library + uses: actions/checkout@v4 + with: + repository: autowp/arduino-mcp2515 + ref: master + path: CustomLibrary_autowp-mcp2515 # must contain string "Custom" + # No need to put "Custom" library in the required-libraries list + + - name: Compile all examples + uses: ArminJo/arduino-test-compile@v3 + with: + sketch-names: "*.ino" + sketch-names-find-start: examples/ + required-libraries: mcp_can@1.5.1 diff --git a/LICENSE.md b/LICENSE similarity index 100% rename from LICENSE.md rename to LICENSE diff --git a/examples/Generic/Generic.ino b/examples/Generic/Generic.ino index c3b2eec..0139b56 100644 --- a/examples/Generic/Generic.ino +++ b/examples/Generic/Generic.ino @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2020, Andreas Merkle + * Copyright (c) 2014 - 2024, Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/examples/LampAndButtonTest/LampAndButtonTest.ino b/examples/LampAndButtonTest/LampAndButtonTest.ino index d9f1bb4..1eb0fac 100644 --- a/examples/LampAndButtonTest/LampAndButtonTest.ino +++ b/examples/LampAndButtonTest/LampAndButtonTest.ino @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2020, Andreas Merkle + * Copyright (c) 2014 - 2024, Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * @@ -84,4 +84,4 @@ void loop() { gInitButtonState = HIGH; } -} +} diff --git a/examples/Seeed-Studio-CAN_BUS_Shield/Seeed-Studio-CAN_BUS_Shield.ino b/examples/Seeed-Studio-CAN_BUS_Shield/Seeed-Studio-CAN_BUS_Shield.ino index f9ec957..ebfece4 100644 --- a/examples/Seeed-Studio-CAN_BUS_Shield/Seeed-Studio-CAN_BUS_Shield.ino +++ b/examples/Seeed-Studio-CAN_BUS_Shield/Seeed-Studio-CAN_BUS_Shield.ino @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2020, Andreas Merkle + * Copyright (c) 2014 - 2024, Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * @@ -44,13 +44,13 @@ static bool isActive = false; // If no message is received return false, otherwise true. bool transportRead(vscp_RxMessage * const rxMsg) { - bool status = false; + bool status = false; if (CAN_MSGAVAIL == canCom.checkReceive()) { - unsigned long canMsgId = 0; + unsigned long canMsgId = 0; - if (CAN_OK == canCom.readMsgBufID(&canMsgId, &rxMsg->dataSize, rxMsg->data)) { + if (CAN_OK == canCom.readMsgBuf(&canMsgId, &rxMsg->dataSize, rxMsg->data)) { rxMsg->vscpClass = (uint16_t)((canMsgId >> 16) & 0x01ff); rxMsg->vscpType = (uint8_t)((canMsgId >> 8) & 0x00ff); @@ -88,7 +88,7 @@ bool transportWrite(vscp_TxMessage const * const txMsg) { } // Send CAN message - if (CAN_OK != canCom.sendMsgBuf(canMsgId, 1, 0, txMsg->dataSize, (unsigned char*)txMsg->data)) { + if (CAN_OK != canCom.sendMsgBuf(canMsgId, 1, txMsg->dataSize, (unsigned char*)txMsg->data)) { // CAN message couldn't be sent, try again. ++retryCnt; @@ -133,7 +133,7 @@ void setup() { do { // Initialize CAN controller with 125 kbit/s (VSCP default bitrate) - if (CAN_OK != canCom.begin(CAN_125KBPS)) { + if (CAN_OK != canCom.begin(MCP_STDEXT, CAN_125KBPS, MCP_16MHZ)) { // Try again delay(100); @@ -158,6 +158,9 @@ void setup() { } else { Serial.println("CAN controller initialized successful."); + + // Change to normal mode to allow messages to be transmitted + canCom.setMode(MCP_NORMAL); // Only CAN frames with 29-bit identifier shall be received canCom.init_Mask(0, 1, 0x1fffffff); diff --git a/examples/Sparkfun_CAN-BUS_Shield/Sparkfun_CAN-BUS_Shield.ino b/examples/Sparkfun_CAN-BUS_Shield/Sparkfun_CAN-BUS_Shield.ino index d73874c..ffc4709 100644 --- a/examples/Sparkfun_CAN-BUS_Shield/Sparkfun_CAN-BUS_Shield.ino +++ b/examples/Sparkfun_CAN-BUS_Shield/Sparkfun_CAN-BUS_Shield.ino @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2020, Andreas Merkle + * Copyright (c) 2014 - 2024, Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * @@ -26,11 +26,16 @@ #include // VSCP framework #include // SPI used for CAN controller communication -#include // CAN controller driver +#include // CAN controller driver // Create an instance of the VSCP framework VSCP vscp; +// Create an instance of the CAN controller driver +MCP2515 mcp2515( + 9 // Set CS (chip select) pin, note if you use a CAN BUS shield prior to V1.1 use pin 10! +); + // Node is in active state or not static bool isActive = false; @@ -38,23 +43,23 @@ static bool isActive = false; // If no message is received return false, otherwise true. bool transportRead(vscp_RxMessage * const rxMsg) { - bool status = false; - CANMSG canMsg; + bool status = false; + struct can_frame canMsg; // Any CAN frame received? - if (true == MCP2515::receiveCANMessage(&canMsg, 10)) { + if (MCP2515::ERROR_OK == mcp2515.readMessage(&canMsg)) { // Is it a extended CAN frame? - if (true == canMsg.isExtendedAdrs) { + if (0 != ((canMsg.can_id >> 31) & 0x01)) { unsigned char index = 0; - rxMsg->vscpClass = (uint16_t)((canMsg.adrsValue >> 16) & 0x01ff); - rxMsg->vscpType = (uint8_t)((canMsg.adrsValue >> 8) & 0x00ff); - rxMsg->oAddr = (uint8_t)((canMsg.adrsValue >> 0) & 0x00ff); - rxMsg->hardCoded = (uint8_t)((canMsg.adrsValue >> 25) & 0x0001); - rxMsg->priority = (VSCP_PRIORITY)((canMsg.adrsValue >> 26) & 0x0007); - rxMsg->dataSize = canMsg.dataLength; + rxMsg->vscpClass = (uint16_t)((canMsg.can_id >> 16) & 0x01ff); + rxMsg->vscpType = (uint8_t)((canMsg.can_id >> 8) & 0x00ff); + rxMsg->oAddr = (uint8_t)((canMsg.can_id >> 0) & 0x00ff); + rxMsg->hardCoded = (uint8_t)((canMsg.can_id >> 25) & 0x0001); + rxMsg->priority = (VSCP_PRIORITY)((canMsg.can_id >> 26) & 0x0007); + rxMsg->dataSize = canMsg.can_dlc; // Protect against a buffer out of bounce access if (VSCP_L1_DATA_SIZE < rxMsg->dataSize) { @@ -79,24 +84,23 @@ bool transportRead(vscp_RxMessage * const rxMsg) { // If it fails to send the message return false, otherwise true. bool transportWrite(vscp_TxMessage const * const txMsg) { - bool status = false; - CANMSG canMsg; - unsigned char index = 0; - unsigned char retryCnt = 0; - - canMsg.isExtendedAdrs = true; - - canMsg.adrsValue = (((uint32_t)txMsg->priority) << 26) | - (((uint32_t)txMsg->hardCoded) << 25) | - (((uint32_t)txMsg->vscpClass) << 16) | - (((uint32_t)txMsg->vscpType) << 8) | - txMsg->oAddr; - - canMsg.rtr = 0; - - canMsg.dataLength = txMsg->dataSize; + bool status = false; + struct can_frame canMsg; + unsigned char index = 0; + unsigned char retryCnt = 0; + + canMsg.can_id = (1 << 31) | // Extended 29 bit + (0 << 30) | // No RTR + (0 << 29) | // No error message frame + (((uint32_t)txMsg->priority) << 26) | + (((uint32_t)txMsg->hardCoded) << 25) | + (((uint32_t)txMsg->vscpClass) << 16) | + (((uint32_t)txMsg->vscpType) << 8) | + txMsg->oAddr; + + canMsg.can_dlc = txMsg->dataSize; - for(index = 0; index < canMsg.dataLength; ++index) { + for(index = 0; index < canMsg.can_dlc; ++index) { canMsg.data[index] = txMsg->data[index]; } @@ -110,7 +114,7 @@ bool transportWrite(vscp_TxMessage const * const txMsg) { } // Send CAN message - if (false == MCP2515::transmitCANMessage(canMsg, 10)) { + if (MCP2515::ERROR_OK == mcp2515.sendMessage(&canMsg)) { // CAN message couldn't be sent, try again. ++retryCnt; @@ -121,7 +125,7 @@ bool transportWrite(vscp_TxMessage const * const txMsg) { } } while((false == status) && (0 < retryCnt)); - + return status; } @@ -152,37 +156,16 @@ void setup() { Serial.begin(115200); Serial.println("VSCP node starts up ..."); - do { - // Initialize CAN controller with 125 kbit/s (VSCP default bitrate) - if (false == MCP2515::initCAN(CAN_BAUD_125K)) { - - // Try again - delay(100); - --retry; - - if (0 == retry) { - isError = true; - } - - } else { - - // Successful initialized - retry = 0; - } - - } while(0 < retry); - - if (true == isError) { - - Serial.println("Failed to initialize CAN controller!"); - + if (MCP2515::ERROR_OK != mcp2515.reset()) { + isError = true; } - // Set to normal mode non single shot - else if (false == MCP2515::setCANNormalMode(LOW)) { - - Serial.println("Failed to set CAN controller to normal mode!"); - - } else { + else if (MCP2515::ERROR_OK != mcp2515.setBitrate(CAN_125KBPS)) { + isError = true; + } + else if (MCP2515::ERROR_OK != mcp2515.setNormalMode()) { + isError = true; + } + else { Serial.println("CAN controller initialized successful."); diff --git a/library.properties b/library.properties index 270382c..438d994 100644 --- a/library.properties +++ b/library.properties @@ -6,4 +6,4 @@ sentence=Very Simple Control Protocol L1 framework for all Arduino boards. paragraph= category=Communication url=http://github.com/BlueAndi/vscp-arduino -architectures=avr +architectures=* diff --git a/src/VSCP.cpp b/src/VSCP.cpp index d6afecd..a9a2997 100644 --- a/src/VSCP.cpp +++ b/src/VSCP.cpp @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2020, Andreas Merkle + * Copyright (c) 2014 - 2024, Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_alarm.c b/src/framework/events/vscp_evt_alarm.c index 6eaa3b5..96994b4 100644 --- a/src/framework/events/vscp_evt_alarm.c +++ b/src/framework/events/vscp_evt_alarm.c @@ -43,9 +43,9 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include "vscp_evt_alarm.h" -#include "..\core\vscp_core.h" -#include "..\core\vscp_class_l1.h" -#include "..\core\vscp_type_alarm.h" +#include "../core/vscp_core.h" +#include "../core/vscp_class_l1.h" +#include "../core/vscp_type_alarm.h" /******************************************************************************* COMPILER SWITCHES diff --git a/src/framework/events/vscp_evt_alarm.h b/src/framework/events/vscp_evt_alarm.h index 6690d82..76c37d9 100644 --- a/src/framework/events/vscp_evt_alarm.h +++ b/src/framework/events/vscp_evt_alarm.h @@ -47,7 +47,7 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include -#include "..\user\vscp_platform.h" +#include "../user/vscp_platform.h" #ifdef __cplusplus extern "C" diff --git a/src/framework/events/vscp_evt_aol.c b/src/framework/events/vscp_evt_aol.c index e48beae..a966725 100644 --- a/src/framework/events/vscp_evt_aol.c +++ b/src/framework/events/vscp_evt_aol.c @@ -43,9 +43,9 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include "vscp_evt_aol.h" -#include "..\core\vscp_core.h" -#include "..\core\vscp_class_l1.h" -#include "..\core\vscp_type_aol.h" +#include "../core/vscp_core.h" +#include "../core/vscp_class_l1.h" +#include "../core/vscp_type_aol.h" /******************************************************************************* COMPILER SWITCHES diff --git a/src/framework/events/vscp_evt_aol.h b/src/framework/events/vscp_evt_aol.h index 642adc4..dcaf205 100644 --- a/src/framework/events/vscp_evt_aol.h +++ b/src/framework/events/vscp_evt_aol.h @@ -47,7 +47,7 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include -#include "..\user\vscp_platform.h" +#include "../user/vscp_platform.h" #ifdef __cplusplus extern "C" diff --git a/src/framework/events/vscp_evt_configuration.c b/src/framework/events/vscp_evt_configuration.c index 39b0b7e..3c2981e 100644 --- a/src/framework/events/vscp_evt_configuration.c +++ b/src/framework/events/vscp_evt_configuration.c @@ -43,9 +43,9 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include "vscp_evt_configuration.h" -#include "..\core\vscp_core.h" -#include "..\core\vscp_class_l1.h" -#include "..\core\vscp_type_configuration.h" +#include "../core/vscp_core.h" +#include "../core/vscp_class_l1.h" +#include "../core/vscp_type_configuration.h" /******************************************************************************* COMPILER SWITCHES diff --git a/src/framework/events/vscp_evt_configuration.h b/src/framework/events/vscp_evt_configuration.h index b55c935..01a2f4c 100644 --- a/src/framework/events/vscp_evt_configuration.h +++ b/src/framework/events/vscp_evt_configuration.h @@ -46,7 +46,7 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include -#include "..\user\vscp_platform.h" +#include "../user/vscp_platform.h" #ifdef __cplusplus extern "C" diff --git a/src/framework/events/vscp_evt_control.c b/src/framework/events/vscp_evt_control.c index 22d6ed8..18a4efb 100644 --- a/src/framework/events/vscp_evt_control.c +++ b/src/framework/events/vscp_evt_control.c @@ -43,9 +43,9 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include "vscp_evt_control.h" -#include "..\core\vscp_core.h" -#include "..\core\vscp_class_l1.h" -#include "..\core\vscp_type_control.h" +#include "../core/vscp_core.h" +#include "../core/vscp_class_l1.h" +#include "../core/vscp_type_control.h" /******************************************************************************* COMPILER SWITCHES diff --git a/src/framework/events/vscp_evt_control.h b/src/framework/events/vscp_evt_control.h index 1f321a4..99528a3 100644 --- a/src/framework/events/vscp_evt_control.h +++ b/src/framework/events/vscp_evt_control.h @@ -50,7 +50,7 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include -#include "..\user\vscp_platform.h" +#include "../user/vscp_platform.h" #ifdef __cplusplus extern "C" diff --git a/src/framework/events/vscp_evt_data.c b/src/framework/events/vscp_evt_data.c index 03a2399..393e3b7 100644 --- a/src/framework/events/vscp_evt_data.c +++ b/src/framework/events/vscp_evt_data.c @@ -43,10 +43,10 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include "vscp_evt_data.h" -#include "..\core\vscp_core.h" -#include "..\core\vscp_class_l1.h" -#include "..\core\vscp_type_data.h" -#include "..\core\vscp_data_coding.h" +#include "../core/vscp_core.h" +#include "../core/vscp_class_l1.h" +#include "../core/vscp_type_data.h" +#include "../core/vscp_data_coding.h" /******************************************************************************* COMPILER SWITCHES diff --git a/src/framework/events/vscp_evt_data.h b/src/framework/events/vscp_evt_data.h index 59ba7b4..bb9af10 100644 --- a/src/framework/events/vscp_evt_data.h +++ b/src/framework/events/vscp_evt_data.h @@ -47,7 +47,7 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include -#include "..\user\vscp_platform.h" +#include "../user/vscp_platform.h" #ifdef __cplusplus extern "C" diff --git a/src/framework/events/vscp_evt_diagnostic.c b/src/framework/events/vscp_evt_diagnostic.c index 4a8a32c..011d9a5 100644 --- a/src/framework/events/vscp_evt_diagnostic.c +++ b/src/framework/events/vscp_evt_diagnostic.c @@ -43,9 +43,9 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include "vscp_evt_diagnostic.h" -#include "..\core\vscp_core.h" -#include "..\core\vscp_class_l1.h" -#include "..\core\vscp_type_diagnostic.h" +#include "../core/vscp_core.h" +#include "../core/vscp_class_l1.h" +#include "../core/vscp_type_diagnostic.h" /******************************************************************************* COMPILER SWITCHES diff --git a/src/framework/events/vscp_evt_diagnostic.h b/src/framework/events/vscp_evt_diagnostic.h index fdb8a7f..d48392d 100644 --- a/src/framework/events/vscp_evt_diagnostic.h +++ b/src/framework/events/vscp_evt_diagnostic.h @@ -46,7 +46,7 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include -#include "..\user\vscp_platform.h" +#include "../user/vscp_platform.h" #ifdef __cplusplus extern "C" diff --git a/src/framework/events/vscp_evt_display.c b/src/framework/events/vscp_evt_display.c index 89b3601..5b3b61e 100644 --- a/src/framework/events/vscp_evt_display.c +++ b/src/framework/events/vscp_evt_display.c @@ -43,9 +43,9 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include "vscp_evt_display.h" -#include "..\core\vscp_core.h" -#include "..\core\vscp_class_l1.h" -#include "..\core\vscp_type_display.h" +#include "../core/vscp_core.h" +#include "../core/vscp_class_l1.h" +#include "../core/vscp_type_display.h" /******************************************************************************* COMPILER SWITCHES diff --git a/src/framework/events/vscp_evt_display.h b/src/framework/events/vscp_evt_display.h index c26b859..ca12037 100644 --- a/src/framework/events/vscp_evt_display.h +++ b/src/framework/events/vscp_evt_display.h @@ -46,7 +46,7 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include -#include "..\user\vscp_platform.h" +#include "../user/vscp_platform.h" #ifdef __cplusplus extern "C" diff --git a/src/framework/events/vscp_evt_error.c b/src/framework/events/vscp_evt_error.c index 74b7c7d..27f28f4 100644 --- a/src/framework/events/vscp_evt_error.c +++ b/src/framework/events/vscp_evt_error.c @@ -43,9 +43,9 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include "vscp_evt_error.h" -#include "..\core\vscp_core.h" -#include "..\core\vscp_class_l1.h" -#include "..\core\vscp_type_error.h" +#include "../core/vscp_core.h" +#include "../core/vscp_class_l1.h" +#include "../core/vscp_type_error.h" /******************************************************************************* COMPILER SWITCHES diff --git a/src/framework/events/vscp_evt_error.h b/src/framework/events/vscp_evt_error.h index 9d74ae6..84628d4 100644 --- a/src/framework/events/vscp_evt_error.h +++ b/src/framework/events/vscp_evt_error.h @@ -46,7 +46,7 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include -#include "..\user\vscp_platform.h" +#include "../user/vscp_platform.h" #ifdef __cplusplus extern "C" diff --git a/src/framework/events/vscp_evt_gnss.c b/src/framework/events/vscp_evt_gnss.c index 72044ac..4dddf7c 100644 --- a/src/framework/events/vscp_evt_gnss.c +++ b/src/framework/events/vscp_evt_gnss.c @@ -43,9 +43,9 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include "vscp_evt_gnss.h" -#include "..\core\vscp_core.h" -#include "..\core\vscp_class_l1.h" -#include "..\core\vscp_type_gnss.h" +#include "../core/vscp_core.h" +#include "../core/vscp_class_l1.h" +#include "../core/vscp_type_gnss.h" /******************************************************************************* COMPILER SWITCHES diff --git a/src/framework/events/vscp_evt_gnss.h b/src/framework/events/vscp_evt_gnss.h index 68fd537..844f83e 100644 --- a/src/framework/events/vscp_evt_gnss.h +++ b/src/framework/events/vscp_evt_gnss.h @@ -47,7 +47,7 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include -#include "..\user\vscp_platform.h" +#include "../user/vscp_platform.h" #include #ifdef __cplusplus diff --git a/src/framework/events/vscp_evt_information.c b/src/framework/events/vscp_evt_information.c index b1e24ba..25628f2 100644 --- a/src/framework/events/vscp_evt_information.c +++ b/src/framework/events/vscp_evt_information.c @@ -43,9 +43,9 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include "vscp_evt_information.h" -#include "vscp_core.h" -#include "vscp_class_l1.h" -#include "vscp_type_information.h" +#include "../core/vscp_core.h" +#include "../core/vscp_class_l1.h" +#include "../core/vscp_type_information.h" /******************************************************************************* COMPILER SWITCHES diff --git a/src/framework/events/vscp_evt_information.h b/src/framework/events/vscp_evt_information.h index e907d51..6cc0fac 100644 --- a/src/framework/events/vscp_evt_information.h +++ b/src/framework/events/vscp_evt_information.h @@ -48,7 +48,7 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include -#include "..\user\vscp_platform.h" +#include "../user/vscp_platform.h" #ifdef __cplusplus extern "C" diff --git a/src/framework/events/vscp_evt_ir.c b/src/framework/events/vscp_evt_ir.c index 733ab75..a44b756 100644 --- a/src/framework/events/vscp_evt_ir.c +++ b/src/framework/events/vscp_evt_ir.c @@ -43,9 +43,9 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include "vscp_evt_ir.h" -#include "..\core\vscp_core.h" -#include "..\core\vscp_class_l1.h" -#include "..\core\vscp_type_ir.h" +#include "../core/vscp_core.h" +#include "../core/vscp_class_l1.h" +#include "../core/vscp_type_ir.h" /******************************************************************************* COMPILER SWITCHES diff --git a/src/framework/events/vscp_evt_ir.h b/src/framework/events/vscp_evt_ir.h index d7f1435..fe7dc7c 100644 --- a/src/framework/events/vscp_evt_ir.h +++ b/src/framework/events/vscp_evt_ir.h @@ -46,7 +46,7 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include -#include "..\user\vscp_platform.h" +#include "../user/vscp_platform.h" #ifdef __cplusplus extern "C" diff --git a/src/framework/events/vscp_evt_log.c b/src/framework/events/vscp_evt_log.c index 3e52f95..be404c2 100644 --- a/src/framework/events/vscp_evt_log.c +++ b/src/framework/events/vscp_evt_log.c @@ -43,9 +43,9 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include "vscp_evt_log.h" -#include "..\core\vscp_core.h" -#include "..\core\vscp_class_l1.h" -#include "..\core\vscp_type_log.h" +#include "../core/vscp_core.h" +#include "../core/vscp_class_l1.h" +#include "../core/vscp_type_log.h" /******************************************************************************* COMPILER SWITCHES diff --git a/src/framework/events/vscp_evt_log.h b/src/framework/events/vscp_evt_log.h index cab13fb..1b17583 100644 --- a/src/framework/events/vscp_evt_log.h +++ b/src/framework/events/vscp_evt_log.h @@ -46,7 +46,7 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include -#include "..\user\vscp_platform.h" +#include "../user/vscp_platform.h" #ifdef __cplusplus extern "C" diff --git a/src/framework/events/vscp_evt_measurement.c b/src/framework/events/vscp_evt_measurement.c index e718c8f..a3aed32 100644 --- a/src/framework/events/vscp_evt_measurement.c +++ b/src/framework/events/vscp_evt_measurement.c @@ -43,10 +43,10 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include "vscp_evt_measurement.h" -#include "..\core\vscp_core.h" -#include "..\core\vscp_class_l1.h" -#include "..\core\vscp_type_measurement.h" -#include "..\core\vscp_data_coding.h" +#include "../core/vscp_core.h" +#include "../core/vscp_class_l1.h" +#include "../core/vscp_type_measurement.h" +#include "../core/vscp_data_coding.h" /******************************************************************************* COMPILER SWITCHES diff --git a/src/framework/events/vscp_evt_measurement.h b/src/framework/events/vscp_evt_measurement.h index 81e7594..ed47566 100644 --- a/src/framework/events/vscp_evt_measurement.h +++ b/src/framework/events/vscp_evt_measurement.h @@ -48,7 +48,7 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include -#include "..\user\vscp_platform.h" +#include "../user/vscp_platform.h" #ifdef __cplusplus extern "C" diff --git a/src/framework/events/vscp_evt_measurement32.c b/src/framework/events/vscp_evt_measurement32.c index 65d36b4..a65a6fc 100644 --- a/src/framework/events/vscp_evt_measurement32.c +++ b/src/framework/events/vscp_evt_measurement32.c @@ -43,9 +43,9 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include "vscp_evt_measurement32.h" -#include "..\core\vscp_core.h" -#include "..\core\vscp_class_l1.h" -#include "..\core\vscp_type_measurement32.h" +#include "../core/vscp_core.h" +#include "../core/vscp_class_l1.h" +#include "../core/vscp_type_measurement32.h" /******************************************************************************* COMPILER SWITCHES diff --git a/src/framework/events/vscp_evt_measurement32.h b/src/framework/events/vscp_evt_measurement32.h index 5e01e30..5de1ee1 100644 --- a/src/framework/events/vscp_evt_measurement32.h +++ b/src/framework/events/vscp_evt_measurement32.h @@ -47,7 +47,7 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include -#include "..\user\vscp_platform.h" +#include "../user/vscp_platform.h" #include #ifdef __cplusplus diff --git a/src/framework/events/vscp_evt_measurement64.c b/src/framework/events/vscp_evt_measurement64.c index 6a1c537..49379e8 100644 --- a/src/framework/events/vscp_evt_measurement64.c +++ b/src/framework/events/vscp_evt_measurement64.c @@ -43,9 +43,9 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include "vscp_evt_measurement64.h" -#include "..\core\vscp_core.h" -#include "..\core\vscp_class_l1.h" -#include "..\core\vscp_type_measurement64.h" +#include "../core/vscp_core.h" +#include "../core/vscp_class_l1.h" +#include "../core/vscp_type_measurement64.h" /******************************************************************************* COMPILER SWITCHES diff --git a/src/framework/events/vscp_evt_measurement64.h b/src/framework/events/vscp_evt_measurement64.h index 32358cc..4e2b7fb 100644 --- a/src/framework/events/vscp_evt_measurement64.h +++ b/src/framework/events/vscp_evt_measurement64.h @@ -47,7 +47,7 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include -#include "..\user\vscp_platform.h" +#include "../user/vscp_platform.h" #include #ifdef __cplusplus diff --git a/src/framework/events/vscp_evt_measurezone.c b/src/framework/events/vscp_evt_measurezone.c index 07bcdef..c4a031d 100644 --- a/src/framework/events/vscp_evt_measurezone.c +++ b/src/framework/events/vscp_evt_measurezone.c @@ -43,10 +43,10 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include "vscp_evt_measurezone.h" -#include "..\core\vscp_core.h" -#include "..\core\vscp_class_l1.h" -#include "..\core\vscp_type_measurezone.h" -#include "..\core\vscp_data_coding.h" +#include "../core/vscp_core.h" +#include "../core/vscp_class_l1.h" +#include "../core/vscp_type_measurezone.h" +#include "../core/vscp_data_coding.h" /******************************************************************************* COMPILER SWITCHES diff --git a/src/framework/events/vscp_evt_measurezone.h b/src/framework/events/vscp_evt_measurezone.h index 089b43a..87de63e 100644 --- a/src/framework/events/vscp_evt_measurezone.h +++ b/src/framework/events/vscp_evt_measurezone.h @@ -49,7 +49,7 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include -#include "..\user\vscp_platform.h" +#include "../user/vscp_platform.h" #ifdef __cplusplus extern "C" diff --git a/src/framework/events/vscp_evt_multimedia.c b/src/framework/events/vscp_evt_multimedia.c index 29631a2..48c8872 100644 --- a/src/framework/events/vscp_evt_multimedia.c +++ b/src/framework/events/vscp_evt_multimedia.c @@ -43,9 +43,9 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include "vscp_evt_multimedia.h" -#include "..\core\vscp_core.h" -#include "..\core\vscp_class_l1.h" -#include "..\core\vscp_type_multimedia.h" +#include "../core/vscp_core.h" +#include "../core/vscp_class_l1.h" +#include "../core/vscp_type_multimedia.h" /******************************************************************************* COMPILER SWITCHES diff --git a/src/framework/events/vscp_evt_multimedia.h b/src/framework/events/vscp_evt_multimedia.h index 838cca1..20cc704 100644 --- a/src/framework/events/vscp_evt_multimedia.h +++ b/src/framework/events/vscp_evt_multimedia.h @@ -47,7 +47,7 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include -#include "..\user\vscp_platform.h" +#include "../user/vscp_platform.h" #ifdef __cplusplus extern "C" diff --git a/src/framework/events/vscp_evt_phone.c b/src/framework/events/vscp_evt_phone.c index 5430f89..0d99a0c 100644 --- a/src/framework/events/vscp_evt_phone.c +++ b/src/framework/events/vscp_evt_phone.c @@ -43,9 +43,9 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include "vscp_evt_phone.h" -#include "..\core\vscp_core.h" -#include "..\core\vscp_class_l1.h" -#include "..\core\vscp_type_phone.h" +#include "../core/vscp_core.h" +#include "../core/vscp_class_l1.h" +#include "../core/vscp_type_phone.h" /******************************************************************************* COMPILER SWITCHES diff --git a/src/framework/events/vscp_evt_phone.h b/src/framework/events/vscp_evt_phone.h index 271da74..e3cc7c1 100644 --- a/src/framework/events/vscp_evt_phone.h +++ b/src/framework/events/vscp_evt_phone.h @@ -46,7 +46,7 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include -#include "..\user\vscp_platform.h" +#include "../user/vscp_platform.h" #ifdef __cplusplus extern "C" diff --git a/src/framework/events/vscp_evt_protocol.c b/src/framework/events/vscp_evt_protocol.c index babd610..5df46b2 100644 --- a/src/framework/events/vscp_evt_protocol.c +++ b/src/framework/events/vscp_evt_protocol.c @@ -43,9 +43,9 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include "vscp_evt_protocol.h" -#include "..\core\vscp_core.h" -#include "..\core\vscp_class_l1.h" -#include "..\core\vscp_type_protocol.h" +#include "../core/vscp_core.h" +#include "../core/vscp_class_l1.h" +#include "../core/vscp_type_protocol.h" /******************************************************************************* COMPILER SWITCHES diff --git a/src/framework/events/vscp_evt_protocol.h b/src/framework/events/vscp_evt_protocol.h index 9b3a8f5..70093c5 100644 --- a/src/framework/events/vscp_evt_protocol.h +++ b/src/framework/events/vscp_evt_protocol.h @@ -52,7 +52,7 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include -#include "..\user\vscp_platform.h" +#include "../user/vscp_platform.h" #ifdef __cplusplus extern "C" diff --git a/src/framework/events/vscp_evt_security.c b/src/framework/events/vscp_evt_security.c index 3b0fabc..cfbf3c3 100644 --- a/src/framework/events/vscp_evt_security.c +++ b/src/framework/events/vscp_evt_security.c @@ -43,9 +43,9 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include "vscp_evt_security.h" -#include "..\core\vscp_core.h" -#include "..\core\vscp_class_l1.h" -#include "..\core\vscp_type_security.h" +#include "../core/vscp_core.h" +#include "../core/vscp_class_l1.h" +#include "../core/vscp_type_security.h" /******************************************************************************* COMPILER SWITCHES diff --git a/src/framework/events/vscp_evt_security.h b/src/framework/events/vscp_evt_security.h index c0bffaf..3bb5dcf 100644 --- a/src/framework/events/vscp_evt_security.h +++ b/src/framework/events/vscp_evt_security.h @@ -46,7 +46,7 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include -#include "..\user\vscp_platform.h" +#include "../user/vscp_platform.h" #ifdef __cplusplus extern "C" diff --git a/src/framework/events/vscp_evt_setvaluezone.c b/src/framework/events/vscp_evt_setvaluezone.c index befe388..e89c6d2 100644 --- a/src/framework/events/vscp_evt_setvaluezone.c +++ b/src/framework/events/vscp_evt_setvaluezone.c @@ -43,9 +43,9 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include "vscp_evt_setvaluezone.h" -#include "..\core\vscp_core.h" -#include "..\core\vscp_class_l1.h" -#include "..\core\vscp_type_setvaluezone.h" +#include "../core/vscp_core.h" +#include "../core/vscp_class_l1.h" +#include "../core/vscp_type_setvaluezone.h" /******************************************************************************* COMPILER SWITCHES diff --git a/src/framework/events/vscp_evt_setvaluezone.h b/src/framework/events/vscp_evt_setvaluezone.h index 3a946bc..c28f2d5 100644 --- a/src/framework/events/vscp_evt_setvaluezone.h +++ b/src/framework/events/vscp_evt_setvaluezone.h @@ -47,7 +47,7 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include -#include "..\user\vscp_platform.h" +#include "../user/vscp_platform.h" #ifdef __cplusplus extern "C" diff --git a/src/framework/events/vscp_evt_weather.c b/src/framework/events/vscp_evt_weather.c index dd6e671..773100d 100644 --- a/src/framework/events/vscp_evt_weather.c +++ b/src/framework/events/vscp_evt_weather.c @@ -43,9 +43,9 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include "vscp_evt_weather.h" -#include "..\core\vscp_core.h" -#include "..\core\vscp_class_l1.h" -#include "..\core\vscp_type_weather.h" +#include "../core/vscp_core.h" +#include "../core/vscp_class_l1.h" +#include "../core/vscp_type_weather.h" /******************************************************************************* COMPILER SWITCHES diff --git a/src/framework/events/vscp_evt_weather.h b/src/framework/events/vscp_evt_weather.h index 12f7c24..3e5dd51 100644 --- a/src/framework/events/vscp_evt_weather.h +++ b/src/framework/events/vscp_evt_weather.h @@ -46,7 +46,7 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include -#include "..\user\vscp_platform.h" +#include "../user/vscp_platform.h" #ifdef __cplusplus extern "C" diff --git a/src/framework/events/vscp_evt_weather_forecast.c b/src/framework/events/vscp_evt_weather_forecast.c index 408f55d..d5006b4 100644 --- a/src/framework/events/vscp_evt_weather_forecast.c +++ b/src/framework/events/vscp_evt_weather_forecast.c @@ -43,9 +43,9 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include "vscp_evt_weather_forecast.h" -#include "..\core\vscp_core.h" -#include "..\core\vscp_class_l1.h" -#include "..\core\vscp_type_weather_forecast.h" +#include "../core/vscp_core.h" +#include "../core/vscp_class_l1.h" +#include "../core/vscp_type_weather_forecast.h" /******************************************************************************* COMPILER SWITCHES diff --git a/src/framework/events/vscp_evt_weather_forecast.h b/src/framework/events/vscp_evt_weather_forecast.h index 10efe44..f7f60d7 100644 --- a/src/framework/events/vscp_evt_weather_forecast.h +++ b/src/framework/events/vscp_evt_weather_forecast.h @@ -46,7 +46,7 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include -#include "..\user\vscp_platform.h" +#include "../user/vscp_platform.h" #ifdef __cplusplus extern "C" diff --git a/src/framework/events/vscp_evt_wireless.c b/src/framework/events/vscp_evt_wireless.c index 8268e07..86ad38d 100644 --- a/src/framework/events/vscp_evt_wireless.c +++ b/src/framework/events/vscp_evt_wireless.c @@ -43,9 +43,9 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include "vscp_evt_wireless.h" -#include "..\core\vscp_core.h" -#include "..\core\vscp_class_l1.h" -#include "..\core\vscp_type_wireless.h" +#include "../core/vscp_core.h" +#include "../core/vscp_class_l1.h" +#include "../core/vscp_type_wireless.h" /******************************************************************************* COMPILER SWITCHES diff --git a/src/framework/events/vscp_evt_wireless.h b/src/framework/events/vscp_evt_wireless.h index fc5ea64..1d56e8e 100644 --- a/src/framework/events/vscp_evt_wireless.h +++ b/src/framework/events/vscp_evt_wireless.h @@ -46,7 +46,7 @@ This file is automatically generated. Don't change it manually. INCLUDES *******************************************************************************/ #include -#include "..\user\vscp_platform.h" +#include "../user/vscp_platform.h" #ifdef __cplusplus extern "C" From 031c19c72bcb2145bad252a54b0d20119b23ff26 Mon Sep 17 00:00:00 2001 From: BlueAndi Date: Thu, 31 Oct 2024 19:50:53 +0100 Subject: [PATCH 2/2] Prepare v2.0.4 --- CHANGELOG.md | 6 ++++++ library.json | 2 +- library.properties | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a3d621..d41f6ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 2.0.4 + +- Fixed problem with backslashes in include paths. +- Fixed problem with wrong include path in vscp_evt_information.c module. Thanks to michpro! +- Examples updated to be working with latest CAN libraries. + ## 2.0.3 - Update to VSCP framework v2.0.3, please see the ![changelog](https://github.com/BlueAndi/vscp-framework/releases/tag/v2.0.3) there. diff --git a/library.json b/library.json index 723441c..3635301 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "vscp-arduino", - "version": "2.0.3", + "version": "2.0.4", "keywords": "vscp, arduino-library, vscp-arduino, automation, home automation", "description": "Very Simple Control Procotol (VSCP) Level 1 Library for the arduino IDE.", "repository": { diff --git a/library.properties b/library.properties index 438d994..36fb81a 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=VSCP -version=2.0.3 +version=2.0.4 author=Andreas Merkle maintainer=Andreas Merkle sentence=Very Simple Control Protocol L1 framework for all Arduino boards.