Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2025-10-08 11:14:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Continue cleanup

Browse Source
This commit is contained in:
Nanosonde 2020-11-05 16:41:32 +01:00
parent 85c3f304f4
commit d7ee4b8b85
4 changed files with 212 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

372
src/cc1310_platform.cpp
View File

@ -15,7 +15,8 @@
#include "knx/bits.h"
#include "cc1310_platform.h"
#define printf(args...) (SEGGER_RTT_printf(0, args))
//#define printf(args...) (SEGGER_RTT_printf(0, args))
#define PRINT_RTT
volatile uint32_t CC1310Platform::msCounter = 0;
@ -64,8 +65,8 @@ void CC1310Platform::InitNVS()
NVS_Attrs attrs;
NVS_getAttrs(nvsHandle, &attrs);
printf("NVS flash size: %d\r\n", attrs.regionSize);
printf("NVS flash sector size: %d\r\n", attrs.sectorSize);
print("NVS flash size: "); println((int)attrs.regionSize);
print("NVS flash sector size: "); println((int)attrs.sectorSize);
}
CC1310Platform::CC1310Platform()
@ -99,9 +100,12 @@ void CC1310Platform::init()
uint8_t* CC1310Platform::getEepromBuffer(uint16_t size)
{
if(size > EEPROM_EMULATION_SIZE)
{
fatalError();
#if 1
}
NVS_read(nvsHandle, 0, (void *) _NVS_buffer, size);
for (int i=0; i<size; i++)
{
if (_NVS_buffer[i] != 0)
@ -109,7 +113,7 @@ uint8_t* CC1310Platform::getEepromBuffer(uint16_t size)
return _NVS_buffer;
}
}
#endif
memset(_NVS_buffer, 0xff, size);
return _NVS_buffer;
@ -118,18 +122,19 @@ uint8_t* CC1310Platform::getEepromBuffer(uint16_t size)
void CC1310Platform::commitToEeprom()
{
println("CC1310Platform::commitToEeprom() ...");
#if 1
int_fast16_t res = NVS_write(nvsHandle, 0, (void *)_NVS_buffer, EEPROM_EMULATION_SIZE, NVS_WRITE_ERASE | NVS_WRITE_POST_VERIFY);
if (res != NVS_STATUS_SUCCESS)
int_fast16_t result = NVS_write(nvsHandle, 0, (void *)_NVS_buffer, EEPROM_EMULATION_SIZE, NVS_WRITE_ERASE | NVS_WRITE_POST_VERIFY);
if (result != NVS_STATUS_SUCCESS)
{
printf("Error writing to NVS, ret = %d\n", res);
print("Error writing to NVS, result: "); println(result);
}
else
{
println("NVS successfully written\n");
println("NVS successfully written");
}
delay(500);
#endif
}
void CC1310Platform::restart()
@ -143,7 +148,6 @@ void CC1310Platform::fatalError()
println("A fatal error occured. Stopped.");
while(true)
{}
//restart();
}
uint32_t CC1310Platform::millis()
@ -181,58 +185,65 @@ void delayMicroseconds (unsigned int howLong)
ClockP_usleep(howLong);
}
#if 0
/* Buffer size for string operations (e.g. snprintf())*/
#define MAX_STRBUF_SIZE 100
int UART_printf(const char * fmt, ...)
size_t write(uint8_t c)
{
char s[MAX_STRBUF_SIZE];
va_list ap;
va_start(ap, fmt);
int n = vsnprintf(s, sizeof(s), fmt, ap);
va_end(ap);
if (uart)
#if defined(PRINT_UART)
uint8_t buffer[1] = {c};
return UART_write(uart, buffer, sizeof(buffer));
#elif defined (PRINT_RTT)
return SEGGER_RTT_PutChar(0, (char)c);
#else
return 1;
#endif
}
#if 0
size_t write(const uint8_t *buffer, size_t size)
{
size_t n = 0;
while (size--)
{
UART_write(uart, s, strlen(s));
if (write(*buffer++))
{
n++;
}
else
{
break;
}
}
return n;
}
void print(const char* s)
#else
size_t write(const uint8_t *buffer, size_t size)
{
if (uart)
{
UART_write(uart, s, strlen(s));
}
}
void print(int num, int base)
{
char s[MAX_STRBUF_SIZE];
if (base == HEX)
snprintf(s, sizeof(s),"%X", num);
else
snprintf(s, sizeof(s),"%d", num);
if (uart)
{
UART_write(uart, s, strlen(s));
}
#if defined(PRINT_UART)
return UART_write(uart, buffer, size);
#elif defined (PRINT_RTT)
return SEGGER_RTT_Write(0, buffer, size);
#else
return size;
#endif
}
#endif
/*
int printf(const char * fmt, ...)
size_t write(const char *buffer, size_t size)
{
char s[MAX_STRBUF_SIZE];
va_list ap;
va_start(ap, fmt);
int n = vsnprintf(s, sizeof(s), fmt, ap);
va_end(ap);
SEGGER_RTT_printf(0, s, strlen(s));
return n;
return write((const uint8_t *)buffer, size);
}
void print(const char* s)
{
if (s == NULL)
{
return;
}
write(s, strlen(s));
}
void print(char c)
{
write(c);
}
*/
void printUint64(uint64_t value, int base = DEC)
{
@ -251,6 +262,106 @@ void printUint64(uint64_t value, int base = DEC)
print(str);
}
void print(long long num, int base)
{
if (base == 0)
{
write(num);
return;
}
else if (base == 10)
{
if (num < 0)
{
print('-');
num = -num;
printUint64(num, 10);
return;
}
printUint64(num, 10);
return;
}
else
{
printUint64(num, base);
return;
}
}
void print(unsigned long long num, int base)
{
if (base == 0)
{
write(num);
return;
}
else
{
printUint64(num, base);
return;
}
}
void print(unsigned char num, int base)
{
print((unsigned long long)num, base);
}
void print(int num, int base)
{
print((long long)num, base);
}
void print(unsigned int num, int base)
{
print((unsigned long long)num, base);
}
void print(long num, int base)
{
print((long long)num, base);
}
void print(unsigned long num, int base)
{
print((unsigned long long)num, base);
}
void print(unsigned char num)
{
print(num, DEC);
}
void print(int num)
{
print(num, DEC);
}
void print(unsigned int num)
{
print(num, DEC);
}
void print(long num)
{
print(num, DEC);
}
void print(unsigned long num)
{
print(num, DEC);
}
void print(long long num)
{
print(num, DEC);
}
void print(unsigned long long num)
{
print(num, DEC);
}
void printFloat(double number, uint8_t digits)
{
if (std::isnan(number))
@ -265,12 +376,12 @@ void printFloat(double number, uint8_t digits)
}
if (number > 4294967040.0)
{
print ("ovf"); // constant determined empirically
print("ovf"); // constant determined empirically
return;
}
if (number <-4294967040.0)
{
print ("ovf"); // constant determined empirically
print("ovf"); // constant determined empirically
return;
}
@ -291,7 +402,7 @@ void printFloat(double number, uint8_t digits)
// Extract the integer part of the number and print it
unsigned long int_part = (unsigned long)number;
double remainder = number - (double)int_part;
print(int_part);
printUint64(int_part);
// Print the decimal point, but only if there are digits beyond
if (digits > 0)
@ -304,107 +415,30 @@ void printFloat(double number, uint8_t digits)
{
remainder *= 10.0;
unsigned int toPrint = (unsigned int)(remainder);
print(toPrint);
printUint64(toPrint);
remainder -= toPrint;
}
}
void print(const char* s)
void print(double num, int digits = 2)
{
printf("%s", s);
}
void print(char c)
{
printf("%c", c);
printFloat(num, digits);
}
void print(unsigned char num)
void println(void)
{
print(num, DEC);
}
void print(unsigned char num, int base)
{
if (base == HEX)
printf("%X", num);
else
printf("%d", num);
}
void print(int num)
{
print(num, DEC);
}
void print(int num, int base)
{
if (base == HEX)
printf("%X", num);
else
printf("%d", num);
}
void print(unsigned int num)
{
print(num, DEC);
}
void print(unsigned int num, int base)
{
if (base == HEX)
printf("%X", num);
else
printf("%d", num);
}
void print(long num)
{
print(num, DEC);
}
void print(long num, int base)
{
if (base == HEX)
printf("%lX", num);
else
printf("%ld", num);
}
void print(unsigned long num)
{
print(num, DEC);
}
void print(unsigned long num, int base)
{
if (base == HEX)
printf("%lX", num);
else
printf("%ld", num);
}
void print(unsigned long long num)
{
printUint64(num);
}
void print(unsigned long long num, int base)
{
printUint64(num, base);
}
void print(double num)
{
printf("%f", num);
print("\r\n");
}
void println(const char* s)
{
printf("%s\n", s);
print(s);
println();
}
void println(char c)
{
printf("%c\n", c);
print(c);
println();
}
void println(unsigned char num)
@ -414,10 +448,8 @@ void println(unsigned char num)
void println(unsigned char num, int base)
{
if (base == HEX)
printf("%X\n", num);
else
printf("%d\n", num);
print(num, base);
println();
}
void println(int num)
@ -427,10 +459,8 @@ void println(int num)
void println(int num, int base)
{
if (base == HEX)
printf("%X\n", num);
else
printf("%d\n", num);
print(num, base);
println();
}
void println(unsigned int num)
@ -440,10 +470,8 @@ void println(unsigned int num)
void println(unsigned int num, int base)
{
if (base == HEX)
printf("%X\n", num);
else
printf("%d\n", num);
print(num, base);
println();
}
void println(long num)
@ -453,10 +481,8 @@ void println(long num)
void println(long num, int base)
{
if (base == HEX)
printf("%lX\n", num);
else
printf("%ld\n", num);
print(num, base);
println();
}
void println(unsigned long num)
@ -466,37 +492,31 @@ void println(unsigned long num)
void println(unsigned long num, int base)
{
if (base == HEX)
printf("%lX\n", num);
else
printf("%ld\n", num);
print(num, base);
println();
}
void println(unsigned long long num)
{
printUint64(num);
println("");
println(num, DEC);
}
void println(unsigned long long num, int base)
{
printUint64(num, base);
println("");
println();
}
void println(double num, int digits = 2)
{
print(num, digits);
println();
}
void println(double num)
{
printf("%f\n", num);
}
void println(double num, int places)
{
printf("%f\n", num);
}
void println(void)
{
printf("\n");
// default: print 10 digits
println(num, 10);
}
uint32_t digitalRead(uint32_t dwPin)

3
src/knx/rf_physical_layer_cc1101.h
View File

@ -182,9 +182,6 @@ extern void delayMicroseconds (unsigned int howLong);
#define TX_ACTIVE 4
#define TX_END 5
// Calculate the real packet size out of the L-field of FT3 frame data. See KNX-RF spec. 3.2.5 Data Link Layer frame format
#define PACKET_SIZE(lField) ((((lField - 10 /*size of first pkt*/))/16 + 2 /*CRC in first pkt */) * 2 /*to bytes*/ +lField + 1 /*size of len byte*/)
class RfDataLinkLayer;
class RfPhysicalLayerCC1101 : public RfPhysicalLayer

27
src/knx/rf_physical_layer_cc1310.cpp
View File

@ -44,7 +44,7 @@ static volatile int err;
static void RxCallback(RF_Handle h, RF_CmdHandle ch, RF_EventMask e)
{
if ((e & RF_EventNDataWritten) /*&& (packetStartTime == 0)*/)
if ((e & RF_EventNDataWritten) && (packetStartTime == 0))
{
// pDataEntry->rxData contains the first byte of the received packet.
// Just get the address to get the start address of the receive buffer
@ -179,9 +179,12 @@ void RfPhysicalLayerCC1310::loop()
{
case TX_START:
{
uint8_t *sendBuffer {nullptr};
uint16_t sendBufferLength {0};
println("TX_START...");
_rfDataLinkLayer.loadNextTxFrame(&sendBuffer, &sendBufferLength);
pktLen = PACKET_SIZE(sendBuffer[0]);
uint16_t pktLen = PACKET_SIZE(sendBuffer[0]);
if (pktLen != sendBufferLength)
{
@ -274,25 +277,27 @@ void RfPhysicalLayerCC1310::loop()
}
else
{
print("nRxOk = ");println(rxStatistics.nRxOk); // Number of packets that have been received with payload, CRC OK and not ignored
print("nRxNok = ");println(rxStatistics.nRxNok); // Number of packets that have been received with CRC error
print("nRxIgnored = ");println(rxStatistics.nRxIgnored); // Number of packets that have been received with CRC OK and ignored due to address mismatch
print("nRxStopped = ");println(rxStatistics.nRxStopped); // Number of packets not received due to illegal length or address mismatch with pktConf.filterOp = 1
print("nRxBufFull = ");println(rxStatistics.nRxBufFull); // Number of packets that have been received and discarded due to lack of buffer space
print("lastRssi = ");println(rxStatistics.lastRssi); // RSSI of last received packet
// add CRC sizes for received blocks, but do not add the length of the L-field (1 byte) itself
packetLength = PACKET_SIZE(pDataEntry->rxData);
packetDataPointer = (uint8_t *) &pDataEntry->rxData;
// Sanity check: the partial data entry index points to the next free location in the partial RX buffer
if (packetLength != (pDataEntry->nextIndex - 1))
{
println("Mismatch between packetLength and pDataEntry->nextIndex: ");
print("packetLength = ");print(packetLength);
print(", pDataEntry->nextIndex = ");println(pDataEntry->nextIndex);
}
printHex("RX: ", packetDataPointer, packetLength);
/*
print("nRxOk = ");println(rxStatistics.nRxOk); // Number of packets that have been received with payload, CRC OK and not ignored
print("nRxNok = ");println(rxStatistics.nRxNok); // Number of packets that have been received with CRC error
print("nRxIgnored = ");println(rxStatistics.nRxIgnored); // Number of packets that have been received with CRC OK and ignored due to address mismatch
print("nRxStopped = ");println(rxStatistics.nRxStopped); // Number of packets not received due to illegal length or address mismatch with pktConf.filterOp = 1
print("nRxBufFull = ");println(rxStatistics.nRxBufFull); // Number of packets that have been received and discarded due to lack of buffer space
*/
print("RSSI: ");print(rxStatistics.lastRssi); // RSSI of last received packet
printHex(" - RX: ", packetDataPointer, packetLength);
_rfDataLinkLayer.frameBytesReceived(packetDataPointer, packetLength);
}
_loopState = RX_START;

7
src/knx/rf_physical_layer_cc1310.h
View File

@ -9,9 +9,6 @@
#define RX_PACKET_TIMEOUT 20 // Wait 20ms for packet reception to complete
// Calculate the real packet size out of the L-field of FT3 frame data. See KNX-RF spec. 3.2.5 Data Link Layer frame format
#define PACKET_SIZE(lField) ((((lField - 10 /*size of first pkt*/))/16 + 2 /*CRC in first pkt */) * 2 /*to bytes*/ +lField + 1 /*size of len byte*/)
// loop states
#define RX_START 0
#define RX_ACTIVE 1
@ -34,10 +31,6 @@ class RfPhysicalLayerCC1310 : public RfPhysicalLayer
void setOutputPowerLevel(int8_t dBm);
private:
uint16_t pktLen {0};
uint8_t *sendBuffer {0};
uint16_t sendBufferLength {0};
uint8_t _loopState = RX_START;
};