From a85f84ede444eed69ae6e5aedaaf6a66ee2d1209 Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Sat, 14 Mar 2020 18:46:39 +0100 Subject: [PATCH] m5core.h m4fire.h bugfix lora pins --- src/hal/m5core.h | 11 +++-------- src/hal/m5fire.h | 13 ++++--------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/src/hal/m5core.h b/src/hal/m5core.h index 1f3371ce..85b79f3b 100644 --- a/src/hal/m5core.h +++ b/src/hal/m5core.h @@ -2,26 +2,21 @@ // upload_speed 921600 // board m5stack-core-esp32 -// EXPERIMENTAL VERSION - NOT TESTED ON M5 HARDWARE YET - #ifndef _M5CORE_H #define _M5CORE_H #include #define HAS_LORA 1 // comment out if device shall not send data via LoRa or has no M5 RA01 LoRa module - -// Pins for LORA chip SPI interface, reset line and interrupt lines #define LORA_SCK SCK #define LORA_CS SS #define LORA_MISO MISO #define LORA_MOSI MOSI -#define LORA_RST GPIO_NUM_36 -#define LORA_IRQ GPIO_NUM_26 -#define LORA_IO1 GPIO_NUM_34 // must be externally wired on PCB! +#define LORA_RST GPIO_NUM_26 +#define LORA_IRQ GPIO_NUM_36 +#define LORA_IO1 GPIO_NUM_34 // must be wired by you on PCB! #define LORA_IO2 LMIC_UNUSED_PIN - // enable only if you want to store a local paxcount table on the device #define HAS_SDCARD 1 // this board has an SD-card-reader/writer // Pins for SD-card diff --git a/src/hal/m5fire.h b/src/hal/m5fire.h index 0064799c..e02ede3a 100644 --- a/src/hal/m5fire.h +++ b/src/hal/m5fire.h @@ -2,29 +2,24 @@ // upload_speed 921600 // board m5stack-fire -// EXPERIMENTAL VERSION - NOT TESTED ON M5 HARDWARE YET - #ifndef _M5FIRE_H #define _M5FIRE_H #include -// #define HAS_LORA 1 // comment out if device shall not send data via LoRa or has no M5 RA01 LoRa module - -// Pins for LORA chip SPI interface, reset line and interrupt lines +#define HAS_LORA 1 // comment out if device shall not send data via LoRa or has no M5 RA01 LoRa module #define LORA_SCK SCK #define LORA_CS SS #define LORA_MISO MISO #define LORA_MOSI MOSI -#define LORA_RST GPIO_NUM_36 -#define LORA_IRQ GPIO_NUM_26 -#define LORA_IO1 GPIO_NUM_34 // must be externally wired on PCB! +#define LORA_RST GPIO_NUM_26 +#define LORA_IRQ GPIO_NUM_36 +#define LORA_IO1 GPIO_NUM_34 // must be wired by you on PCB! #define LORA_IO2 LMIC_UNUSED_PIN // enable only if you want to store a local paxcount table on the device #define HAS_SDCARD 1 // this board has an SD-card-reader/writer -// Pins for SD-card #define SDCARD_CS GPIO_NUM_4 #define SDCARD_MOSI MOSI #define SDCARD_MISO MISO