Commit Graph

671 Commits

Author SHA1 Message Date
Timm Bogner
3c8f7a51d5
Merge pull request #70 from thefeiter/resend-after-reconnect
Mqtt send gateway timestamp and resend packets logged to SD/Flash
2022-08-01 18:11:51 -05:00
Timm Bogner
3680f258b6
Merge branch 'dev' into resend-after-reconnect 2022-08-01 18:11:22 -05:00
Jeff Lehman
4c1b59902e Merge branch 'dev_fixarduinoexamples' of https://github.com/aviateur17/Farm-Data-Relay-System into dev_fixarduinoexamples 2022-08-01 14:23:59 -05:00
Jeff Lehman
fdc941658e Add function prototypes for gateway examples to compile in Arduino 2022-08-01 14:23:29 -05:00
Timm Bogner
8c57e910c3
Merge branch 'dev' into dev_fixarduinoexamples 2022-07-31 23:48:50 -05:00
Timm Bogner
248f7c6755
Merge pull request #84 from aviateur17/dev_lorasensorping
Feature add: LoRa SystemPacket ping reply
2022-07-31 23:45:18 -05:00
Timm Bogner
d94faac99f
Merge pull request #80 from thefeiter/suggestions-for-config-check
Suggestions for config check
2022-07-31 23:44:04 -05:00
Sascha
795bf1c0e9 Applied patch #88
Applied patch #88 from @Aviateur17. This fixes the compile issues for sensor sketches. Gateway sketches still do not compile. Will check if this can be just applied the same way as the fix for the sensors.
2022-07-31 21:51:35 +02:00
Jeff Lehman
52069eae4d Fix Arduino compile issue 2022-07-31 08:37:10 -05:00
Sascha
a4e24d841f Changed usage of LORA_TXPWR to FDRS_TXPWR
After the local and global settings have been checked, the corresponding FDRS_xxx must be used. Changed this as not doing so leads to compile errors if the local setting is not set but the global one.
2022-07-30 21:48:47 +02: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
Jeff Lehman
57e4ebfe89 Small changes in way ACK stats are calculated 2022-07-29 10:35:41 -05:00
Jeff Lehman
f32a4f9f9d Feature add: LoRa SystemPacket ping reply 2022-07-28 19:11:46 -05: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
Timm Bogner
d055b2354d
Merge pull request #82 from aviateur17/dev_loramac_readingid
Use READING_ID as part of LoRa address. #65
2022-07-28 13:15:12 -05:00
theFeiter
7d82ab33a8 add backlog topic config option 2022-07-28 13:32:39 +02:00
Jeff Lehman
4457bede78 Added ability to adjust LoRa transmit power #66 2022-07-27 19:46:41 -05:00
Timm Bogner
4e41ae9540
Merge pull request #81 from aviateur17/dev
Fix #endif issues in fdrs_functions.h
2022-07-27 11:19:39 -05:00
Jeff Lehman
d8bb39c02b Fix #endif issues in fdrs_functions.h 2022-07-27 11:15:51 -05:00
theFeiter
ec8477d2ee obfuscate passwords 2022-07-27 17:19:20 +02:00
theFeiter
56cc65c4a1 set to constant chars 2022-07-27 16:49:40 +02:00
theFeiter
2c0fa7cfa5 add newline 2022-07-27 16:35:28 +02:00
theFeiter
18caa3f953 add crc confirmation for logging and resending 2022-07-27 16:31:54 +02:00
theFeiter
22d6e37550 move crc func to work with PIO 2022-07-27 15:32:26 +02:00
theFeiter
91aaef20a5 fix merge 2022-07-27 15:07:14 +02:00
theFeiter
b0d0002f0d Merge branch 'dev' into resend-after-reconnect 2022-07-27 14:35:20 +02:00
theFeiter
f544fd109c rename file since no longer csv 2022-07-27 14:23:52 +02:00
theFeiter
7da897e763 add log file size limit 2022-07-27 14:23:23 +02:00
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
523e066a6a Update fdrs_sensor_config.h 2022-07-24 21:28:41 -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