Commit Graph

140 Commits

Author SHA1 Message Date
Timm Bogner
349174f77c changed pin assignments 2022-11-29 07:14:26 -06:00
lamasseriadipolverara
b6ffa2712c
Conflict with 12 pin
change the  pin 12 to pin 16, because pin 12 affect the boot of the device (esp32 wroom - 32e)
2022-11-29 09:22:15 +01:00
Timm Bogner
f433413ff5 added checkCoils() to ensure pin status 2022-11-28 18:43:04 -06:00
Timm Bogner
64a1731320
Update README.md 2022-11-26 12:58:40 -06:00
Timm Bogner
fb15115c62 getting started 2022-11-21 23:04:39 -06:00
Timm Bogner
d088163d3d misc 2022-11-19 19:59:42 -06:00
Timm Bogner
1e20a423a1 Update fdrs_gateway_config.h 2022-11-11 08:25:32 -06:00
Timm Bogner
a0b931413a Create Single_Channel_Relay.ino 2022-11-11 08:21:21 -06:00
Timm Bogner
83c073f3ba fixing things? 2022-11-09 18:54:51 -06:00
Timm Bogner
2dbbdbbf8e housekeeping 2022-11-08 19:04:10 -06:00
Timm Bogner
1d68f1f314 cleaned gateway ino 2022-10-25 15:25:12 -05:00
Timm Bogner
c3b106d21e Update FrequencyCounter.ino 2022-10-20 09:27:50 -05:00
Timm Bogner
aa06c421d1 another sensor 2022-10-11 21:47:52 -05:00
Timm Bogner
1f4c974b4c added some sensors 2022-10-11 10:55:15 -05:00
Timm Bogner
91aeb11402 remove .gitignore 2022-10-06 05:33:35 -05:00
Timm Bogner
df6c26b734 TFT_eSPI example 2022-10-04 17:55:47 -05:00
Timm Bogner
39bd741614 switched terminology 2022-10-02 18:34:54 -05:00
Timm Bogner
5340965c3a input via Serial0
data at the Rx of the USB Serial port (normally used for debugging) will now be entered into the getSerial() function
2022-10-01 00:19:53 -05:00
Timm Bogner
4721e72b47 changed peers to neighbors
Better reflects the concept and clears ambiguity
2022-09-29 14:31:07 -05:00
Timm Bogner
6212c58648 move ack settings
hid LoRa settings
2022-09-26 18:20:58 -05:00
Timm Bogner
ccf24f50f9 added delay(0) 2022-09-09 12:27:58 -05:00
Timm Bogner
754fb9ce56 ESP-NOW confirmation 2022-09-08 13:48:58 -05:00
Timm Bogner
236afd04e9 Update Irrigation.ino
Co-Authored-By: Kisssys <5122480+Kisssys@users.noreply.github.com>
2022-09-06 23:21:28 -05:00
Timm Bogner
bcda928a4a added gypsum soil sensor
Co-Authored-By: Kisssys <5122480+Kisssys@users.noreply.github.com>
2022-09-06 21:31:32 -05:00
Timm Bogner
06aa620c6a 4-channel Relay Controller 2022-09-01 19:49:32 -05:00
Timm Bogner
40f415f405
Merge pull request #98 from timmbogner/two-way-comms
Two-way communications - take 2
2022-08-31 16:31:09 -05:00
Timm Bogner
537f14dc03 added support for TSL2561 2022-08-30 19:30:36 -05:00
Timm Bogner
a58cab5774 removed fdrs_sensor.h etc 2022-08-25 23:34:29 -05:00
Timm Bogner
65d31644c8 Merge branch 'dev' into two-way-comms 2022-08-25 23:03:36 -05:00
Timm Bogner
1501817975 subscription list and unified callback
the functionality is almost complete
2022-08-25 22:46:25 -05:00
Timm Bogner
4c0b934b5a Update fdrs_gateway_config.h 2022-08-25 22:46:25 -05:00
Timm Bogner
408779bbd4 Update 1_UART_Gateway.ino 2022-08-25 22:46:25 -05:00
Timm Bogner
b3e177a945 fixed gateway 2022-08-25 22:46:25 -05:00
Timm Bogner
d1491c686c i guess that fixes it 2022-08-25 22:46:25 -05:00
Timm Bogner
e89ac94427 cosmetic 2022-08-25 22:46:25 -05:00
Timm Bogner
9f74426f0b added new abilities 2022-08-25 22:46:25 -05:00
Sascha
32b6a4cdab Added missing parameter checks to fdrs_checkConfig
Added test for logging functions as well as LoRa ACK.
Added the define to all numbered example sketches.
2022-08-25 10:58:02 +02:00
Sascha
4ce0a617af Clean-up of fdrs_checkConfig.h
Removed redundancies from fdrs_checkConfig.h
Also - as an example - added the inclusion of the node config check in 0_MQTT_Gateway
2022-08-24 17:20:39 +02:00
Timm Bogner
deabf20a3d readme and sensor examples
moved readmes, added back sensor examples
2022-08-07 00:30:48 -05:00
Timm Bogner
b8675edb02 replace old examples 2022-08-03 22:27:55 -05:00
Jeff Lehman
1f4021dda4 decouple READING_ID from LoRa address 2022-08-03 20:40:41 -05:00
Sascha
fb9be94242 disabled local lora configuration in sensor and gateway files
By default the local lora configuration must be disabled. This is less error-prone as values from the fdrs_globals.h file are used by default.
2022-07-30 21:00:11 +02:00
Timm Bogner
91bcf22361
Merge pull request #83 from aviateur17/dev_loratxpow
Add ability to adjust LoRa transmit power #66
2022-07-28 13:17:32 -05:00
Jeff Lehman
4457bede78 Added ability to adjust LoRa transmit power #66 2022-07-27 19:46:41 -05:00
Jeff Lehman
def150b49c Use READING_ID as part of LoRa address. #65 2022-07-26 13:25:06 -05:00
Jeff Lehman
e26d44ff44 Merge branch 'dev' of https://github.com/aviateur17/Farm-Data-Relay-System into dev 2022-07-26 08:29:23 -05:00
Jeff Lehman
eed87ac84c Validate CRC when sensor does not want ACK - improvement #54 2022-07-26 06:40:50 -05:00
Timm Bogner
90ac7148fe
Merge branch 'dev' into dev 2022-07-25 15:25:11 -05:00
Jeff Lehman
f3d840f944 Disable ACK by default for sensors #54 2022-07-25 14:01:46 -05:00
Jeff Lehman
269fd335c2 Add LoRa ACK & CRC functionality for sensors #54 2022-07-25 13:28:21 -05:00
Jeff Lehman
0bf0015576 Add LoRa ACK & CRC functionality for gateway #54 2022-07-25 13:06:14 -05:00
Sascha
62c247275a Applied changes to FDRS_Sensor and FDRS_Gateway folders 2022-07-23 01:09:58 +02:00
Sascha
ae85886e65 added #define USE_ESPNOW to gateway code
Including sections which are ESPNOW specific only if #define USE_ESPNOW is enabled.
2022-07-23 01:05:01 +02:00
Sascha
5e85269373 Clean up of #72
- moved configuration checkup to external file to make sensor and gateway files smaller.
- for sensors the config now only is shown if the sensor does NOT return from Deep Sleep. For example when pressing the reset button or after a crash.
- for gateways the configuration is shown once and also can be forced to be shown with a reset. Code should work for ESP32 and ESP8266 - have only tested it with ESP32.
- fixed issue in fdrs_functions.h - if MQTT_AUTH was enabled but WIFI disabled, the compile crashed.
2022-07-22 23:41:52 +02:00
Sascha
5027623cb8 Fixing configuration system - part 2: gateways
Further work on #71 :
- Added config code to fdrs_functions.h.
- Commented all local config settings -> global config settings will be taken by default.
- added a debugConfig function, to check from where settings have been taken. May be moved to a place where sensors and gateways can share code as this is needed only once. For the sake of simplicity the function made it into fdrs_sensor.h and fdrs_functions.h Needs to be refined, as there is redundancy right now.
2022-07-21 16:24:01 +02:00
Sascha
cfa57e388b Fixing configuration system - part 1: sensors
Fixed the configuration system for sensor nodes. Gateway nodes are still to be fixed (work still in process :) )
This has been addressed in #71

Important: For this system to work and make the onboarding easier for new users, global settings must be used by default and therefore local settings must be commented out by default.
2022-07-21 14:01:51 +02:00
Sascha
b73b7a4b1c Added LoRa Debug info for BAND and SF to all nodes for better debugging
As there is still a lot of redundancy in the project, in a first step I added the debug messages in each of the places.
2022-07-21 11:46:16 +02:00
Sascha
7526439d85 Return random vaule for sensor nodes
the return value in the sensor sketches was missing the random function. Fixed that.
2022-07-21 11:06:49 +02:00
Timm Bogner
699d7a2840 shwoop 2022-07-19 10:54:55 -05:00
Timm Bogner
1ce8a3eb2b dink
Changed the spammer a little and adjusted some other stuff.
2022-07-19 10:08:24 -05:00
Timm Bogner
6a5e7acd13 sensors are go 2022-07-19 08:39:06 -05:00
Timm Bogner
d3e137ab8b unifying gateways etc
more to come
2022-07-18 20:42:42 -05:00
Sascha
087b9f30c8 house keeping
Added some comments for easier browsing through the source and corrected a type.
2022-07-15 14:09:40 +02:00
Sascha
dbf6d5b082 Removed double-include of fdrs_gateway_config.h
fdrs_gateway_config. h was included twice. I also simplified th USE_LED configuration block (was defined twice, could be done in one block.
2022-07-15 10:02:17 +02:00
Sascha
3878c27725 Fixed #59
Fixed #59 with the help of aviateur17. Explanation here: https://github.com/timmbogner/Farm-Data-Relay-System/issues/59#issuecomment-1183915731
2022-07-14 15:29:54 +02:00
Sascha
54b21e9a3b Fixed unallowed extra tokens after #endif
Extra tokens at end of #endif directive are not allowed. Arudino IDE does not care but Platform IO does. The specification forbids is as well, so adding a comment behind the endif is a good compromise between overview and conformity.
2022-07-14 13:58:34 +02:00
Sascha
c6b16143a9 Replaced undefined sleep_time with seconds 2022-07-13 12:58:36 +02:00
Sascha
4b2892dd55 Small improvement to debug messages in fdrs_sensor.cpp
Just two small additions making debugging a little bit more convenient:

- Added value of data to FDRSBase::load
- Added additional text tp FDRSLoRa::init
2022-07-13 08:21:16 +02:00
Sascha
0fd7a84dca Added support to choose either LoRa or ESPNow sensor
by defining USE_LORA or USE_ESPNOW the sensor is set up as exactly that.
2022-07-12 15:12:34 +02:00
Sascha
daf4adefd9 Debug helper :)
I find it very convenient for testing to have altering values within the sensor sketches, as it is easier to see if new values are arriving. Therefore replaced the fixed humidity value to a random value between 0-100.
2022-07-12 11:21:46 +02:00
Sascha
ef573a8f45 Bugfix: Updated fdrs_sensor.h of Universal_Sensor_beta
A "LORA" was missing in the definition for FDRS_... Lora settings which led to a compile error. Fixed.
2022-07-12 11:11:31 +02:00
Timm Bogner
d37fdec9fc moved to its folder 2022-07-11 12:54:01 -05:00
Sascha
0d7c767070 Added example from @Devilbinder to the repo
Added the example sketch.
At the moment this resides in a separate folder but after the Universal_Gateway has been finished this could be moved into the Full_System_Example or a generic Gateway_Examples folder.
2022-07-11 16:47:15 +02:00
Sascha
700f87b6a4 houeskeeping in Universal Sensor's config file
Put FDRS_DEBUG to top
Some formatting and further explanations on the settings.
Uncommented local LoRa settings, so by default the global fdrs settings are taken.
This makes the setup process easier and less error-prone.
2022-07-11 16:25:03 +02:00
Sascha
acf53e6ed5 Refactored gateway config files
Refactored fdrs_config.h to fdrs_gateway_config.h
This way it is directly visible from within a folder, what the config is for.
2022-07-11 16:07:46 +02:00
Sascha
249904fbc4 Refactoring for easier understanding while coding
Step one: refactor sensor_setup.h -> fdrs_sensor.h
2022-07-11 15:59:47 +02:00
Timm Bogner
3979c09dd7 changed reading_id to uint16_t 2022-07-10 20:38:43 -05:00
Sascha
9e57a8f299 Refactored DEBUG and DBG to FDRS_DEBUG and FDRS_DBG
Changed those values to be prevent compiling issues with PlatformIO and also as it is good practice not to use names which easily could collide with other libs.
Also removed a duplicate line from keywords.txt
2022-07-08 08:41:58 +02:00
Timm Bogner
a8e94156dd Updated gateway .ino 2022-07-07 23:29:03 -05:00
Timm Bogner
8825396298
Merge pull request #49 from Gulpman/dev
Dev: refactoring GLOBALS to FDRS_GLOBALS
2022-07-07 18:06:01 -05:00
Timm Bogner
0da17e0ddb
Merge pull request #50 from thefeiter/add-prefix-to-defines-for-pio
Add prefix to defines and unify SPI initialization
2022-07-07 18:03:32 -05:00
Binder Tronics
7edfe72742 typo 2022-07-07 19:59:32 +02:00
Binder Tronics
74b2cd33ac add docs 2022-07-07 19:31:11 +02:00
theFeiter
d093128e7c only use defined spi pins on ESP32 2022-07-07 12:38:57 +02:00
theFeiter
6b51e1c978 add prefixes to defines 2022-07-07 12:37:04 +02:00
Sascha
25fb6b4d26 refactored GLOBALS to FDRS_GLOBALS
Globals is just too... global :)
Could also conflict with other libraries.
2022-07-07 11:40:12 +02:00
Timm Bogner
9c9b56f392 a compromise 2022-07-05 22:50:36 -05:00
Sascha
b2423b5265 cleanup of examples folder
- copied fdrs_functions.h to the root dir.
- removed all local occurances of fdrs_sensor.h and included the global <fdrs_sensor.h> instead.
- removed all local occurances of fdrs_functions.h and included the global <fdrs_functions.h> instead.
- made inclusion of fdrs_globals.h the default instead of using the llocal definitions in the file everywhere were FDRS_xxx is defined correctly.
- Fixed the faulty calls to functions where the local defines instead of the FDRS_xxx defines were used, e.G. BAND instead of FDRS_BAND
- For easier debugging I added some variation to the sensor sketches: Humidity values are randomly choosen between 0-100. For ease of view I made the first digit of the temperature values match the Reading_ID
2022-07-06 01:03:22 +02:00
Sascha
5ef5b73df3 Cleaned up library base structure
* keywords.txt (for syntax highlighting), library.properties (for a proper description added
* moved Universal_Sensor_beta to the examples directory
* moved Sensors, FDRS_Sensor and FDRS_Gateway to resources folder. They contain documentation which needs to be kept (to be discussed where to put that later on) but are fully redundant as they are just duplicates of the different sensors / gateways in the examples folder.
2022-07-06 00:33:32 +02:00
Sascha
06a46d1ec9 second step: renamed Examples to examples
The Examples folder must be named examples (with lower e at the beginning) to show up in the Arduino IDE example folder.
2022-07-05 22:18:54 +02:00