Skip to content

Commit ec549b3

Browse files
committed
Code cleanup and pointer fixes
1 parent 9a27070 commit ec549b3

File tree

7 files changed

+724
-708
lines changed

7 files changed

+724
-708
lines changed

keywords.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ TheThingsNetwork KEYWORD1
1010
TheThingsMessage KEYWORD1
1111
TheThingsNode KEYWORD1
1212

13+
ttn_port_t KEYWORD1
14+
ttn_response_t KEYWORD1
15+
ttn_fp_t KEYWORD1
16+
1317
#######################################
1418
# Methods and Functions (KEYWORD2)
1519
#######################################
1620

17-
airtime KEYWORD2
18-
calculateAirtime KEYWORD2
1921
showStatus KEYWORD2
2022
onMessage KEYWORD2
2123
provision KEYWORD2

src/TheThingsMessage.cpp

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
1-
#include <TheThingsMessage.h>
1+
// Copyright © 2017 The Things Network
2+
// Use of this source code is governed by the MIT license that can be found in the LICENSE file.
23

3-
bool TheThingsMessage::decodeAppData(appdata_t *receiveData, const byte *payload, size_t length) {
4+
#include "TheThingsMessage.h"
5+
6+
bool TheThingsMessage::decodeAppData(appdata_t *receiveData, const byte *payload, size_t length)
7+
{
48
pb_istream_t stream = pb_istream_from_buffer(payload, length);
5-
if (!pb_decode(&stream, api_AppData_fields, receiveData)) {
9+
if (!pb_decode(&stream, api_AppData_fields, receiveData))
10+
{
611
return false;
712
}
813
receiveData->light ? digitalWrite(TTN_PIN_LED, HIGH) : digitalWrite(TTN_PIN_LED, LOW);
914
return true;
1015
}
1116

12-
void TheThingsMessage::encodeDeviceData(devicedata_t *data, byte **buffer, size_t *size) {
17+
void TheThingsMessage::encodeDeviceData(devicedata_t *data, byte **buffer, size_t *size)
18+
{
1319
byte message[TTN_BUFFER_SIZE];
1420

1521
pb_ostream_t sendStream = pb_ostream_from_buffer(message, sizeof(message));

src/TheThingsMessage.h

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1+
// Copyright © 2017 The Things Network
2+
// Use of this source code is governed by the MIT license that can be found in the LICENSE file.
3+
14
#ifndef _THETHINGSMESSAGE_H_
25
#define _THETHINGSMESSAGE_H_
36

4-
#include <TheThingsNetwork.h>
7+
#include "TheThingsNetwork.h"
58
#include <pb.h>
69
#include <pb_encode.h>
710
#include <pb_decode.h>
@@ -15,9 +18,9 @@ typedef api_AppData appdata_t;
1518

1619
class TheThingsMessage
1720
{
18-
public:
19-
static void encodeDeviceData(devicedata_t *data, byte **buffer, size_t *size);
20-
static bool decodeAppData(appdata_t *receiveData, const byte *payload, size_t length);
21+
public:
22+
static void encodeDeviceData(devicedata_t *data, uint8_t **buffer, size_t *size);
23+
static bool decodeAppData(appdata_t *receiveData, const uint8_t *payload, size_t size);
2124
};
2225

2326
#endif

0 commit comments

Comments
 (0)