Archives/Farm-Data-Relay-System
2
0
Fork 0
mirror of https://github.com/timmbogner/Farm-Data-Relay-System synced 2024-11-10 07:10:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
460 Commits 7 Branches 1 Tag 6.3 MiB
9e700ca315
Commit Graph

460 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
theFeiter
9e700ca315 resend logged values if mqtt connection is back 
ATM using the csv lines
deleting the lofgile after resending
 2022-07-23 18:19:54 +02:00
theFeiter
b7541a8e00 send timestamp on mqtt 2022-07-20 23:19:27 +02:00
Timm Bogner
a8339f1136
Merge branch 'main' into dev 2022-07-20 13:40:12 -05:00
Timm Bogner
17e33b82af
Update README.md 2022-07-20 13:28:09 -05:00
Timm Bogner
699d7a2840 shwoop 2022-07-19 10:54:55 -05:00
Timm Bogner
5adb4a6728
Update README.md 2022-07-19 10:49:25 -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
Timm Bogner
c5f9064f03
Merge pull request #64 from Gulpman/dev 
Small improvement to debug messages in fdrs_sensor.cpp
 2022-07-15 10:04:17 -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
454365d453 House keeping on keywords.txt, library.properties and README.md 
- added missing categories in keywords.txt
- added dependency of ArduinoJson in library.properties (I didn't add LoRa and PubSubClient but think they should go there as well)
- reformatted paragraph on dependencies  as list for better readability
 2022-07-15 09:41:03 +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
e958b328a0 Update fdrs_globals.h 
Added header comment
 2022-07-14 14:39:20 +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
Timm Bogner
16507eb25a
Merge pull request #62 from thefeiter/use-internal-ntp-api 
Use internal NTP api
 2022-07-12 15:35:09 -05:00
theFeiter
d1872b1d53 replace external ntp with internal ntp 2022-07-12 21:32:27 +02:00
Timm Bogner
b91920517f
Merge pull request #58 from Gulpman/dev 
Bugfix: Updated fdrs_sensor.h of Universal_Sensor_beta
 2022-07-12 08:41:47 -05: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
d952081a22
Merge pull request #56 from thefeiter/buffer-log-writes 
Buffer log writes before saving them to the file.
 2022-07-11 22:03:46 -05:00
Timm Bogner
5822d8e0d9 Merge branch 'dev' into okay-wait-now-i-really-got-this 2022-07-11 18:59:23 -05:00
Timm Bogner
7a6a411547
Merge pull request #57 from Gulpman/dev 
Dev: Cleaned up naming of configuration files
 2022-07-11 18:29:41 -05: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
9ab5be2258 Update keywords.txt 
Added further entries to keywords.txt
 2022-07-11 16:29:16 +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
Sascha
52f0d0c9ce
Merge branch 'timmbogner:dev' into dev 2022-07-11 13:45:23 +02:00
theFeiter
85b1e16144 add newline 2022-07-11 12:55:45 +02:00
theFeiter
92c17d3567 release logbuffer every 10 seconds if not empty 2022-07-11 12:50:52 +02:00
theFeiter
48d2a6f012 only count seconds_since_reset when logging is enabled 2022-07-11 12:15:55 +02:00
Timm Bogner
3979c09dd7 changed reading_id to uint16_t 2022-07-10 20:38:43 -05:00
theFeiter
f29e7ce916 add defined filename 2022-07-10 19:50:47 +02:00
theFeiter
107c1413a1 use buffering for all logs 2022-07-10 19:26:45 +02:00
theFeiter
876d860a05 use internal seconds since reset only when wifi not enabled 2022-07-10 13:06:49 +02:00
theFeiter
3854593bf7 use internal seconds since reset only when wifi not enabled 2022-07-10 13:06:03 +02:00
Timm Bogner
59196b7829 fixed if/else 2022-07-09 20:22:33 -05:00
Timm Bogner
e10315bc28 used enum to make newData more expressive 2022-07-09 20:05:34 -05:00
Sascha
06036e54e4 Fixed issue with ignored global settings in fdrs_sensor.h 
This needs to be checked, especially in the new class-based model of sensors and gateways: First the global settings must be checked and the corresponding local settings for a sensor / gateway commented out.
Then either the one or other is saved in a FDRS_prefix variable. After that checks must soley be done against FDRS_variables.
 2022-07-09 19:13:36 +02:00
Timm Bogner
47ba30d167
Merge pull request #45 from thefeiter/spiffs-logging 
Create internal flash (LittleFS) logging functionality
 2022-07-08 18:59:05 -05:00
Timm Bogner
635977b789
Merge pull request #53 from Gulpman/dev 
DEV: Refactored DEBUG and DBG to FDRS_DEBUG and FDRS_DBG
 2022-07-08 18:58:19 -05:00
theFeiter
d8317daf83 this just fixed the write speed issue 2022-07-08 11:33:46 +02:00
theFeiter
83c11c27ed Merge branch 'dev' into spiffs-logging 2022-07-08 10:13:17 +02: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