Merge pull request #515 from cyberman54/development

Development
This commit is contained in:
Verkehrsrot 2019-12-31 11:30:59 +01:00 committed by GitHub
commit c0b5900632
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 15 deletions

View File

@ -364,17 +364,17 @@ Note: all settings are stored in NVRAM and will be reloaded when device starts.
Example for EU868: Example for EU868:
DataRate Configuration Bit/s DataRate Configuration Bit/s
0 LoRa: SF12 / 125 kHz 250 0 LoRa: SF12 / 125 kHz 250
1 LoRa: SF11 / 125 kHz 440 1 LoRa: SF11 / 125 kHz 440
2 LoRa: SF10 / 125 kHz 980 2 LoRa: SF10 / 125 kHz 980
3 LoRa: SF9 / 125 kHz 1760 3 LoRa: SF9 / 125 kHz 1760
4 LoRa: SF8 / 125 kHz 3125 4 LoRa: SF8 / 125 kHz 3125
5 LoRa: SF7 / 125 kHz 5470 5 LoRa: SF7 / 125 kHz 5470
6* LoRa: SF7 / 250 kHz 11000 6* LoRa: SF7 / 250 kHz 11000
7* FSK: 50 kbps 50000 7* FSK: 50 kbps 50000
8 .. 14 reserved for future use (RFU) 8 .. 14 reserved for future use (RFU)
15 ignored (device keeps current setting) 15 ignored (device keeps current setting)
*) not supported by TheThingsNetwork *) not supported by TheThingsNetwork

View File

@ -7,7 +7,7 @@
; ---> SELECT THE TARGET PLATFORM HERE! <--- ; ---> SELECT THE TARGET PLATFORM HERE! <---
[board] [board]
;halfile = generic.h halfile = generic.h
;halfile = ebox.h ;halfile = ebox.h
;halfile = eboxtube.h ;halfile = eboxtube.h
;halfile = ecopower.h ;halfile = ecopower.h
@ -19,7 +19,7 @@
;halfile = ttgov21new.h ;halfile = ttgov21new.h
;halfile = ttgofox.h ;halfile = ttgofox.h
;halfile = ttgobeam.h ;halfile = ttgobeam.h
halfile = ttgobeam10.h ;halfile = ttgobeam10.h
;halfile = fipy.h ;halfile = fipy.h
;halfile = lopy.h ;halfile = lopy.h
;halfile = lopy4.h ;halfile = lopy4.h
@ -56,7 +56,7 @@ monitor_speed = 115200
upload_speed = 115200 upload_speed = 115200
lib_deps_lora = lib_deps_lora =
;MCCI LoRaWAN LMIC library@>=3.1.0 ; MCCI LMIC by Terrill Moore ;MCCI LoRaWAN LMIC library@>=3.1.0 ; MCCI LMIC by Terrill Moore
https://github.com/mcci-catena/arduino-lmic.git https://github.com/mcci-catena/arduino-lmic.git#3ca90f3
lib_deps_display = lib_deps_display =
ss_oled@>=3.2.0 ; simple and small OLED lib by Larry Bank ss_oled@>=3.2.0 ; simple and small OLED lib by Larry Bank
BitBang_I2C@>=1.3.0 BitBang_I2C@>=1.3.0
@ -73,7 +73,7 @@ lib_deps_sensors =
Adafruit BMP085 Library@>=1.0.1 Adafruit BMP085 Library@>=1.0.1
lib_deps_basic = lib_deps_basic =
ArduinoJson@^5.13.1 ArduinoJson@^5.13.1
76@>=1.2.3 ; #76 Timezone by Jack Christensen 76@>=1.2.4 ; #76 Timezone by Jack Christensen
274@>=2.3.3 ; #274 RTC by Michael Miller 274@>=2.3.3 ; #274 RTC by Michael Miller
SimpleButton SimpleButton
AXP202X_Library@>=1.1.0 ; AXP202 PMU lib by Lewis He AXP202X_Library@>=1.1.0 ; AXP202 PMU lib by Lewis He

View File

@ -31,7 +31,7 @@
// so consuming more power. You may sharpen (reduce) this value if you are // so consuming more power. You may sharpen (reduce) this value if you are
// limited on battery. // limited on battery.
// ATTN: VALUES > 7 WILL CAUSE RECEPTION AND JOIN PROBLEMS WITH HIGH SF RATES // ATTN: VALUES > 7 WILL CAUSE RECEPTION AND JOIN PROBLEMS WITH HIGH SF RATES
#define CLOCK_ERROR_PROCENTAGE 5 //#define CLOCK_ERROR_PROCENTAGE 5
// Set this to 1 to enable some basic debug output (using printf) about // Set this to 1 to enable some basic debug output (using printf) about
// RF settings used during transmission and reception. Set to 2 to // RF settings used during transmission and reception. Set to 2 to