Clang again!
This commit is contained in:
parent
536fb5408d
commit
0f959d57b3
6 changed files with 18 additions and 16 deletions
|
|
@ -20,15 +20,17 @@
|
|||
#ifndef WS_WIFI_AIRLIFT_H
|
||||
#define WS_WIFI_AIRLIFT_H
|
||||
|
||||
#include "../../helpers/ws_helper_macros.h"
|
||||
#include "Adafruit_MQTT.h"
|
||||
#include "Adafruit_MQTT_Client.h"
|
||||
#include "Arduino.h"
|
||||
#include "SPI.h"
|
||||
#include "WiFiNINA.h"
|
||||
#include "Wippersnapper_V2.h"
|
||||
#include "../../helpers/ws_helper_macros.h"
|
||||
|
||||
#define NINAFWVER "2.0.0-rc.0+adafruit" /*!< min. nina-fw version compatible with this library. */
|
||||
#define NINAFWVER \
|
||||
"2.0.0-rc.0+adafruit" /*!< min. nina-fw version compatible with this \
|
||||
library. */
|
||||
#define AIRLIFT_CONNECT_TIMEOUT_MS 20000 /*!< Connection timeout (in ms) */
|
||||
#define AIRLIFT_CONNECT_RETRY_DELAY_MS 200 /*!< delay time between retries. */
|
||||
|
||||
|
|
@ -301,7 +303,7 @@ protected:
|
|||
void _connect() {
|
||||
if (strlen(_ssid) == 0) {
|
||||
_statusV2 = WS_SSID_INVALID; // possibly unneccesary as already checking
|
||||
// elsewhere
|
||||
// elsewhere
|
||||
} else {
|
||||
// disconnect from possible previous connection
|
||||
_disconnect();
|
||||
|
|
|
|||
|
|
@ -19,8 +19,7 @@
|
|||
@brief AnalogIOModel constructor
|
||||
*/
|
||||
/***********************************************************************/
|
||||
AnalogIOModel::AnalogIOModel()
|
||||
{
|
||||
AnalogIOModel::AnalogIOModel() {
|
||||
memset(&_msg_AnalogioAdd, 0, sizeof(_msg_AnalogioAdd));
|
||||
memset(&_msg_AnalogioRemove, 0, sizeof(_msg_AnalogioRemove));
|
||||
memset(&_msg_AnalogioEvent, 0, sizeof(_msg_AnalogioEvent));
|
||||
|
|
|
|||
|
|
@ -19,8 +19,7 @@
|
|||
@brief DS18X20Model constructor
|
||||
*/
|
||||
/***********************************************************************/
|
||||
DS18X20Model::DS18X20Model()
|
||||
{
|
||||
DS18X20Model::DS18X20Model() {
|
||||
memset(&_msg_DS18x20Add, 0, sizeof(_msg_DS18x20Add));
|
||||
memset(&_msg_DS18x20Added, 0, sizeof(_msg_DS18x20Added));
|
||||
memset(&_msg_DS18x20Remove, 0, sizeof(_msg_DS18x20Remove));
|
||||
|
|
|
|||
|
|
@ -18,7 +18,8 @@
|
|||
#include "hardware.h"
|
||||
#include "model.h"
|
||||
|
||||
#define MAX_PIXEL_STRANDS 10 ///< Maximum number of pixel strands connected to a WipperSnapper device
|
||||
#define MAX_PIXEL_STRANDS \
|
||||
10 ///< Maximum number of pixel strands connected to a WipperSnapper device
|
||||
#define STRAND_NOT_FOUND 0xFF ///< Strand not found in the array
|
||||
|
||||
class Wippersnapper_V2; ///< Forward declaration
|
||||
|
|
@ -39,11 +40,13 @@ public:
|
|||
bool Handle_Pixels_Add(pb_istream_t *stream);
|
||||
bool Handle_Pixels_Write(pb_istream_t *stream);
|
||||
bool Handle_Pixels_Remove(pb_istream_t *stream);
|
||||
|
||||
private:
|
||||
PixelsModel *_pixels_model = nullptr; ///< Pointer to the model class
|
||||
PixelsHardware *_pixel_strands[MAX_PIXEL_STRANDS] = {nullptr}; ///< Pointer to the hardware class
|
||||
uint8_t _num_strands; ///< Number of pixel strands
|
||||
PixelsHardware *_pixel_strands[MAX_PIXEL_STRANDS] = {
|
||||
nullptr}; ///< Pointer to the hardware class
|
||||
uint8_t _num_strands; ///< Number of pixel strands
|
||||
uint16_t GetStrandIndex(uint16_t pin_data); // Returns 0xFF if not found
|
||||
};
|
||||
extern Wippersnapper_V2 WsV2; ///< Global V2 instance
|
||||
#endif // WS_PIXELS_CONTROLLER_H
|
||||
#endif // WS_PIXELS_CONTROLLER_H
|
||||
|
|
@ -19,8 +19,7 @@
|
|||
@brief SensorModel constructor
|
||||
*/
|
||||
/***********************************************************************/
|
||||
SensorModel::SensorModel()
|
||||
{
|
||||
SensorModel::SensorModel() {
|
||||
memset(&_msg_sensor_event, 0, sizeof(_msg_sensor_event));
|
||||
// no-op
|
||||
}
|
||||
|
|
|
|||
|
|
@ -404,9 +404,9 @@ void ws_display_ui_helper::build_scr_monitor() {
|
|||
/**************************************************************************/
|
||||
void ws_display_ui_helper::add_text_to_terminal(const char *text) {
|
||||
Serial.println("add_text_to_terminal");
|
||||
/* char txtBuffer[256]; // temporary text buffer for snprintf
|
||||
snprintf(txtBuffer, 256, text);
|
||||
addToTerminal(txtBuffer); */
|
||||
/* char txtBuffer[256]; // temporary text buffer for snprintf
|
||||
snprintf(txtBuffer, 256, text);
|
||||
addToTerminal(txtBuffer); */
|
||||
}
|
||||
|
||||
/**************************************************************************/
|
||||
|
|
|
|||
Loading…
Reference in a new issue