From 9b7e5742594fcf5202cac67f0da91fcb44585dc8 Mon Sep 17 00:00:00 2001 From: TheJoKlLa Date: Tue, 20 Sep 2022 01:37:53 +0200 Subject: [PATCH 1/3] Fixed Bugs --- FabLock/src/config_example.h | 4 +-- FabLock/src/main.cpp | 48 +++++++++++++++--------------------- 2 files changed, 22 insertions(+), 30 deletions(-) diff --git a/FabLock/src/config_example.h b/FabLock/src/config_example.h index 3d215c1..1ab4f44 100644 --- a/FabLock/src/config_example.h +++ b/FabLock/src/config_example.h @@ -2,6 +2,6 @@ #define WLAN_PASS "" #define MQTT_BROKER "" #define FABLOCKID 1 -#define MPC_RELAIS_ADDR 0x02 +#define MPC_RELAIS_ADDR 0x20 #define HAS_FEEDBACK 1 -#define MPC_FEEDBACK_ADDR 0x03 \ No newline at end of file +#define MPC_FEEDBACK_ADDR 0x21 \ No newline at end of file diff --git a/FabLock/src/main.cpp b/FabLock/src/main.cpp index 7cad8e1..4108abf 100644 --- a/FabLock/src/main.cpp +++ b/FabLock/src/main.cpp @@ -19,13 +19,10 @@ char msg[MSG_BUFFER_SIZE]; char topic_recv[TOPIC_BUFFER_SIZE]; char topic_send[TOPIC_BUFFER_SIZE]; -void setup_wifi() +void setup_wifi() { delay(10); - - Serial.println(); - Serial.print("Connecting to "); - Serial.println(WLAN_SSID); + Serial.println("Connecting Wifi ..."); WiFi.mode(WIFI_STA); WiFi.begin(WLAN_SSID, WLAN_PASS); @@ -33,15 +30,9 @@ void setup_wifi() while (WiFi.status() != WL_CONNECTED) { delay(500); - Serial.print("."); } 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) @@ -51,7 +42,7 @@ void callback(char* topic, byte* payload, unsigned int length) int topic_len = (int)strlen(topic); int trigger_len = (int)strlen("/trigger"); 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}; 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}; strncpy(str_id, topic + topic_len - trigger_len - 3, 3); @@ -88,11 +79,11 @@ void callback(char* topic, byte* payload, unsigned int length) } } -void reconnect() +void reconnect() { while (!client.connected()) { - Serial.print("Attempting MQTT connection..."); + Serial.println("Connecting MQTT ..."); String clientId = "FABLOCK-"; clientId += String(random(0xffff), HEX); if (client.connect(clientId.c_str())) @@ -112,12 +103,13 @@ void reconnect() } } -void setup() +void setup() { int i = 0; - pinMode(BUILTIN_LED, OUTPUT); Serial.begin(115200); + Serial.println(); + setup_wifi(); client.setServer(MQTT_BROKER, 1883); @@ -125,22 +117,22 @@ void setup() if (!mcp_relais.begin_I2C(MPC_RELAIS_ADDR)) { - Serial.println("Error."); + Serial.println("MCP Error"); while (1); } - for(i = 0; i++; i Date: Tue, 20 Sep 2022 01:43:23 +0200 Subject: [PATCH 2/3] Added: Readme --- README.md | 100 +++++++----------------------------------------------- 1 file changed, 12 insertions(+), 88 deletions(-) diff --git a/README.md b/README.md index bd9825a..72dd737 100644 --- a/README.md +++ b/README.md @@ -1,92 +1,16 @@ # FabLock +MQTT Topics: +FABLOCKID is 3 Digits +RELAISID is 3 Digits +fablock/FABLOCKID/RELAISID/trigger : Trigger Relais for 1500 ms +Payload == 1 -> From LOW->HIGH->LOW +Payload == 0 -> From HIGH->LOW->HIGH +fablock/FABLOCKID/RELAISID/set_state : Set State of Relais +Payload == 1 -> HIGH +Payload == 0 -> LOW -## Getting started - -To make it easy for you to get started with GitLab, here's a list of recommended next steps. - -Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)! - -## Add your files - -- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files -- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command: - -``` -cd existing_repo -git remote add origin https://gitlab.com/fabinfra/fabhardware/fablock.git -git branch -M main -git push -uf origin main -``` - -## Integrate with your tools - -- [ ] [Set up project integrations](https://gitlab.com/fabinfra/fabhardware/fablock/-/settings/integrations) - -## Collaborate with your team - -- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/) -- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html) -- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically) -- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/) -- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html) - -## Test and Deploy - -Use the built-in continuous integration in GitLab. - -- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html) -- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/) -- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html) -- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/) -- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html) - -*** - -# Editing this README - -When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template. - -## Suggestions for a good README -Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information. - -## Name -Choose a self-explaining name for your project. - -## Description -Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors. - -## Badges -On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge. - -## Visuals -Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method. - -## Installation -Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection. - -## Usage -Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README. - -## Support -Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc. - -## Roadmap -If you have ideas for releases in the future, it is a good idea to list them in the README. - -## Contributing -State if you are open to contributions and what your requirements are for accepting them. - -For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self. - -You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser. - -## Authors and acknowledgment -Show your appreciation to those who have contributed to the project. - -## License -For open source projects, say how it is licensed. - -## Project status -If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers. +Every 30s FabLock return Relais and Feedback State +fablock/FABLOCKID/RELAISID/state : Set State of Relais +fablock/FABLOCKID/RELAISID/feedback : Set State of Feedback (Open Circut -> 0) \ No newline at end of file From 5bed0af0ab4c95ee22f827cd50f3d03d1c9d0a42 Mon Sep 17 00:00:00 2001 From: TheJoKlLa Date: Tue, 20 Sep 2022 02:20:06 +0200 Subject: [PATCH 3/3] Fixed maximum trigger time --- FabLock_Software/src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FabLock_Software/src/main.cpp b/FabLock_Software/src/main.cpp index 4108abf..2003628 100644 --- a/FabLock_Software/src/main.cpp +++ b/FabLock_Software/src/main.cpp @@ -4,7 +4,7 @@ #include "config.h" #define MCP_INPUTS 16 // MCP23017 -#define TRIGGER_TIME 1500 +#define TRIGGER_TIME 1000 WiFiClient espClient; PubSubClient client(espClient);