FabInfra-Mirror/fabhardware.fablock
1
0
Fork 0
mirror of https://gitlab.com/fabinfra/fabhardware/fablock.git synced 2025-05-10 19:23:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Bugs

Browse Source
This commit is contained in:
TheJoKlLa 2022-09-20 01:37:53 +02:00
parent b70c90529e
commit 9b7e574259
2 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FabLock/src/config_example.h
View File

@ -2,6 +2,6 @@
#define WLAN_PASS "" #define WLAN_PASS ""
#define MQTT_BROKER "" #define MQTT_BROKER ""
#define FABLOCKID 1 #define FABLOCKID 1
#define MPC_RELAIS_ADDR 0x02 #define MPC_RELAIS_ADDR 0x20
#define HAS_FEEDBACK 1 #define HAS_FEEDBACK 1
#define MPC_FEEDBACK_ADDR 0x03 #define MPC_FEEDBACK_ADDR 0x21

42
FabLock/src/main.cpp
View File

@ -22,10 +22,7 @@ char topic_send[TOPIC_BUFFER_SIZE];
void setup_wifi() void setup_wifi()
{ {
delay(10); delay(10);
Serial.println("Connecting Wifi ...");
Serial.println();
Serial.print("Connecting to ");
Serial.println(WLAN_SSID);
WiFi.mode(WIFI_STA); WiFi.mode(WIFI_STA);
WiFi.begin(WLAN_SSID, WLAN_PASS); WiFi.begin(WLAN_SSID, WLAN_PASS);
@ -33,15 +30,9 @@ void setup_wifi()
while (WiFi.status() != WL_CONNECTED) while (WiFi.status() != WL_CONNECTED)
{ {
delay(500); delay(500);
Serial.print(".");
} }
randomSeed(micros()); randomSeed(micros());
Serial.println("");
Serial.println("WiFi connected");
Serial.println("IP address: ");
Serial.println(WiFi.localIP());
} }
void callback(char* topic, byte* payload, unsigned int length) void callback(char* topic, byte* payload, unsigned int length)
@ -51,7 +42,7 @@ void callback(char* topic, byte* payload, unsigned int length)
int topic_len = (int)strlen(topic); int topic_len = (int)strlen(topic);
int trigger_len = (int)strlen("/trigger"); int trigger_len = (int)strlen("/trigger");
int set_state_len = (int)strlen("/set_state"); int set_state_len = (int)strlen("/set_state");
if(strcmp(topic + topic_len - trigger_len, "/trigger")) if(!strcmp(topic + topic_len - trigger_len, "/trigger"))
{ {
char str_id[4] = {0}; char str_id[4] = {0};
strncpy(str_id, topic + topic_len - trigger_len - 3, 3); strncpy(str_id, topic + topic_len - trigger_len - 3, 3);
@ -71,7 +62,7 @@ void callback(char* topic, byte* payload, unsigned int length)
} }
} }
if(strcmp(topic + topic_len - set_state_len, "/set_state")) if(!strcmp(topic + topic_len - set_state_len, "/set_state"))
{ {
char str_id[4] = {0}; char str_id[4] = {0};
strncpy(str_id, topic + topic_len - trigger_len - 3, 3); strncpy(str_id, topic + topic_len - trigger_len - 3, 3);
@ -92,7 +83,7 @@ void reconnect()
{ {
while (!client.connected()) while (!client.connected())
{ {
Serial.print("Attempting MQTT connection..."); Serial.println("Connecting MQTT ...");
String clientId = "FABLOCK-"; String clientId = "FABLOCK-";
clientId += String(random(0xffff), HEX); clientId += String(random(0xffff), HEX);
if (client.connect(clientId.c_str())) if (client.connect(clientId.c_str()))
@ -116,8 +107,9 @@ void setup()
{ {
int i = 0; int i = 0;
pinMode(BUILTIN_LED, OUTPUT);
Serial.begin(115200); Serial.begin(115200);
Serial.println();
setup_wifi(); setup_wifi();
client.setServer(MQTT_BROKER, 1883); client.setServer(MQTT_BROKER, 1883);
@ -125,22 +117,22 @@ void setup()
if (!mcp_relais.begin_I2C(MPC_RELAIS_ADDR)) if (!mcp_relais.begin_I2C(MPC_RELAIS_ADDR))
{ {
Serial.println("Error."); Serial.println("MCP Error");
while (1); while (1);
} }
for(i = 0; i++; i<MCP_INPUTS) for(i = 0; i<MCP_INPUTS; i++)
{ {
mcp_feedback.pinMode(i, OUTPUT); mcp_relais.pinMode(i, OUTPUT);
} }
if(HAS_FEEDBACK) if(HAS_FEEDBACK)
{ {
if (!mcp_feedback.begin_I2C(MPC_FEEDBACK_ADDR)) if (!mcp_feedback.begin_I2C(MPC_FEEDBACK_ADDR))
{ {
Serial.println("Error."); Serial.println("MCP Error");
while (1); while (1);
} }
for(i = 0; i++; i<MCP_INPUTS) for(i = 0; i<MCP_INPUTS; i++)
{ {
mcp_feedback.pinMode(i, INPUT_PULLUP); mcp_feedback.pinMode(i, INPUT_PULLUP);
} }
@ -161,21 +153,21 @@ void loop()
lastMsg = now; lastMsg = now;
int value; int value;
Serial.print("Publish State and Feedback"); Serial.println("Publish State and Feedback");
for(int i = 0; i++; i<MCP_INPUTS) for(int i=0; i<MCP_INPUTS; i++)
{ {
value = mcp_relais.digitalRead(i); value = mcp_relais.digitalRead(i);
snprintf (msg, MSG_BUFFER_SIZE, "%ld", value); snprintf (msg, MSG_BUFFER_SIZE, "%d", value);
snprintf (topic_send, TOPIC_BUFFER_SIZE, "fablock/%03d/%03d/state", FABLOCKID, i); snprintf (topic_send, TOPIC_BUFFER_SIZE, "fablock/%03d/%03d/state", FABLOCKID, i);
client.publish(topic_send, msg); client.publish(topic_send, msg);
} }
if(HAS_FEEDBACK) if(HAS_FEEDBACK)
{ {
for(int i = 0; i++; i<MCP_INPUTS) for(int i=0; i<MCP_INPUTS; i++)
{ {
value = mcp_feedback.digitalRead(i); value = !mcp_feedback.digitalRead(i);
snprintf (msg, MSG_BUFFER_SIZE, "%ld", value); snprintf (msg, MSG_BUFFER_SIZE, "%d", value);
snprintf (topic_send, TOPIC_BUFFER_SIZE, "fablock/%03d/%03d/feedback", FABLOCKID, i); snprintf (topic_send, TOPIC_BUFFER_SIZE, "fablock/%03d/%03d/feedback", FABLOCKID, i);
client.publish(topic_send, msg); client.publish(topic_send, msg);
} }