3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-05-10 23:46:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'development' of https://github.com/grindylow/ahoy into development

Browse source
This commit is contained in:
Andreas Schiffler 2022-08-18 22:06:07 +02:00
commit 12b109c8fc
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tools/esp8266/defines.h
View file

@ -109,15 +109,16 @@ typedef enum { // ToDo: to be verified by field tests
#define SER_DEBUG_LEN 1 // uint8_t #define SER_DEBUG_LEN 1 // uint8_t
#define SER_INTERVAL_LEN 2 // uint16_t #define SER_INTERVAL_LEN 2 // uint16_t
#pragma pack(push) // push current alignment to stack
#pragma pack(1) // set alignment to 1 byte boundary
typedef struct { typedef struct {
char broker[MQTT_ADDR_LEN]; char broker[MQTT_ADDR_LEN];
uint16_t port; uint16_t port;
char user[MQTT_USER_LEN]; char user[MQTT_USER_LEN];
char pwd[MQTT_PWD_LEN]; char pwd[MQTT_PWD_LEN];
char topic[MQTT_TOPIC_LEN]; char topic[MQTT_TOPIC_LEN];
} mqttConfig_t; } /*__attribute__((__packed__))*/ mqttConfig_t;
#pragma pack(pop) // restore original alignment from stack
typedef struct { typedef struct {
char deviceName[DEVNAME_LEN]; char deviceName[DEVNAME_LEN];
@ -126,6 +127,8 @@ typedef struct {
char stationPwd[PWD_LEN]; char stationPwd[PWD_LEN];
} sysConfig_t; } sysConfig_t;
#pragma pack(push) // push current alignment to stack
#pragma pack(1) // set alignment to 1 byte boundary
typedef struct { typedef struct {
// nrf24 // nrf24
uint16_t sendInterval; uint16_t sendInterval;
@ -146,7 +149,8 @@ typedef struct {
uint16_t serialInterval; uint16_t serialInterval;
bool serialShowIv; bool serialShowIv;
bool serialDebug; bool serialDebug;
} config_t; } /*__attribute__((__packed__))*/ config_t;
#pragma pack(pop) // restore original alignment from stack
#define CFG_MQTT_LEN MQTT_ADDR_LEN + 2 + MQTT_USER_LEN + MQTT_PWD_LEN +MQTT_TOPIC_LEN #define CFG_MQTT_LEN MQTT_ADDR_LEN + 2 + MQTT_USER_LEN + MQTT_PWD_LEN +MQTT_TOPIC_LEN