Merge branch 'master-1.7.0-rc2' into development

This commit is contained in:
Verkehrsrot 2018-12-28 20:31:38 +01:00 committed by GitHub
commit ffab2f7743
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 97 additions and 84 deletions

View File

@ -24,5 +24,12 @@
// additional definitions for LMIC
#define LORA_IO1 (33)
#define LORA_IO2 LMIC_UNUSED_PIN
#define LORA_SCK (5)
#define LORA_MOSI (27)
#define LORA_MISO (19)
#define LORA_CS (18)
#define LORA_RST (14)
#define LORA_IRQ (26)
#endif

View File

@ -26,5 +26,11 @@
// additional definitions for LMIC
#define LORA_IO1 (35)
#define LORA_IO2 (34)
#define LORA_SCK (5)
#define LORA_MOSI (27)
#define LORA_MISO (19)
#define LORA_CS (18)
#define LORA_RST (14)
#define LORA_IRQ (26)
#endif