Commit Graph

146 Commits (main)

Author SHA1 Message Date
Jeff Lehman def150b49c Use READING_ID as part of LoRa address. #65 2 years ago
Jeff Lehman e26d44ff44 Merge branch 'dev' of https://github.com/aviateur17/Farm-Data-Relay-System into dev 2 years ago
Jeff Lehman eed87ac84c Validate CRC when sensor does not want ACK - improvement #54 2 years ago
Timm Bogner 90ac7148fe
Merge branch 'dev' into dev 2 years ago
Jeff Lehman f3d840f944 Disable ACK by default for sensors #54 2 years ago
Jeff Lehman 269fd335c2 Add LoRa ACK & CRC functionality for sensors #54 2 years ago
Jeff Lehman 0bf0015576 Add LoRa ACK & CRC functionality for gateway #54 2 years ago
Sascha 62c247275a Applied changes to FDRS_Sensor and FDRS_Gateway folders 2 years ago
Sascha ae85886e65 added #define USE_ESPNOW to gateway code
Including sections which are ESPNOW specific only if #define USE_ESPNOW is enabled.
2 years ago
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.
2 years ago
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.
2 years ago
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.
2 years ago
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.
2 years ago
Sascha 7526439d85 Return random vaule for sensor nodes
the return value in the sensor sketches was missing the random function. Fixed that.
2 years ago
Timm Bogner 699d7a2840 shwoop 2 years ago
Timm Bogner 1ce8a3eb2b dink
Changed the spammer a little and adjusted some other stuff.
2 years ago
Timm Bogner 6a5e7acd13 sensors are go 2 years ago
Timm Bogner d3e137ab8b unifying gateways etc
more to come
2 years ago
Sascha 087b9f30c8 house keeping
Added some comments for easier browsing through the source and corrected a type.
2 years ago
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.
2 years ago
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
2 years ago
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.
2 years ago
Sascha c6b16143a9 Replaced undefined sleep_time with seconds 2 years ago
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
2 years ago
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.
2 years ago
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.
2 years ago
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.
2 years ago
Timm Bogner d37fdec9fc moved to its folder 2 years ago
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.
2 years ago
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.
2 years ago
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.
2 years ago
Sascha 249904fbc4 Refactoring for easier understanding while coding
Step one: refactor sensor_setup.h -> fdrs_sensor.h
2 years ago
Timm Bogner 3979c09dd7 changed reading_id to uint16_t 2 years ago
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
2 years ago
Timm Bogner a8e94156dd Updated gateway .ino 2 years ago
Timm Bogner 8825396298
Merge pull request #49 from Gulpman/dev
Dev: refactoring GLOBALS to FDRS_GLOBALS
2 years ago
Timm Bogner 0da17e0ddb
Merge pull request #50 from thefeiter/add-prefix-to-defines-for-pio
Add prefix to defines and unify SPI initialization
2 years ago
Binder Tronics 7edfe72742 typo 2 years ago
Binder Tronics 74b2cd33ac add docs 2 years ago
theFeiter d093128e7c only use defined spi pins on ESP32 2 years ago
theFeiter 6b51e1c978 add prefixes to defines 2 years ago
Sascha 25fb6b4d26 refactored GLOBALS to FDRS_GLOBALS
Globals is just too... global :)
Could also conflict with other libraries.
2 years ago
Timm Bogner 9c9b56f392 a compromise 2 years ago
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
2 years ago
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.
2 years ago
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.
2 years ago