Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2024-10-20 20:07:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feat_datasecure

Browse Source
This commit is contained in:
Nanosonde 2020-06-25 21:28:51 +02:00
commit 318d350243
21 changed files with 730 additions and 775 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/knx-linux/knx-linux.vcxproj
View File

@ -93,6 +93,7 @@
<ClInclude Include="..\..\src\knx\device_object.h" />
<ClInclude Include="..\..\src\knx\dpt.h" />
<ClInclude Include="..\..\src\knx\dptconvert.h" />
<ClInclude Include="..\..\src\knx\function_property.h" />
<ClInclude Include="..\..\src\knx\group_object.h" />
<ClInclude Include="..\..\src\knx\group_object_table_object.h" />
<ClInclude Include="..\..\src\knx\interface_object.h" />

3
examples/knx-linux/knx-linux.vcxproj.filters
View File

@ -194,6 +194,9 @@
<ClInclude Include="..\..\src\knx\knx_ip_supported_service_dib.h">
<Filter>Header files\knx</Filter>
</ClInclude>
<ClInclude Include="..\..\src\knx\function_property.h">
<Filter>Header files\knx</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="main.cpp">

6
src/knx/application_layer.cpp
View File

@ -487,7 +487,7 @@ void ApplicationLayer::systemNetworkParameterReadResponse(Priority priority, Hop
//TODO: ApplicationLayer::domainAddressSerialNumberWriteRequest()
//TODO: ApplicationLayer::domainAddressSerialNumberReadRequest()
void ApplicationLayer::domainAddressSerialNumberReadResponse(Priority priority, HopCountType hopType, uint8_t* rfDoA,
void ApplicationLayer::domainAddressSerialNumberReadResponse(Priority priority, HopCountType hopType, const uint8_t* rfDoA,
const uint8_t* knxSerialNumber)
{
CemiFrame frame(13);
@ -506,8 +506,8 @@ void ApplicationLayer::domainAddressSerialNumberReadResponse(Priority priority,
//TODO: ApplicationLayer::IndividualAddressSerialNumberWriteRequest()
//TODO: ApplicationLayer::IndividualAddressSerialNumberReadRequest()
void ApplicationLayer::IndividualAddressSerialNumberReadResponse(Priority priority, HopCountType hopType, uint8_t* rfDoA,
uint8_t* knxSerialNumber)
void ApplicationLayer::IndividualAddressSerialNumberReadResponse(Priority priority, HopCountType hopType, const uint8_t* rfDoA,
const uint8_t* knxSerialNumber)
{
CemiFrame frame(13);
APDU& apdu = frame.apdu();

6
src/knx/application_layer.h
View File

@ -135,10 +135,10 @@ class ApplicationLayer
void systemNetworkParameterReadResponse(Priority priority, HopCountType hopType, uint16_t objectType,
uint16_t propertyId, uint8_t* testInfo, uint16_t testInfoLength,
uint8_t* testResult, uint16_t testResultLength);
void domainAddressSerialNumberReadResponse(Priority priority, HopCountType hopType, uint8_t* rfDoA,
void domainAddressSerialNumberReadResponse(Priority priority, HopCountType hopType, const uint8_t* rfDoA,
const uint8_t* knxSerialNumber);
void IndividualAddressSerialNumberReadResponse(Priority priority, HopCountType hopType, const uint8_t* rfDoA,
const uint8_t* knxSerialNumber);
void IndividualAddressSerialNumberReadResponse(Priority priority, HopCountType hopType, uint8_t* rfDoA,
uint8_t* knxSerialNumber);
#pragma endregion
protected:

3
src/knx/bau_systemB.cpp
View File

@ -56,6 +56,9 @@ void BauSystemB::enabled(bool value)
void BauSystemB::sendNextGroupTelegram()
{
if(!configured())
return;
static uint16_t startIdx = 1;
GroupObjectTableObject& table = _groupObjTable;

2
src/knx/bits.h
View File

@ -34,7 +34,7 @@ uint32_t digitalRead(uint32_t dwPin);
typedef void (*voidFuncPtr)(void);
void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode);
#elif ARDUINO_ARCH_SAMD
#elif ARDUINO_ARCH_SAMD || ARDUINO_ARCH_STM32
#include <Arduino.h>
#define getbyte(x,n) (*(((uint8_t*)&(x))+n))

4
src/knx/cemi_frame.cpp
View File

@ -323,9 +323,9 @@ uint8_t* CemiFrame::rfSerialOrDoA() const
return _rfSerialOrDoA;
}
void CemiFrame::rfSerialOrDoA(uint8_t* rfSerialOrDoA)
void CemiFrame::rfSerialOrDoA(const uint8_t* rfSerialOrDoA)
{
_rfSerialOrDoA = rfSerialOrDoA;
_rfSerialOrDoA = (uint8_t*)rfSerialOrDoA;
}
uint8_t CemiFrame::rfInfo() const

2
src/knx/cemi_frame.h
View File

@ -60,7 +60,7 @@ class CemiFrame
#ifdef USE_RF
// only for RF medium
uint8_t* rfSerialOrDoA() const;
void rfSerialOrDoA(uint8_t* rfSerialOrDoA);
void rfSerialOrDoA(const uint8_t* rfSerialOrDoA);
uint8_t rfInfo() const;
void rfInfo(uint8_t rfInfo);
uint8_t rfLfn() const;

18
src/knx/dptconvert.cpp
View File

@ -416,11 +416,11 @@ int busValueToUnsigned8(const uint8_t* payload, size_t payload_length, const Dpt
switch (datatype.subGroup)
{
case 1:
value = (uint8_t)(unsigned8FromPayload(payload, 0) * 100.0 / 255.0);
value = (uint8_t)round(unsigned8FromPayload(payload, 0) * 100.0 / 255.0);
return true;
case 3:
value = (uint8_t)unsigned8FromPayload(payload, 0) * 360.0 / 255.0;
value = (uint8_t)round(unsigned8FromPayload(payload, 0) * 360.0 / 255.0);
return true;
case 6:
@ -1043,7 +1043,7 @@ int valueToBusValueSigned8(const KNXValue& value, uint8_t* payload, size_t paylo
if ((int64_t)value < INT64_C(-128) || (int64_t)value > INT64_C(127))
return false;
signed8ToPayload(payload, 0, payload_length, (uint64_t)value, 0xFF);
signed8ToPayload(payload, payload_length, 0, (uint64_t)value, 0xFF);
return true;
}
@ -1723,8 +1723,9 @@ double float16FromPayload(const uint8_t* payload, int index)
}
float float32FromPayload(const uint8_t* payload, int index)
{
uint32_t area = unsigned32FromPayload(payload, index);
return *((float*)&area);
union { float f; uint32_t i; } area;
area.i = unsigned32FromPayload(payload, index);
return area.f;
}
int64_t signed64FromPayload(const uint8_t* payload, int index)
{
@ -1815,8 +1816,9 @@ void float16ToPayload(uint8_t* payload, size_t payload_length, int index, double
}
void float32ToPayload(uint8_t* payload, size_t payload_length, int index, double value, uint32_t mask)
{
float num = value;
unsigned32ToPayload(payload, payload_length, index, *((uint32_t*)&num), mask);
union { float f; uint32_t i; } num;
num.f = value;
unsigned32ToPayload(payload, payload_length, index, num.i, mask);
}
void signed64ToPayload(uint8_t* payload, size_t payload_length, int index, int64_t value, uint64_t mask)
{
@ -1837,4 +1839,4 @@ void bcdToPayload(uint8_t* payload, size_t payload_length, int index, uint8_t va
payload[index / 2] = (payload[index / 2] & 0xF0) | (value & 0x0F);
else
payload[index / 2] = (payload[index / 2] & 0x0F) | ((value << 4) & 0xF0);
}
}

6
src/knx/function_property.h
View File

@ -7,11 +7,11 @@ class InterfaceObject;
template <class T> class FunctionProperty : public Property
{
public:
FunctionProperty(T* io, PropertyID id, uint8_t access,
FunctionProperty(T* io, PropertyID id,
void (*commandCallback)(T*, uint8_t*, uint8_t, uint8_t*, uint8_t&),
void (*stateCallback)(T*, uint8_t*, uint8_t, uint8_t*, uint8_t&))
: Property(id, false, PDT_FUNCTION, 1, access), _interfaceObject(io), _commandCallback(commandCallback), _stateCallback(stateCallback)
/* max_elements is set to 1, see 3.3.7 Application Layer p.68 */
: Property(id, false, PDT_FUNCTION, 1, ReadLv0|WriteLv0), _interfaceObject(io), _commandCallback(commandCallback), _stateCallback(stateCallback)
/* max_elements is set to 1, read and write level any value so we use Lv0, see 3.3.7 Application Layer p.68 */
{}
virtual uint8_t read(uint16_t start, uint8_t count, uint8_t* data) const override

59
src/knx/interface_object.cpp
View File

@ -10,54 +10,6 @@ InterfaceObject::~InterfaceObject()
}
void InterfaceObject::readPropertyDescription(uint8_t& propertyId, uint8_t& propertyIndex, bool& writeEnable, uint8_t& type, uint16_t& numberOfElements, uint8_t& access)
{
PropertyDescription* descriptions = propertyDescriptions();
uint8_t count = propertyDescriptionCount();
numberOfElements = 0;
if (descriptions == nullptr || count == 0)
return readPropertyDescription2(propertyId, propertyIndex, writeEnable, type, numberOfElements, access);
PropertyDescription* desc = nullptr;
// from KNX spec. 03.03.07 Application Layer (page 56) - 3.4.3.3 A_PropertyDescription_Read-service
// Summary: either propertyId OR propertyIndex, but not both at the same time
if (propertyId != 0)
{
for (uint8_t i = 0; i < count; i++)
{
PropertyDescription d = descriptions[i];
if (d.Id != propertyId)
continue;
desc = &d;
propertyIndex = i;
break;
}
}
else
{
// If propertyId is zero, propertyIndex shall be used.
// Response: propertyIndex of received A_PropertyDescription_Read
if (propertyIndex < count)
{
desc = &descriptions[propertyIndex];
}
}
if (desc != nullptr)
{
propertyId = desc->Id;
writeEnable = desc->WriteEnable;
type = desc->Type;
numberOfElements = desc->MaxElements;
access = desc->Access;
}
else
return readPropertyDescription2(propertyId, propertyIndex, writeEnable, type, numberOfElements, access);
}
void InterfaceObject::readPropertyDescription2(uint8_t& propertyId, uint8_t& propertyIndex, bool& writeEnable, uint8_t& type, uint16_t& numberOfElements, uint8_t& access)
{
uint8_t count = _propertyCount;
@ -161,17 +113,6 @@ void InterfaceObject::state(PropertyID id, uint8_t* data, uint8_t length, uint8_
prop->state(data, length, resultData, resultLength);
}
uint8_t InterfaceObject::propertyDescriptionCount()
{
return 0;
}
PropertyDescription* InterfaceObject::propertyDescriptions()
{
return nullptr;
}
void InterfaceObject::initializeProperties(size_t propertiesSize, Property** properties)
{
_propertyCount = propertiesSize / sizeof(Property*);

11
src/knx/interface_object.h
View File

@ -147,9 +147,7 @@ class InterfaceObject : public SaveRestore
*
* @param[out] access the ::AccessLevel necessary to read/write the property.
*/
// TODO: remove first version after complete property refactoring
void readPropertyDescription(uint8_t& propertyId, uint8_t& propertyIndex, bool& writeEnable, uint8_t& type, uint16_t& numberOfElements, uint8_t& access);
void readPropertyDescription2(uint8_t& propertyId, uint8_t& propertyIndex, bool& writeEnable, uint8_t& type, uint16_t& numberOfElements, uint8_t& access);
/**
* Gets property with PropertyID id if it exists and nullptr otherwise.
@ -184,15 +182,6 @@ class InterfaceObject : public SaveRestore
virtual uint16_t saveSize() override;
protected:
/**
* Returns the number of properties the interface object has.
*/
virtual uint8_t propertyDescriptionCount();
/**
* Returns a pointer to the first PropertyDescription of the interface object.
* This is used by readPropertyDescription() together with propertyCount().
*/
virtual PropertyDescription* propertyDescriptions();
/**
* Intializes the Property-array the the supplied values.

165
src/knx/rf_medium_object.cpp
View File

@ -1,141 +1,60 @@
#include <cstring>
#include "rf_medium_object.h"
#include "bits.h"
#include "data_property.h"
#include "function_property.h"
#include "config.h"
#ifdef USE_RF
void RfMediumObject::readProperty(PropertyID propertyId, uint16_t start, uint8_t& count, uint8_t* data)
RfMediumObject::RfMediumObject()
{
switch (propertyId)
uint8_t rfDomainAddress[] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; // see KNX RF S-Mode AN160 p.11
Property* properties[] =
{
case PID_OBJECT_TYPE:
pushWord(OT_RF_MEDIUM, data);
break;
case PID_RF_MULTI_TYPE:
data[0] = 0x00; // KNX RF ready only
break;
case PID_RF_DOMAIN_ADDRESS:
pushByteArray((uint8_t*)_rfDomainAddress, 6, data);
break;
case PID_RF_RETRANSMITTER:
data[0] = 0x00; // No KNX RF retransmitter
break;
case PID_RF_BIDIR_TIMEOUT: // PDT_FUNCTION
data[0] = 0x00; // success
data[1] = 0xFF; // permanent bidirectional device
data[2] = 0xFF; // permanent bidirectional device
break;
case PID_RF_DIAG_SA_FILTER_TABLE: // PDT_GENERIC_03[]
pushByteArray((uint8_t*)_rfDiagSourceAddressFilterTable, 24, data);
break;
case PID_RF_DIAG_BUDGET_TABLE:
pushByteArray((uint8_t*)_rfDiagLinkBudgetTable, 24, data);
break;
case PID_RF_DIAG_PROBE: // PDT_FUNCTION
// Not supported yet
break;
default:
count = 0;
}
new DataProperty(PID_OBJECT_TYPE, false, PDT_UNSIGNED_INT, 1, ReadLv3 | WriteLv0, (uint16_t)OT_RF_MEDIUM),
new DataProperty(PID_RF_MULTI_TYPE, true, PDT_GENERIC_01, 1, ReadLv3 | WriteLv2, (uint8_t)0x00),
new DataProperty(PID_RF_RETRANSMITTER, false, PDT_GENERIC_01, 1, ReadLv3 | WriteLv0, (uint8_t)0x00),
new DataProperty(PID_RF_DOMAIN_ADDRESS, true, PDT_GENERIC_06, 1, ReadLv3 | WriteLv2, rfDomainAddress),
new FunctionProperty<RfMediumObject>(this, PID_RF_BIDIR_TIMEOUT,
[](RfMediumObject* io, uint8_t* data, uint8_t length, uint8_t* resultData, uint8_t& resultLength)
{
resultData[0] = 0x00; // success
resultData[1] = 0xFF; // permanent bidirectional device
resultData[2] = 0xFF; // permanent bidirectional device
resultLength = 3;
},
[](RfMediumObject* io, uint8_t* data, uint8_t length, uint8_t* resultData, uint8_t& resultLength)
{
resultData[0] = 0x00; // success
resultData[1] = 0xFF; // permanent bidirectional device
resultData[2] = 0xFF; // permanent bidirectional device
resultLength = 3;
}),
/* This properties are used in NMP_LinkBudget_Measure to diagnose the Link Budget of the communication.
This in not implemented yet.
new DataProperty(PID_RF_DIAG_SA_FILTER_TABLE, true, PDT_GENERIC_03, 8, ReadLv3 | WriteLv3),
new DataProperty(PID_RF_DIAG_BUDGET_TABLE, false, PDT_GENERIC_03, 8, ReadLv3 | WriteLv0),
new FunctionProperty<RfMediumObject>(this, PID_RF_DIAG_PROBE,
[](RfMediumObject* io, uint8_t* data, uint8_t length, uint8_t* resultData, uint8_t& resultLength)
{
},
[](RfMediumObject* io, uint8_t* data, uint8_t length, uint8_t* resultData, uint8_t& resultLength)
{
}), */
};
initializeProperties(sizeof(properties), properties);
}
void RfMediumObject::writeProperty(PropertyID id, uint16_t start, uint8_t* data, uint8_t& count)
const uint8_t* RfMediumObject::rfDomainAddress()
{
switch (id)
{
case PID_RF_MULTI_TYPE:
// We only support RF ready and not RF multi, ignore write request
break;
case PID_RF_DOMAIN_ADDRESS:
for (uint8_t i = start; i < start + count; i++)
_rfDomainAddress[i-1] = data[i - start];
break;
case PID_RF_BIDIR_TIMEOUT: // PDT_FUNCTION
// Not supported yet (permanent bidir device)
break;
case PID_RF_DIAG_SA_FILTER_TABLE:
for (uint8_t i = start; i < start + count; i++)
_rfDiagSourceAddressFilterTable[i-1] = data[i - start];
break;
case PID_RF_DIAG_BUDGET_TABLE:
for (uint8_t i = start; i < start + count; i++)
_rfDiagLinkBudgetTable[i-1] = data[i - start];
break;
case PID_RF_DIAG_PROBE:
// Not supported yet
break;
default:
count = 0;
break;
}
}
uint8_t RfMediumObject::propertySize(PropertyID id)
{
switch (id)
{
case PID_RF_MULTI_TYPE:
case PID_RF_RETRANSMITTER:
return 1;
case PID_OBJECT_TYPE:
return 2;
case PID_RF_DOMAIN_ADDRESS:
return 6;
case PID_RF_DIAG_SA_FILTER_TABLE:
case PID_RF_DIAG_BUDGET_TABLE:
return 24;
// case PID_RF_BIDIR_TIMEOUT: ?
// case PID_RF_DIAG_PROBE: ?
default:
break;
}
return 0;
}
uint8_t* RfMediumObject::save(uint8_t* buffer)
{
buffer = pushByteArray((uint8_t*)_rfDomainAddress, 6, buffer);
return buffer;
}
const uint8_t* RfMediumObject::restore(const uint8_t* buffer)
{
buffer = popByteArray((uint8_t*)_rfDomainAddress, 6, buffer);
return buffer;
}
uint16_t RfMediumObject::saveSize()
{
return 6;
}
uint8_t* RfMediumObject::rfDomainAddress()
{
return _rfDomainAddress;
DataProperty* prop = (DataProperty*)property(PID_RF_DOMAIN_ADDRESS);
return prop->data();
}
void RfMediumObject::rfDomainAddress(const uint8_t* value)
{
pushByteArray(value, 6, _rfDomainAddress);
}
static PropertyDescription _propertyDescriptions[] =
{
{ PID_OBJECT_TYPE, false, PDT_UNSIGNED_INT, 1, ReadLv3 | WriteLv0 },
{ PID_RF_MULTI_TYPE, false, PDT_GENERIC_01, 1, ReadLv3 | WriteLv0 },
{ PID_RF_RETRANSMITTER, false, PDT_GENERIC_01, 1, ReadLv3 | WriteLv0 },
{ PID_RF_DOMAIN_ADDRESS, true, PDT_GENERIC_06, 1, ReadLv3 | WriteLv0 }
};
static uint8_t _propertyDescriptionCount = sizeof(_propertyDescriptions) / sizeof(PropertyDescription);
uint8_t RfMediumObject::propertyDescriptionCount()
{
return _propertyDescriptionCount;
}
PropertyDescription* RfMediumObject::propertyDescriptions()
{
return _propertyDescriptions;
Property* prop = property(PID_RF_DOMAIN_ADDRESS);
prop->write(value);
}
#endif

14
src/knx/rf_medium_object.h
View File

@ -7,21 +7,11 @@
class RfMediumObject: public InterfaceObject
{
public:
void readProperty(PropertyID id, uint16_t start, uint8_t& count, uint8_t* data) override;
void writeProperty(PropertyID id, uint16_t start, uint8_t* data, uint8_t& count) override;
uint8_t propertySize(PropertyID id) override;
uint8_t* save(uint8_t* buffer) override;
const uint8_t* restore(const uint8_t* buffer) override;
uint16_t saveSize() override;
uint8_t* rfDomainAddress();
RfMediumObject();
const uint8_t* rfDomainAddress();
void rfDomainAddress(const uint8_t* value);
protected:
uint8_t propertyDescriptionCount() override;
PropertyDescription* propertyDescriptions() override;
private:
uint8_t _rfDomainAddress[6] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; // see KNX RF S-Mode AN160 p.11
uint8_t _rfDiagSourceAddressFilterTable[24] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,};
uint8_t _rfDiagLinkBudgetTable[24] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,};
};

2
src/knx/rf_physical_layer.h
View File

@ -59,7 +59,7 @@ extern void delayMicroseconds (unsigned int howLong);
#define PKTLEN 0x06 // Packet length
#define PKTCTRL1 0x07 // Packet automation control
#define PKTCTRL0 0x08 // Packet automation control
#define DADDR 0x09 // Device address
#define DEVADDR 0x09 // Device address
#define CHANNR 0x0A // Channel number
#define FSCTRL1 0x0B // Frequency synthesizer control
#define FSCTRL0 0x0C // Frequency synthesizer control

1090
src/knx/tpuart_data_link_layer.cpp
View File

File diff suppressed because it is too large Load Diff

1
src/knx/tpuart_data_link_layer.h
View File

@ -38,6 +38,7 @@ class TpUartDataLinkLayer : public DataLinkLayer
uint8_t _xorSum = 0;
uint32_t _lastByteRxTime;
uint32_t _waitConfirmStartTime;
uint32_t _lastResetChipTime = 0;
struct _tx_queue_frame_t
{

25
src/knx_facade.cpp
View File

@ -15,24 +15,37 @@
#else
#error "No medium type specified for platform Arduino_SAMD! Please set MEDIUM_TYPE! (TP:0, RF:2, IP:5)"
#endif
#define ICACHE_RAM_ATTR
#elif ARDUINO_ARCH_ESP8266
// predefined global instance for IP only
KnxFacade<EspPlatform, Bau57B0> knx;
#elif ARDUINO_ARCH_ESP32
// predefined global instance for IP only
KnxFacade<Esp32Platform, Bau57B0> knx;
// predefined global instance for TP or IP
#ifdef MEDIUM_TYPE
#if MEDIUM_TYPE == 0
KnxFacade<Esp32Platform, Bau07B0> knx;
#elif MEDIUM_TYPE == 5
KnxFacade<Esp32Platform, Bau57B0> knx;
#else
#error "Only TP and IP supported for Arduino ESP32 platform!"
#endif
#else
// Compatibility
KnxFacade<Esp32Platform, Bau57B0> knx;
//#error "No medium type specified for platform Arduino ESP32! Please set MEDIUM_TYPE! (TP:0, RF:2, IP:5)"
#endif
#elif ARDUINO_ARCH_STM32
KnxFacade<Stm32Platform, Bau07B0> knx;
#elif __linux__
// no predefined global instance
#define ICACHE_RAM_ATTR
#endif
#ifndef __linux__
uint32_t lastpressed=0;
#ifndef ICACHE_RAM_ATTR
#define ICACHE_RAM_ATTR
#endif
ICACHE_RAM_ATTR void buttonUp()
{
#ifndef __linux__
static uint32_t lastpressed=0;
if (millis() - lastpressed > 200){
knx._toogleProgMode = true;
lastpressed = millis();

23
src/knx_facade.h
View File

@ -17,7 +17,11 @@
#elif ARDUINO_ARCH_ESP32
#define LED_BUILTIN 13
#include "esp32_platform.h"
#include "knx/bau07B0.h"
#include "knx/bau57B0.h"
#elif ARDUINO_ARCH_STM32
#include "stm32_platform.h"
#include "knx/bau07B0.h"
#else
#define LED_BUILTIN 0
#include "linux_platform.h"
@ -331,8 +335,21 @@ template <class P, class B> class KnxFacade : private SaveRestore
// predefined global instance for IP only
extern KnxFacade<EspPlatform, Bau57B0> knx;
#elif ARDUINO_ARCH_ESP32
// predefined global instance for IP only
extern KnxFacade<Esp32Platform, Bau57B0> knx;
// predefined global instance for TP or IP
#ifdef MEDIUM_TYPE
#if MEDIUM_TYPE == 0
extern KnxFacade<Esp32Platform, Bau07B0> knx;
#elif MEDIUM_TYPE == 5
extern KnxFacade<Esp32Platform, Bau57B0> knx;
#else
#error "Only TP and IP supported for Arduino ESP32 platform!"
#endif
#else
#error "No medium type specified for Arduino ESP32 platform! Please set MEDIUM_TYPE! (TP:0, RF:2, IP:5)"
#endif
#elif ARDUINO_ARCH_STM32
// predefined global instance for TP only
extern KnxFacade<Stm32Platform, Bau07B0> knx;
#elif __linux__
// no predefined global instance
#endif
#endif

42
src/stm32_platform.cpp Normal file
View File

@ -0,0 +1,42 @@
#include "stm32_platform.h"
#ifdef ARDUINO_ARCH_STM32
#include <EEPROM.h>
#include "knx/bits.h"
Stm32Platform::Stm32Platform() : ArduinoPlatform(&Serial2), eepromPtr(nullptr), eepromSize(0)
{
}
Stm32Platform::Stm32Platform( HardwareSerial* s) : ArduinoPlatform(s), eepromPtr(nullptr), eepromSize(0)
{
}
Stm32Platform::~Stm32Platform()
{
delete [] eepromPtr;
}
void Stm32Platform::restart()
{
NVIC_SystemReset();
}
uint8_t * Stm32Platform::getEepromBuffer(uint16_t size)
{
delete [] eepromPtr;
eepromPtr = new uint8_t[size];
for (uint16_t i = 0; i < size; ++i)
eepromPtr[i] = EEPROM[i];
return eepromPtr;
}
void Stm32Platform::commitToEeprom()
{
if(eepromPtr == nullptr)
return;
for (uint16_t i = 0; i < eepromSize; ++i)
EEPROM.update(i, eepromPtr[i]);
}
#endif

22
src/stm32_platform.h Normal file
View File

@ -0,0 +1,22 @@
#ifdef ARDUINO_ARCH_STM32
#include "arduino_platform.h"
class Stm32Platform : public ArduinoPlatform
{
public:
Stm32Platform();
Stm32Platform( HardwareSerial* s);
~Stm32Platform();
// basic stuff
void restart();
//memory
uint8_t* getEepromBuffer(uint16_t size);
void commitToEeprom();
private:
uint8_t *eepromPtr;
uint16_t eepromSize;
};
#endif