Skip to content

Commit

Permalink
Move macros to constants
Browse files Browse the repository at this point in the history
  • Loading branch information
@lbussy
lbussy committed Mar 4, 2020
1 parent ef7624f commit c174d3b
Show file tree
Hide file tree
Showing 5 changed files with 110 additions and 130 deletions.
34 changes: 17 additions & 17 deletions src/bftarget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,34 +32,34 @@ BFTarget* BFTarget::getInstance() {
single->target->ip = INADDR_NONE;

// Enable target and target name
single->target->target.enabled = (String(TARGETURL).length() > 3);
strlcpy(single->target->target.name, TARGET_NAME, sizeof(TARGET_NAME));
single->target->target.enabled = (String(single->targeturl).length() > 3);
strlcpy(single->target->target.name, single->target_name, sizeof(single->target_name));
//
// Check return body for success
single->target->checkBody.enabled = CHECKBODY_ENABLED;
strlcpy(single->target->checkBody.name, CHECKBODY_NAME, sizeof(CHECKBODY_NAME));
single->target->checkBody.enabled = single->checkbody_enabled;
strlcpy(single->target->checkBody.name, single->checkbody_name, sizeof(single->checkbody_name));
//
// Change JSON point enabled and name for target type
single->target->apiName.enabled = APINAME_ENABLED;
strlcpy(single->target->apiName.name, APINAME_NAME, sizeof(APINAME_NAME));
single->target->apiName.enabled = single->apiname_enabled;
strlcpy(single->target->apiName.name, single->apiname_name, sizeof(single->apiname_name));
//
single->target->bubName.enabled = BUBNAME_ENABLED;
strlcpy(single->target->bubName.name, BUBNAME_NAME, sizeof(BUBNAME_NAME));
single->target->bubName.enabled = single->bubname_enabled;
strlcpy(single->target->bubName.name, single->bubname_name, sizeof(single->bubname_name));
//
single->target->bpm.enabled = BPM_ENABLED;
strlcpy(single->target->bpm.name, BPM_NAME, sizeof(BPM_NAME));
single->target->bpm.enabled = single->bpm_enabled;
strlcpy(single->target->bpm.name, single->bpm_name, sizeof(single->bpm_name));
//
single->target->ambientTemp.enabled = AMBIENTTEMP_ENABLED;
strlcpy(single->target->ambientTemp.name, AMBIENTTEMP_NAME, sizeof(AMBIENTTEMP_NAME));
single->target->ambientTemp.enabled = single->ambienttemp_enabled;
strlcpy(single->target->ambientTemp.name, single->ambienttemp_name, sizeof(single->ambienttemp_name));
//
single->target->vesselTemp.enabled = VESSELTEMP_ENABLED;
strlcpy(single->target->vesselTemp.name, VESSELTEMP_NAME, sizeof(VESSELTEMP_NAME));
single->target->vesselTemp.enabled = single->vesseltemp_enabled;
strlcpy(single->target->vesselTemp.name, single->vesseltemp_name, sizeof(single->vesseltemp_name));
//
single->target->tempFormat.enabled = TEMPFORMAT_ENABLED;
strlcpy(single->target->tempFormat.name, TEMPFORMAT_NAME, sizeof(TEMPFORMAT_NAME));
single->target->tempFormat.enabled = single->tempformat_enabled;
strlcpy(single->target->tempFormat.name, single->tempformat_name, sizeof(single->tempformat_name));
//
// Grab correct URL for target type
strlcpy(single->target->url, TARGETURL, sizeof(TARGETURL));
strlcpy(single->target->url, single->targeturl, sizeof(single->targeturl));
//
}
return single;
Expand Down
76 changes: 38 additions & 38 deletions src/bftarget.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,44 +30,6 @@ SOFTWARE. */
#include <ArduinoLog.h>
#include <Arduino.h>

/////////////////////////////////////////////////////////////////////
// Configure Target - Below are configuration items per target type
/////////////////////////////////////////////////////////////////////

// Enable target and target name
#define TARGET_ENABLED true
#define TARGET_NAME URLTARGET
//
// Check return body for success
#define CHECKBODY_ENABLED false
#define CHECKBODY_NAME ""
//
// Turn JSON points on/off and provide JSON field name per target type
//
#define APINAME_ENABLED true
#define APINAME_NAME "api_key"
//
#define BUBNAME_ENABLED true
#define BUBNAME_NAME "name"
//
#define BPM_ENABLED true
#define BPM_NAME "bpm"
//
#define AMBIENTTEMP_ENABLED true
#define AMBIENTTEMP_NAME "ambient"
//
#define VESSELTEMP_ENABLED true
#define VESSELTEMP_NAME "temp"
//
#define TEMPFORMAT_ENABLED true
#define TEMPFORMAT_NAME "temp_unit"
//
#define TARGETURL single->config->targeturl

/////////////////////////////////////////////////////////////////////
// Configure Target - Above are configuration items per target type
/////////////////////////////////////////////////////////////////////

class BFTarget {
private:
// Singleton Declarations
Expand All @@ -80,6 +42,44 @@ class BFTarget {

// Private Properties

/////////////////////////////////////////////////////////////////////
// Configure Target - Below are configuration items per target type
/////////////////////////////////////////////////////////////////////

// Enable target and target name
const bool target_enabled = true;
const char * target_name = "Brewer's Friend";
//
// Check return body for success
const bool checkbody_enabled = false;
const char * checkbody_name = "";
//
// Turn JSON points on/off and provide JSON field name per target type
//
const bool apiname_enabled = true;
const char * apiname_name = "device_source";
//
const bool bubname_enabled = true;
const char * bubname_name = "name";
//
const bool bpm_enabled = true;
const char * bpm_name = "bpm";
//
const bool ambienttemp_enabled = true;
const char * ambienttemp_name = "ambient";
//
const bool vesseltemp_enabled = true;
const char * vesseltemp_name = "temp";
//
const bool tempformat_enabled = true;
const char * tempformat_name = "temp_unit";
//
// Connect Class to configuration item
const char * targeturl = "http://log.brewersfriend.com/stream/";

/////////////////////////////////////////////////////////////////////
// Configure Target - Above are configuration items per target type
/////////////////////////////////////////////////////////////////////

public:
// Singleton Declarations
Expand Down
20 changes: 0 additions & 20 deletions src/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,16 +336,6 @@ SOFTWARE. */
//
//////////////////////////////////////////////////////////////////////////

//////////////////////////////////////////////////////////////////////////
//
// URL Target Name
//
#ifndef URLTARGET
#define URLTARGET "URL Target"
#endif
//
//////////////////////////////////////////////////////////////////////////

//////////////////////////////////////////////////////////////////////////
//
// URL Target Frequency (default 2 minutes)
Expand All @@ -366,16 +356,6 @@ SOFTWARE. */
//
//////////////////////////////////////////////////////////////////////////

//////////////////////////////////////////////////////////////////////////
//
// Brewer's Friend URL
//
#ifndef BFURL
#define BFURL "http://log.brewersfriend.com/stream/"
#endif
//
//////////////////////////////////////////////////////////////////////////

//////////////////////////////////////////////////////////////////////////
//
// NTP Server
Expand Down
34 changes: 17 additions & 17 deletions src/urltarget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,34 +32,34 @@ URLTarget* URLTarget::getInstance() {
single->target->ip = INADDR_NONE;

// Enable target and target name
single->target->target.enabled = (String(TARGETURL).length() > 3);
strlcpy(single->target->target.name, TARGET_NAME, sizeof(TARGET_NAME));
single->target->target.enabled = (String(single->targeturl).length() > 3);
strlcpy(single->target->target.name, single->target_name, sizeof(single->target_name));
//
// Check return body for success
single->target->checkBody.enabled = CHECKBODY_ENABLED;
strlcpy(single->target->checkBody.name, CHECKBODY_NAME, sizeof(CHECKBODY_NAME));
single->target->checkBody.enabled = single->checkbody_enabled;
strlcpy(single->target->checkBody.name, single->checkbody_name, sizeof(single->checkbody_name));
//
// Change JSON point enabled and name for target type
single->target->apiName.enabled = APINAME_ENABLED;
strlcpy(single->target->apiName.name, APINAME_NAME, sizeof(APINAME_NAME));
single->target->apiName.enabled = single->apiname_enabled;
strlcpy(single->target->apiName.name, single->apiname_name, sizeof(single->apiname_name));
//
single->target->bubName.enabled = BUBNAME_ENABLED;
strlcpy(single->target->bubName.name, BUBNAME_NAME, sizeof(BUBNAME_NAME));
single->target->bubName.enabled = single->bubname_enabled;
strlcpy(single->target->bubName.name, single->bubname_name, sizeof(single->bubname_name));
//
single->target->bpm.enabled = BPM_ENABLED;
strlcpy(single->target->bpm.name, BPM_NAME, sizeof(BPM_NAME));
single->target->bpm.enabled = single->bpm_enabled;
strlcpy(single->target->bpm.name, single->bpm_name, sizeof(single->bpm_name));
//
single->target->ambientTemp.enabled = AMBIENTTEMP_ENABLED;
strlcpy(single->target->ambientTemp.name, AMBIENTTEMP_NAME, sizeof(AMBIENTTEMP_NAME));
single->target->ambientTemp.enabled = single->ambienttemp_enabled;
strlcpy(single->target->ambientTemp.name, single->ambienttemp_name, sizeof(single->ambienttemp_name));
//
single->target->vesselTemp.enabled = VESSELTEMP_ENABLED;
strlcpy(single->target->vesselTemp.name, VESSELTEMP_NAME, sizeof(VESSELTEMP_NAME));
single->target->vesselTemp.enabled = single->vesseltemp_enabled;
strlcpy(single->target->vesselTemp.name, single->vesseltemp_name, sizeof(single->vesseltemp_name));
//
single->target->tempFormat.enabled = TEMPFORMAT_ENABLED;
strlcpy(single->target->tempFormat.name, TEMPFORMAT_NAME, sizeof(TEMPFORMAT_NAME));
single->target->tempFormat.enabled = single->tempformat_enabled;
strlcpy(single->target->tempFormat.name, single->tempformat_name, sizeof(single->tempformat_name));
//
// Grab correct URL for target type
strlcpy(single->target->url, TARGETURL, sizeof(TARGETURL));
strlcpy(single->target->url, single->targeturl, sizeof(single->targeturl));
//
}
return single;
Expand Down
76 changes: 38 additions & 38 deletions src/urltarget.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,44 +30,6 @@ SOFTWARE. */
#include <ArduinoLog.h>
#include <Arduino.h>

/////////////////////////////////////////////////////////////////////
// Configure Target - Below are configuration items per target type
/////////////////////////////////////////////////////////////////////

// Enable target and target name
#define TARGET_ENABLED true
#define TARGET_NAME URLTARGET
//
// Check return body for success
#define CHECKBODY_ENABLED false
#define CHECKBODY_NAME ""
//
// Turn JSON points on/off and provide JSON field name per target type
//
#define APINAME_ENABLED true
#define APINAME_NAME "api_key"
//
#define BUBNAME_ENABLED true
#define BUBNAME_NAME "name"
//
#define BPM_ENABLED true
#define BPM_NAME "bpm"
//
#define AMBIENTTEMP_ENABLED true
#define AMBIENTTEMP_NAME "ambient"
//
#define VESSELTEMP_ENABLED true
#define VESSELTEMP_NAME "temp"
//
#define TEMPFORMAT_ENABLED true
#define TEMPFORMAT_NAME "temp_unit"
//
#define TARGETURL single->config->targeturl

/////////////////////////////////////////////////////////////////////
// Configure Target - Above are configuration items per target type
/////////////////////////////////////////////////////////////////////

class URLTarget {
private:
// Singleton Declarations
Expand All @@ -80,6 +42,44 @@ class URLTarget {

// Private Properties

/////////////////////////////////////////////////////////////////////
// Configure Target - Below are configuration items per target type
/////////////////////////////////////////////////////////////////////

// Enable target and target name
const bool target_enabled = true;
const char * target_name = "URL Target";
//
// Check return body for success
const bool checkbody_enabled = false;
const char * checkbody_name = "";
//
// Turn JSON points on/off and provide JSON field name per target type
//
const bool apiname_enabled = true;
const char * apiname_name = "api_key";
//
const bool bubname_enabled = true;
const char * bubname_name = "name";
//
const bool bpm_enabled = true;
const char * bpm_name = "bpm";
//
const bool ambienttemp_enabled = true;
const char * ambienttemp_name = "ambient";
//
const bool vesseltemp_enabled = true;
const char * vesseltemp_name = "temp";
//
const bool tempformat_enabled = true;
const char * tempformat_name = "temp_unit";
//
// Connect Class to configuration item
const char * targeturl = single->config->targeturl; // <- Change config item

/////////////////////////////////////////////////////////////////////
// Configure Target - Above are configuration items per target type
/////////////////////////////////////////////////////////////////////

public:
// Singleton Declarations
Expand Down

0 comments on commit c174d3b

Please sign in to comment.