Repo restyled using astyle (#683)
The rules are in .tools/astyle/config/style.cfg and can also be reviewed at https://www.mysensors.org/view/260#coding-guidelines-core-library
This commit is contained in:
Patrick Fallberg
GitHub
+66
-41
@@ -25,45 +25,49 @@
|
||||
|
||||
MyMessage::MyMessage()
|
||||
{
|
||||
clear();
|
||||
clear();
|
||||
}
|
||||
|
||||
MyMessage::MyMessage(uint8_t _sensor, uint8_t _type)
|
||||
{
|
||||
clear();
|
||||
clear();
|
||||
sensor = _sensor;
|
||||
type = _type;
|
||||
}
|
||||
|
||||
void MyMessage::clear()
|
||||
{
|
||||
last = 0u;
|
||||
sender = 0u;
|
||||
last = 0u;
|
||||
sender = 0u;
|
||||
destination = 0u; // Gateway is default destination
|
||||
version_length = 0u;
|
||||
command_ack_payload = 0u;
|
||||
type = 0u;
|
||||
sensor = 0u;
|
||||
(void)memset(data, 0u, sizeof(data));
|
||||
version_length = 0u;
|
||||
command_ack_payload = 0u;
|
||||
type = 0u;
|
||||
sensor = 0u;
|
||||
(void)memset(data, 0u, sizeof(data));
|
||||
|
||||
// set message protocol version
|
||||
miSetVersion(PROTOCOL_VERSION);
|
||||
}
|
||||
|
||||
bool MyMessage::isAck() const {
|
||||
bool MyMessage::isAck() const
|
||||
{
|
||||
return miGetAck();
|
||||
}
|
||||
|
||||
uint8_t MyMessage::getCommand() const {
|
||||
uint8_t MyMessage::getCommand() const
|
||||
{
|
||||
return miGetCommand();
|
||||
}
|
||||
|
||||
/* Getters for payload converted to desired form */
|
||||
void* MyMessage::getCustom() const {
|
||||
void* MyMessage::getCustom() const
|
||||
{
|
||||
return (void *)data;
|
||||
}
|
||||
|
||||
const char* MyMessage::getString() const {
|
||||
const char* MyMessage::getString() const
|
||||
{
|
||||
uint8_t payloadType = miGetPayloadType();
|
||||
if (payloadType == P_STRING) {
|
||||
return data;
|
||||
@@ -73,19 +77,19 @@ const char* MyMessage::getString() const {
|
||||
}
|
||||
|
||||
// handles single character hex (0 - 15)
|
||||
char MyMessage::i2h(uint8_t i) const {
|
||||
char MyMessage::i2h(uint8_t i) const
|
||||
{
|
||||
uint8_t k = i & 0x0F;
|
||||
if (k <= 9) {
|
||||
return '0' + k;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
return 'A' + k - 10;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
char* MyMessage::getCustomString(char *buffer) const {
|
||||
for (uint8_t i = 0; i < miGetLength(); i++)
|
||||
{
|
||||
char* MyMessage::getCustomString(char *buffer) const
|
||||
{
|
||||
for (uint8_t i = 0; i < miGetLength(); i++) {
|
||||
buffer[i * 2] = i2h(data[i] >> 4);
|
||||
buffer[(i * 2) + 1] = i2h(data[i]);
|
||||
}
|
||||
@@ -93,7 +97,8 @@ char* MyMessage::getCustomString(char *buffer) const {
|
||||
return buffer;
|
||||
}
|
||||
|
||||
char* MyMessage::getStream(char *buffer) const {
|
||||
char* MyMessage::getStream(char *buffer) const
|
||||
{
|
||||
uint8_t cmd = miGetCommand();
|
||||
if ((cmd == C_STREAM) && (buffer != NULL)) {
|
||||
return getCustomString(buffer);
|
||||
@@ -102,7 +107,8 @@ char* MyMessage::getStream(char *buffer) const {
|
||||
}
|
||||
}
|
||||
|
||||
char* MyMessage::getString(char *buffer) const {
|
||||
char* MyMessage::getString(char *buffer) const
|
||||
{
|
||||
uint8_t payloadType = miGetPayloadType();
|
||||
if (buffer != NULL) {
|
||||
if (payloadType == P_STRING) {
|
||||
@@ -129,11 +135,13 @@ char* MyMessage::getString(char *buffer) const {
|
||||
}
|
||||
}
|
||||
|
||||
bool MyMessage::getBool() const {
|
||||
bool MyMessage::getBool() const
|
||||
{
|
||||
return getByte();
|
||||
}
|
||||
|
||||
uint8_t MyMessage::getByte() const {
|
||||
uint8_t MyMessage::getByte() const
|
||||
{
|
||||
if (miGetPayloadType() == P_BYTE) {
|
||||
return data[0];
|
||||
} else if (miGetPayloadType() == P_STRING) {
|
||||
@@ -144,7 +152,8 @@ uint8_t MyMessage::getByte() const {
|
||||
}
|
||||
|
||||
|
||||
float MyMessage::getFloat() const {
|
||||
float MyMessage::getFloat() const
|
||||
{
|
||||
if (miGetPayloadType() == P_FLOAT32) {
|
||||
return fValue;
|
||||
} else if (miGetPayloadType() == P_STRING) {
|
||||
@@ -154,7 +163,8 @@ float MyMessage::getFloat() const {
|
||||
}
|
||||
}
|
||||
|
||||
int32_t MyMessage::getLong() const {
|
||||
int32_t MyMessage::getLong() const
|
||||
{
|
||||
if (miGetPayloadType() == P_LONG32) {
|
||||
return lValue;
|
||||
} else if (miGetPayloadType() == P_STRING) {
|
||||
@@ -164,7 +174,8 @@ int32_t MyMessage::getLong() const {
|
||||
}
|
||||
}
|
||||
|
||||
uint32_t MyMessage::getULong() const {
|
||||
uint32_t MyMessage::getULong() const
|
||||
{
|
||||
if (miGetPayloadType() == P_ULONG32) {
|
||||
return ulValue;
|
||||
} else if (miGetPayloadType() == P_STRING) {
|
||||
@@ -174,7 +185,8 @@ uint32_t MyMessage::getULong() const {
|
||||
}
|
||||
}
|
||||
|
||||
int16_t MyMessage::getInt() const {
|
||||
int16_t MyMessage::getInt() const
|
||||
{
|
||||
if (miGetPayloadType() == P_INT16) {
|
||||
return iValue;
|
||||
} else if (miGetPayloadType() == P_STRING) {
|
||||
@@ -184,7 +196,8 @@ int16_t MyMessage::getInt() const {
|
||||
}
|
||||
}
|
||||
|
||||
uint16_t MyMessage::getUInt() const {
|
||||
uint16_t MyMessage::getUInt() const
|
||||
{
|
||||
if (miGetPayloadType() == P_UINT16) {
|
||||
return uiValue;
|
||||
} else if (miGetPayloadType() == P_STRING) {
|
||||
@@ -195,23 +208,27 @@ uint16_t MyMessage::getUInt() const {
|
||||
|
||||
}
|
||||
|
||||
MyMessage& MyMessage::setType(uint8_t _type) {
|
||||
MyMessage& MyMessage::setType(uint8_t _type)
|
||||
{
|
||||
type = _type;
|
||||
return *this;
|
||||
}
|
||||
|
||||
MyMessage& MyMessage::setSensor(uint8_t _sensor) {
|
||||
MyMessage& MyMessage::setSensor(uint8_t _sensor)
|
||||
{
|
||||
sensor = _sensor;
|
||||
return *this;
|
||||
}
|
||||
|
||||
MyMessage& MyMessage::setDestination(uint8_t _destination) {
|
||||
MyMessage& MyMessage::setDestination(uint8_t _destination)
|
||||
{
|
||||
destination = _destination;
|
||||
return *this;
|
||||
}
|
||||
|
||||
// Set payload
|
||||
MyMessage& MyMessage::set(void* value, uint8_t length) {
|
||||
MyMessage& MyMessage::set(void* value, uint8_t length)
|
||||
{
|
||||
uint8_t payloadLength = value == NULL ? 0 : min(length, (uint8_t)MAX_PAYLOAD);
|
||||
miSetLength(payloadLength);
|
||||
miSetPayloadType(P_CUSTOM);
|
||||
@@ -219,7 +236,8 @@ MyMessage& MyMessage::set(void* value, uint8_t length) {
|
||||
return *this;
|
||||
}
|
||||
|
||||
MyMessage& MyMessage::set(const char* value) {
|
||||
MyMessage& MyMessage::set(const char* value)
|
||||
{
|
||||
uint8_t length = value == NULL ? 0 : min(strlen(value), (size_t)MAX_PAYLOAD);
|
||||
miSetLength(length);
|
||||
miSetPayloadType(P_STRING);
|
||||
@@ -231,21 +249,24 @@ MyMessage& MyMessage::set(const char* value) {
|
||||
return *this;
|
||||
}
|
||||
|
||||
MyMessage& MyMessage::set(bool value) {
|
||||
MyMessage& MyMessage::set(bool value)
|
||||
{
|
||||
miSetLength(1);
|
||||
miSetPayloadType(P_BYTE);
|
||||
data[0] = value;
|
||||
return *this;
|
||||
}
|
||||
|
||||
MyMessage& MyMessage::set(uint8_t value) {
|
||||
MyMessage& MyMessage::set(uint8_t value)
|
||||
{
|
||||
miSetLength(1);
|
||||
miSetPayloadType(P_BYTE);
|
||||
data[0] = value;
|
||||
return *this;
|
||||
}
|
||||
|
||||
MyMessage& MyMessage::set(float value, uint8_t decimals) {
|
||||
MyMessage& MyMessage::set(float value, uint8_t decimals)
|
||||
{
|
||||
miSetLength(5); // 32 bit float + persi
|
||||
miSetPayloadType(P_FLOAT32);
|
||||
fValue=value;
|
||||
@@ -253,28 +274,32 @@ MyMessage& MyMessage::set(float value, uint8_t decimals) {
|
||||
return *this;
|
||||
}
|
||||
|
||||
MyMessage& MyMessage::set(uint32_t value) {
|
||||
MyMessage& MyMessage::set(uint32_t value)
|
||||
{
|
||||
miSetPayloadType(P_ULONG32);
|
||||
miSetLength(4);
|
||||
ulValue = value;
|
||||
return *this;
|
||||
}
|
||||
|
||||
MyMessage& MyMessage::set(int32_t value) {
|
||||
MyMessage& MyMessage::set(int32_t value)
|
||||
{
|
||||
miSetPayloadType(P_LONG32);
|
||||
miSetLength(4);
|
||||
lValue = value;
|
||||
return *this;
|
||||
}
|
||||
|
||||
MyMessage& MyMessage::set(uint16_t value) {
|
||||
MyMessage& MyMessage::set(uint16_t value)
|
||||
{
|
||||
miSetPayloadType(P_UINT16);
|
||||
miSetLength(2);
|
||||
uiValue = value;
|
||||
return *this;
|
||||
}
|
||||
|
||||
MyMessage& MyMessage::set(int16_t value) {
|
||||
MyMessage& MyMessage::set(int16_t value)
|
||||
{
|
||||
miSetPayloadType(P_INT16);
|
||||
miSetLength(2);
|
||||
iValue = value;
|
||||
|
||||
Reference in New Issue
Block a user