Commit Graph

542 Commits

Author SHA1 Message Date
Timm Bogner
9780e54b69
Merge pull request #76 from aviateur17/dev
#54 Packet Confirmation - LoRa ACK and CRC
2022-07-26 23:06:24 -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
Timm Bogner
9ba1209c62
Merge pull request #74 from Gulpman/dev
Clean up of #72
2022-07-25 12:50:55 -05:00
Timm Bogner
a8e8d41de6
Merge branch 'dev' into dev 2022-07-25 12:50:35 -05:00
Timm Bogner
7cf9ea113d Update fdrs_sensor_config.h 2022-07-24 21:26:25 -05:00
Timm Bogner
7e208cbc9b Merge branch 'main' into dev 2022-07-24 20:28:54 -05:00
Timm Bogner
2ec3a04e16 Update fdrs_gateway_config.h 2022-07-24 20:12:53 -05:00
Timm Bogner
f010f27673
Merge pull request #73 from timmbogner/the-big-change
System Packets and Big Changes
2022-07-24 20:09:46 -05:00
theFeiter
110800d29e use json again instead of csv 2022-07-23 20:43:41 +02:00
theFeiter
f83e41da5a add SD support 2022-07-23 18:30:44 +02:00
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
Sascha
7a524fe456
Update README.md
Added section on USE_ESPNOW.
2022-07-23 01:21:35 +02: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
Timm Bogner
62685452ad
Merge pull request #72 from Gulpman/dev
Dev - partial fix of #71
2022-07-22 01:55:23 -05:00
Timm Bogner
d04639a865 Finished ping support
Not immediately useful, but it is interesting to know how low an FDRS ping is (in ms). I won't ruin the surprise, but it's pretty low.

More importantly however, I laid out how SystemPackets will work. I might rename those.
2022-07-22 01:37:57 -05: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
d6201fdd6d Update fdrs_sensor.h
Missed one :)
2022-07-21 12:17:16 +02:00
Sascha
c27bffe1ec Further debug enhancements
Added Id and data content to debug message.
Also changed the order to meet the serial debug output of the gateway - this way it is much easier to check if what has been sent is what has been received.
2022-07-21 12:11:35 +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
Sascha
7c15bdf675 Update fdrs_globals.h
No change to the content - just putting blocks together for simpler overview.
2022-07-21 10:58:48 +02:00
Timm Bogner
3c3231e4f0 implementing SystemPackets 2022-07-20 23:32:39 -05:00
theFeiter
b7541a8e00 send timestamp on mqtt 2022-07-20 23:19:27 +02:00
Sascha
c0e28b0403 LoRa debug: show band and sf for better debugging 2022-07-20 21:56:19 +02:00
Timm Bogner
7090109008
Merge pull request #68 from timmbogner/dev
New in this release:
- Added "FDRS_" prefixes to many macros/variables. (@Gulpman )
- Added SD card backup for MQTT gateways. (@thefeiter)
2022-07-20 13:53:51 -05: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