Skip to content

Memory savings #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
toastedcode merged 2 commits into from
Jul 28, 2017
Merged

Memory savings #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eeb2b31
Wrapped all log strings in F() macro.
toastedcode Jul 28, 2017
898437e
Wrapped log messages in F() macro.
toastedcode Jul 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions src/Adapter/MqttClientAdapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
// *****************************************************************************
// *****************************************************************************

#include "Logger.hpp"
#include "MqttClientAdapter.hpp"
#include "Messaging.h"

Expand Down Expand Up @@ -66,23 +67,25 @@ void MqttClientAdapter::loop()
{
retryTime = millis() + RETRY_DELAY;

printf(
"MqttClientAdapter::loop: Connect attempt failed. Retrying in %d seconds.\n",
Logger::logDebug(
F("MqttClientAdapter::loop: Connect attempt failed. Retrying in %d seconds.\n"),
(RETRY_DELAY / 1000));
}
}
}

if (!wasConnected && isConnected)
{
printf("MqttClientAdapter::loop: MQTT Client Adapter [%s] connected.\n", getId().c_str());
Logger::logDebug(
F("MqttClientAdapter::loop: MQTT Client Adapter [%s] connected.\n"), getId().c_str());

String topic = "/toastbot/to/" + clientId;
mqttClient->subscribe(topic.c_str());
}
else if (wasConnected && !isConnected)
{
printf("MqttClientAdapter::loop: MQTT Client Adapter [%s] disconnected.\n", getId().c_str());
Logger::logDebug(
F("MqttClientAdapter::loop: MQTT Client Adapter [%s] disconnected.\n"), getId().c_str());
}

// Allow the MQTT client to do its processing.
Expand Down Expand Up @@ -111,8 +114,8 @@ bool MqttClientAdapter::sendRemoteMessage(

if (!isSuccess)
{
printf(
"MqttClientAdapter::sendRemoteMessage: Failed to send message [%s] to remote host.\n",
Logger::logWarning(
F("MqttClientAdapter::sendRemoteMessage: Failed to send message [%s] to remote host.\n"),
message->getMessageId().c_str());
}

Expand Down Expand Up @@ -169,11 +172,12 @@ bool MqttClientAdapter::connect()

if (mqttClient)
{
printf("MqttClientAdapter::connect: Connecting to MQTT broker %s:%d as client [%s].",
host.c_str(),
port,
clientId.c_str(),
userId.c_str());
Logger::logDebug(
F("MqttClientAdapter::connect: Connecting to MQTT broker %s:%d as client [%s]."),
host.c_str(),
port,
clientId.c_str(),
userId.c_str());

if (userId.length() > 0)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Adapter/SerialAdapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ MessagePtr SerialAdapter::getRemoteMessage()
}
else
{
Logger::logWarning("SerialAdapter::getRemoteMessage: Buffer overflow. Discarding bytes.");
Logger::logWarning(F("SerialAdapter::getRemoteMessage: Buffer overflow. Discarding bytes."));

readIndex = 0;
}
Expand Down
8 changes: 4 additions & 4 deletions src/Adapter/TcpClientAdapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ bool TcpClientAdapter::sendRemoteMessage(
else
{
Logger::logWarning(
"TcpServerAdapter::sendRemoteMessage: Failed to send message [%s] to remote host.",
F("TcpServerAdapter::sendRemoteMessage: Failed to send message [%s] to remote host."),
message->getMessageId().c_str());
}
}
Expand Down Expand Up @@ -111,7 +111,7 @@ MessagePtr TcpClientAdapter::getRemoteMessage()
}
else
{
Logger::logWarning("TcpClientAdapter::getRemoteMessage: Buffer overflow. Discarding bytes.");
Logger::logWarning(F("TcpClientAdapter::getRemoteMessage: Buffer overflow. Discarding bytes."));

readIndex = 0;
}
Expand All @@ -128,11 +128,11 @@ bool TcpClientAdapter::connect()
{
retryTime = Board::getBoard()->systemTime()+ retryDelay;

Logger::logDebug("TcpClientAdapter::connect: TCP Client Adapter [%s] failed to connect.", getId().c_str());
Logger::logDebug(F("TcpClientAdapter::connect: TCP Client Adapter [%s] failed to connect."), getId().c_str());
}
else
{
Logger::logDebug("TcpClientAdapter::connect: TCP Client Adapter [%s] connected.", getId().c_str());
Logger::logDebug(F("TcpClientAdapter::connect: TCP Client Adapter [%s] connected."), getId().c_str());

retryTime = 0;
}
Expand Down
10 changes: 5 additions & 5 deletions src/Adapter/TcpServerAdapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ TcpServerAdapter::TcpServerAdapter(
void TcpServerAdapter::setup()
{
Logger::logDebug(
"TcpServerAdapter::setup: TCP Server Adapter [%s] is listening on port %d.",
F("TcpServerAdapter::setup: TCP Server Adapter [%s] is listening on port %d."),
getId().c_str(),
port);

Expand All @@ -45,7 +45,7 @@ bool TcpServerAdapter::sendRemoteMessage(
else
{
Logger::logWarning(
"TcpServerAdapter::sendRemoteMessage: Failed to send message [%s] to remote host.",
F("TcpServerAdapter::sendRemoteMessage: Failed to send message [%s] to remote host."),
message->getMessageId().c_str());
}
}
Expand All @@ -71,11 +71,11 @@ MessagePtr TcpServerAdapter::getRemoteMessage()

if (!wasConnected && isConnected)
{
Logger::logDebug("TcpServerAdapter::getRemoteMessage: TCP Server Adapter [%s] connected.", getId().c_str());
Logger::logDebug(F("TcpServerAdapter::getRemoteMessage: TCP Server Adapter [%s] connected."), getId().c_str());
}
else if (wasConnected && !isConnected)
{
Logger::logDebug("TcpServerAdapter::getRemoteMessage: TCP Server Adapter [%s] disconnected.", getId().c_str());
Logger::logDebug(F("TcpServerAdapter::getRemoteMessage: TCP Server Adapter [%s] disconnected."), getId().c_str());
}

if (client && client.available())
Expand Down Expand Up @@ -119,7 +119,7 @@ MessagePtr TcpServerAdapter::getRemoteMessage()
}
else
{
Logger::logWarning("TcpServerAdapter::getRemoteMessage: Buffer overflow. Discarding bytes.");
Logger::logWarning(F("TcpServerAdapter::getRemoteMessage: Buffer overflow. Discarding bytes."));

readIndex = 0;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Adapter/UdpAdapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ void UdpAdapter::setup()
if (listenPort != 0)
{
Logger::logDebug(
"UdpAdapter::setup: UDP Adapter [%s] is listening on port %d.",
F("UdpAdapter::setup: UDP Adapter [%s] is listening on port %d."),
getId().c_str(),
listenPort);

Expand Down
27 changes: 18 additions & 9 deletions src/Adapter/WebSocketAdapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@
// *****************************************************************************
// *****************************************************************************

#include "WebSocketAdapter.hpp"
#include "Logger.hpp"
#include "Messaging.h"
#include "WebSocketAdapter.hpp"

void WebSocketAdapter::setup()
{
printf(
"WebSocketAdapter::setup: Web Socket Adapter [%s] is listening on port %d.\n",
Logger::logDebug(
F("WebSocketAdapter::setup: Web Socket Adapter [%s] is listening on port %d.\n"),
getId().c_str(),
port);

Expand All @@ -40,11 +41,15 @@ void WebSocketAdapter::loop()

if (!wasConnected && isConnected)
{
printf("WebSocketAdapter::loop: Web Socket Server Adapter [%s] connected.\n", getId().c_str());
Logger::logDebug(
F("WebSocketAdapter::loop: Web Socket Server Adapter [%s] connected.\n"),
getId().c_str());
}
else if (wasConnected && !isConnected)
{
printf("WebSocketAdapter::loop: Web Socket Server Adapter [%s] disconnected.\n", getId().c_str());
Logger::logDebug(
F("WebSocketAdapter::loop: Web Socket Server Adapter [%s] disconnected.\n"),
getId().c_str());

isNegotiated = false;
}
Expand All @@ -61,11 +66,15 @@ void WebSocketAdapter::loop()

if (!wasNegotiated && isNegotiated)
{
printf("WebSocketAdapter::loop: Web Socket Server Adapter [%s] negotiated.\n", getId().c_str());
Logger::logDebug(
F("WebSocketAdapter::loop: Web Socket Server Adapter [%s] negotiated.\n"),
getId().c_str());
}
else
{
printf("WebSocketAdapter::loop: Web Socket Server Adapter [%s] failed negotiation.\n", getId().c_str());
Logger::logDebug(
F("WebSocketAdapter::loop: Web Socket Server Adapter [%s] failed negotiation.\n"),
getId().c_str());
}
}

Expand All @@ -90,8 +99,8 @@ bool WebSocketAdapter::sendRemoteMessage(
}
else
{
printf(
"IpServerAdapter::sendRemoteMessage: Failed to send message [%s] to remote host.\n",
Logger::logWarning(
F("IpServerAdapter::sendRemoteMessage: Failed to send message [%s] to remote host.\n"),
message->getMessageId().c_str());
}

Expand Down
4 changes: 2 additions & 2 deletions src/Behavior/Behavior.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ void Behavior::handleMessage(
// enable
if (message->getMessageId() == "enable")
{
Logger::logDebug("Behavior::handleMessage: %s.enable()", getId().c_str());
Logger::logDebug(F("Behavior::handleMessage: %s.enable()"), getId().c_str());

enable();
message->setFree();
}
// disable
else if (message->getMessageId() == "disable")
{
Logger::logDebug("Behavior::handleMessage: %s.disable()", getId().c_str());
Logger::logDebug(F("Behavior::handleMessage: %s.disable()"), getId().c_str());

disable();
message->setFree();
Expand Down
6 changes: 3 additions & 3 deletions src/Behavior/EscapeBehavior.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ void EscapeBehavior::setState(
const int& state)
{

Logger::logDebug("EscapeBehavior::setState: %s -> %d", getId().c_str(), state);
Logger::logDebug(F("EscapeBehavior::setState: %s -> %d"), getId().c_str(), state);

switch (state)
{
Expand Down Expand Up @@ -92,13 +92,13 @@ void EscapeBehavior::setState(
void EscapeBehavior::timeout(
Timer* timer)
{
Logger::logDebug("EscapeBehavior::timeout: %s", timer->getId().c_str());
Logger::logDebug(F("EscapeBehavior::timeout: %s"), timer->getId().c_str());

if ((getState() == WATCH) &&
(timer == watchTimer))
{
int reading = DistanceSensor::toCentimeters(distanceSensor->read());
Logger::logDebug("EscapeBehavior::timeout: reading = %d", reading);
Logger::logDebug(F("EscapeBehavior::timeout: reading = %d"), reading);

if ((reading != 0) && (reading < DISTANCE_THRESHOLD))
{
Expand Down
10 changes: 5 additions & 5 deletions src/Behavior/ScoutBehavior.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class ForwardBehavior : public Behavior, TimerListener
{
int reading = DistanceSensor::toCentimeters(distanceSensor->read());

Logger::logDebug("ForwardBehavior::timeout: %d\n", reading);
Logger::logDebug(F("ForwardBehavior::timeout: %d\n"), reading);

if ((getState() == MOVING) &&
(reading != NO_READING) &&
Expand All @@ -64,7 +64,7 @@ class ForwardBehavior : public Behavior, TimerListener
virtual void setState(
const int& state)
{
Logger::logDebug("ForwardBehavior::setState: %s -> %d", getId().c_str(), state);
Logger::logDebug(F("ForwardBehavior::setState: %s -> %d"), getId().c_str(), state);

switch (state)
{
Expand Down Expand Up @@ -148,7 +148,7 @@ class ReverseBehavior : public Behavior, TimerListener
virtual void setState(
const int& state)
{
Logger::logDebug("ReverseBehavior::setState: %s -> %d", getId().c_str(), state);
Logger::logDebug(F("ReverseBehavior::setState: %s -> %d"), getId().c_str(), state);

switch (state)
{
Expand Down Expand Up @@ -220,7 +220,7 @@ class RotateBehavior : public Behavior, TimerListener
virtual void setState(
const int& state)
{
Logger::logDebug("RotateBehavior::setState: %s -> %d", getId().c_str(), state);
Logger::logDebug(F("RotateBehavior::setState: %s -> %d"), getId().c_str(), state);

switch (state)
{
Expand Down Expand Up @@ -339,7 +339,7 @@ void ScoutBehavior::setState(
const int& state)
{

Logger::logDebug("ScoutBehavior::setState: %s -> %d", getId().c_str(), state);
Logger::logDebug(F("ScoutBehavior::setState: %s -> %d"), getId().c_str(), state);

switch (state)
{
Expand Down
6 changes: 3 additions & 3 deletions src/Behavior/ServoPanBehavior.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ void ServoPanBehavior::handleMessage(
int angle = message->getInt("angle");
int seconds = message->getInt("seconds");

Logger::logDebug("ServoPanBehavior::handleMessage: panTo(%d, %d)", angle, seconds);
Logger::logDebug(F("ServoPanBehavior::handleMessage: panTo(%d, %d)"), angle, seconds);

panTo(angle, seconds);

Expand All @@ -41,7 +41,7 @@ void ServoPanBehavior::handleMessage(
int endAngle = message->getInt("endAngle");
int seconds = message->getInt("seconds");

Logger::logDebug("ServoPanBehavior::handleMessage: oscillate(%d, %d, %d)", startAngle, endAngle, seconds);
Logger::logDebug(F("ServoPanBehavior::handleMessage: oscillate(%d, %d, %d)"), startAngle, endAngle, seconds);

oscillate(startAngle, endAngle, seconds);

Expand All @@ -50,7 +50,7 @@ void ServoPanBehavior::handleMessage(
// stop
else if (message->getMessageId() == "stop")
{
Logger::logDebug("ServoPanBehavior::handleMessage: stop()");
Logger::logDebug(F("ServoPanBehavior::handleMessage: stop()"));

stop();

Expand Down
10 changes: 5 additions & 5 deletions src/Component/Button.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,13 @@ void Button::handleMessage(
{
longPressTime = message->getInt("longPress");

Logger::logDebug("Button::handleMessage: longPress(%d)", longPressTime);
Logger::logDebug(F("Button::handleMessage: longPress(%d)"), longPressTime);
}
else if (message->getMessageId() == "poll")
{
int period = message->isSet("period") ? message->getInt("period") : 0;

Logger::logDebug("Button::handleMessage: poll(%d)", period);
Logger::logDebug(F("Button::handleMessage: poll(%d)"), period);

poll(period);
}
Expand Down Expand Up @@ -150,7 +150,7 @@ void Button::onPoll()

void Button::onButtonDown()
{
Logger::logDebug("Button::onButtonDown: %s", getId().c_str());
Logger::logDebug(F("Button::onButtonDown: %s"), getId().c_str());
MessagePtr message = Messaging::newMessage();
if (message)
{
Expand All @@ -162,7 +162,7 @@ void Button::onButtonDown()

void Button::onButtonUp()
{
Logger::logDebug("Button::onButtonUp: %s", getId().c_str());
Logger::logDebug(F("Button::onButtonUp: %s"), getId().c_str());
MessagePtr message = Messaging::newMessage();
if (message)
{
Expand All @@ -174,7 +174,7 @@ void Button::onButtonUp()

void Button::onButtonLongPress()
{
Logger::logDebug("Button::onButtonLongPress: %s", getId().c_str());
Logger::logDebug(F("Button::onButtonLongPress: %s"), getId().c_str());
MessagePtr message = Messaging::newMessage();
if (message)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Component/FollowAI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ void FollowAI::timeout(

Proximity proximity = getProximity(reading);
Bearing bearing = getBearing(reading);
Logger::logDebug("FollowAI::timeout: Proximity = %d, bearing = %d", proximity, bearing);
Logger::logDebug(F("FollowAI::timeout: Proximity = %d, bearing = %d"), proximity, bearing);

int speed = getSpeed(reading);

Expand Down
Loading