Skip to content

Commit

Permalink
Merge pull request #49 from mposzywak/v1.3.0
Browse files Browse the repository at this point in the history 
Added Counter based inputs on digitOUT device type
  • Loading branch information
@mposzywak
mposzywak committed Dec 7, 2022
2 parents 2bfc62e + ae96503 commit 66509b8
Show file tree
Hide file tree
Showing 8 changed files with 181 additions and 168 deletions.
144 changes: 39 additions & 105 deletions ARiF.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ static byte ARiFClass::begin(byte version, byte mac[], IPAddress raspyIP, byte a
static byte ARiFClass::beginEthernet() {
/*for (byte i = 0; i < 6; i++) {
mac[i] = m[i];
}*/
}*/
if (Platform.EEPROMGetUseDefMAC() == EEPROM_FLG_MEM_MAC) {
Serial.println(F("Using MAC from EEPROM"));
Platform.EEPROMGetMAC(mac);
Expand Down Expand Up @@ -99,7 +99,7 @@ static byte ARiFClass::replaceMAC() {
Serial.print(F("New MAC arrived from raspy."));
for (byte i = 0; i < 6; i++) {
mac[i] = raspyMAC[i];
}
}
restartNewMAC = true;
}
}
Expand Down Expand Up @@ -181,7 +181,6 @@ static byte ARiFClass::update() {
}
if (!compareIP(clientIP, raspyIP)) { /* IP is different than the stored one */
raspyIP = clientIP;
Serial.println("Saving IP");
return U_RASPYIPCHGD;
}
} else {
Expand All @@ -191,7 +190,6 @@ static byte ARiFClass::update() {
}
break;
case CMD_REGISTER:
Serial.println("register received");
//if (!isRegistered) { // this is commented out to allow the arduino to be "re-registered"
ardID = getValue(buff, ARDID);
raspyID = getValue(buff, RASPYID);
Expand Down Expand Up @@ -768,26 +766,8 @@ void ARiFClass::deregister() {
static void ARiFClass::sendTempStatus(byte devID, float value) {
if (!isConnected) return; // exit function if the link is dead;
if (ARiFClient.connect(ARiFClass::raspyIP, ARiF_HTTP_PORT)) {
// Make a HTTP request:
Serial.print("sending temp value: ");
Serial.println(value);
ARiFClient.print("POST /?devID=");
ARiFClient.print(devID);
ARiFClient.print("&ardID=");
ARiFClient.print(ardID);
ARiFClient.print("&raspyID=");
if (raspyID < 10) {
ARiFClient.print("00");
ARiFClient.print(raspyID);
} else {
if (raspyID >= 10 < 100) {
ARiFClient.print("0");
ARiFClient.print(raspyID);
} else {
ARiFClient.print(raspyID);
}
}

addPreamble(devID);
ARiFClient.print("&cmd=status&devType=temp&dataType=float&value=");
ARiFClient.println(value);

Expand All @@ -802,20 +782,7 @@ static void ARiFClass::sendTempStatus(byte devID, float value) {
static void ARiFClass::sendSettings() {
if (!isConnected) return; // exit function if the link is dead;
if (ARiFClient.connect(ARiFClass::raspyIP, ARiF_HTTP_PORT)) {
ARiFClient.print(F("POST /?devID=0&ardID="));
ARiFClient.print(ardID);
ARiFClient.print(F("&raspyID="));
if (raspyID < 10) {
ARiFClient.print("00");
ARiFClient.print(raspyID);
} else {
if (raspyID >= 10 < 100) {
ARiFClient.print("0");
ARiFClient.print(raspyID);
} else {
ARiFClient.print(raspyID);
}
}
addPreamble(0);
ARiFClient.print(F("&cmd=settings\n"));
Serial.println(F("Sending settings"));

Expand All @@ -840,22 +807,7 @@ static void ARiFClass::sendShadeSettings(byte devID, int positionTimer, int tilt
//unsigned long sPositionTimer = 0;
//sPositionTimer = (unsigned long) positionTimer * 100;
if (ARiFClient.connect(ARiFClass::raspyIP, ARiF_HTTP_PORT)) {
ARiFClient.print(F("POST /?devID="));
ARiFClient.print(devID);
ARiFClient.print(F("&ardID="));
ARiFClient.print(ardID);
ARiFClient.print(F("&raspyID="));
if (raspyID < 10) {
ARiFClient.print("00");
ARiFClient.print(raspyID);
} else {
if (raspyID >= 10 < 100) {
ARiFClient.print("0");
ARiFClient.print(raspyID);
} else {
ARiFClient.print(raspyID);
}
}
addPreamble(devID);
ARiFClient.print(F("&cmd=shadeSettings\n"));
Serial.println(F("Sending shade settings"));

Expand All @@ -878,22 +830,7 @@ static void ARiFClass::sendShadeSettings(byte devID, int positionTimer, int tilt
static void ARiFClass::sendLightSettings(byte devID, unsigned long timer, byte type, byte inputType, byte ctrlON) {
if (!isConnected) return; // exit function if the link is dead;
if (ARiFClient.connect(ARiFClass::raspyIP, ARiF_HTTP_PORT)) {
ARiFClient.print(F("POST /?devID="));
ARiFClient.print(devID);
ARiFClient.print(F("&ardID="));
ARiFClient.print(ardID);
ARiFClient.print(F("&raspyID="));
if (raspyID < 10) {
ARiFClient.print("00");
ARiFClient.print(raspyID);
} else {
if (raspyID >= 10 < 100) {
ARiFClient.print("0");
ARiFClient.print(raspyID);
} else {
ARiFClient.print(raspyID);
}
}
addPreamble(devID);
ARiFClient.print(F("&cmd=lightSettings\n"));
Serial.println(F("Sending device settings"));

Expand All @@ -913,44 +850,23 @@ static void ARiFClass::sendLightSettings(byte devID, unsigned long timer, byte t
}
}

static void ARiFClass::sendMessage(byte devID, byte messageType, byte value) {
static void ARiFClass::sendMessage(byte devID, byte messageType, unsigned int value) {
if (!isConnected) return; // exit function if the link is dead;
if (ARiFClient.connect(ARiFClass::raspyIP, ARiF_HTTP_PORT)) {
// Make a HTTP request:
ARiFClient.print("POST /?devID=");
ARiFClient.print(devID);
ARiFClient.print("&ardID=");
ARiFClient.print(ardID);
ARiFClient.print("&raspyID=");
if (raspyID < 10) {
ARiFClient.print("00");
ARiFClient.print(raspyID);
} else {
if (raspyID >= 10 < 100) {
ARiFClient.print("0");
ARiFClient.print(raspyID);
} else {
ARiFClient.print(raspyID);
}
}

addPreamble(devID);
ARiFClient.print("&cmd=status&devType=digitOUT&dataType=");
switch (messageType) {
case _MTYPE_LIGHT_TYPE:
ARiFClient.print(F("&cmd=lightType&devType=digitOUT&dataType=byte&value="));
ARiFClient.println(value);
break;
case _MTYPE_LIGHT_INPUT_TYPE:
ARiFClient.print(F("&cmd=lightInputType&devType=digitOUT&dataType=byte&value="));
ARiFClient.println(value);
break;
case _MTYPE_LIGHT_STATUS_ON:
case _MTYPE_LIGHT_STATUS_ON_USER:
ARiFClient.println("&cmd=status&devType=digitOUT&dataType=bool&value=1");
ARiFClient.println("bool&value=1");
break;
case _MTYPE_LIGHT_STATUS_OFF:
case _MTYPE_LIGHT_STATUS_OFF_USER:
ARiFClient.println("&cmd=status&devType=digitOUT&dataType=bool&value=0");
ARiFClient.println("bool&value=0");
break;
case _MTYPE_LIGHT_STATUS_INT_VALUE:
ARiFClient.print("int&value=");
ARiFClient.println(value);
}

if (messageType == _MTYPE_LIGHT_STATUS_ON_USER || messageType == _MTYPE_LIGHT_STATUS_OFF_USER) {
Expand All @@ -965,15 +881,25 @@ static void ARiFClass::sendMessage(byte devID, byte messageType, byte value) {
}
}

static void ARiFClass::sendLightInputType(byte devID, byte value) {
sendMessage(devID, _MTYPE_LIGHT_INPUT_TYPE, value);
}

static void ARiFClass::sendLightType(byte devID, byte value) {
sendMessage(devID, _MTYPE_LIGHT_TYPE, value);
static void ARiFClass::addPreamble(byte devID) {
ARiFClient.print("POST /?devID=");
ARiFClient.print(devID);
ARiFClient.print("&ardID=");
ARiFClient.print(ardID);
ARiFClient.print("&raspyID=");
if (raspyID < 10) {
ARiFClient.print("00");
ARiFClient.print(raspyID);
} else {
if (raspyID >= 10 < 100) {
ARiFClient.print("0");
ARiFClient.print(raspyID);
} else {
ARiFClient.print(raspyID);
}
}
}


static void ARiFClass::sendLightON(byte devID) {
sendMessage(devID, _MTYPE_LIGHT_STATUS_ON, 0);
}
Expand All @@ -990,6 +916,10 @@ static void ARiFClass::sendUserLightOFF(byte devID) {
sendMessage(devID, _MTYPE_LIGHT_STATUS_OFF_USER, 0);
}

static void ARiFClass::sendCounter(byte devID, unsigned int counter) {
sendMessage(devID, _MTYPE_LIGHT_STATUS_INT_VALUE, counter);
}

static void ARiFClass::setMode(byte m) {
mode = m;
}
Expand Down Expand Up @@ -1044,3 +974,7 @@ static bool ARiFClass::compareIP(IPAddress ip1, IPAddress ip2) {
}
return ipIsSame;
}

static bool ARiFClass::isARiFConnected() {
return isConnected;
}
18 changes: 11 additions & 7 deletions ARiF.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
#define _MTYPE_LIGHT_STATUS_OFF 3
#define _MTYPE_LIGHT_STATUS_ON_USER 4
#define _MTYPE_LIGHT_STATUS_OFF_USER 5
#define _MTYPE_LIGHT_STATUS_INT_VALUE 6

class ARiFClass {
/* types definitions */
Expand Down Expand Up @@ -275,6 +276,9 @@ class ARiFClass {

/* compares two IP addresses. Returns true if they are the same IP, otherwise returns false */
static bool compareIP(IPAddress ip1, IPAddress ip2);

/* add the URL preamble into the system */
static void addPreamble(byte devID);

public:

Expand Down Expand Up @@ -365,14 +369,8 @@ class ARiFClass {
/* send shade position timer */
static void sendShadeSettings(byte devID, int positionTimer, int tiltTimer);

/* send light Type */
static void sendLightType(byte devID, byte value);

/* send light input type */
static void sendLightInputType(byte devID, byte value);

/* send a generic message to the raspy */
static void sendMessage(byte devID, byte messageType, byte value);
static void sendMessage(byte devID, byte messageType, unsigned int value);

/* deregister this arduino */
static void deregister();
Expand Down Expand Up @@ -403,6 +401,12 @@ class ARiFClass {

/* print MAC address in XX:XX:XX... format */
static void printMAC(const byte *mac);

/* send counter value */
static void sendCounter(byte devID, unsigned int counter);

/* returns true if ARiF is in connected state */
static bool isARiFConnected();
};

extern ARiFClass ARiF;
Expand Down
Loading

0 comments on commit 66509b8

Please sign in to comment.