From 7b666b273707ffe1ebd7e16c9b76e73eb5801517 Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Sat, 20 Oct 2018 09:58:53 +0200 Subject: [PATCH] eboxtube.h added; renamed GPS_QUECTEL_L76 to GPS_I2C --- include/gps.h | 2 +- src/gps.cpp | 6 +++--- src/hal/eboxtube.h | 22 ++++++++++++++++++++++ src/hal/lopy.h | 2 +- src/hal/lopy4.h | 2 +- 5 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 src/hal/eboxtube.h diff --git a/include/gps.h b/include/gps.h index b5cbff88..88ca24d3 100644 --- a/include/gps.h +++ b/include/gps.h @@ -4,7 +4,7 @@ #include // library for parsing NMEA data #include -#ifdef GPS_QUECTEL_L76 // Needed for reading from I2C Bus +#ifdef GPS_I2C // Needed for reading from I2C Bus #include #endif diff --git a/src/gps.cpp b/src/gps.cpp index d2958a8b..126f7739 100644 --- a/src/gps.cpp +++ b/src/gps.cpp @@ -28,9 +28,9 @@ void gps_loop(void *pvParameters) { HardwareSerial GPS_Serial(1); GPS_Serial.begin(GPS_SERIAL); -#elif defined GPS_QUECTEL_L76 +#elif defined GPS_I2C uint8_t ret; - Wire.begin(GPS_QUECTEL_L76, 400000); // I2C connect to GPS device with 400 KHz + Wire.begin(GPS_I2C, 400000); // I2C connect to GPS device with 400 KHz Wire.beginTransmission(GPS_ADDR); Wire.write(0x00); // dummy write ret = Wire.endTransmission(); // check if chip is seen on i2c bus @@ -55,7 +55,7 @@ void gps_loop(void *pvParameters) { while (GPS_Serial.available()) { gps.encode(GPS_Serial.read()); } -#elif defined GPS_QUECTEL_L76 +#elif defined GPS_I2C Wire.requestFrom(GPS_ADDR, 32); // caution: this is a blocking call while (Wire.available()) { gps.encode(Wire.read()); diff --git a/src/hal/eboxtube.h b/src/hal/eboxtube.h new file mode 100644 index 00000000..9c66dbc3 --- /dev/null +++ b/src/hal/eboxtube.h @@ -0,0 +1,22 @@ +// Hardware related definitions for ebox ESP32-bit with external connected RFM95 LoRa + +#define HAS_LORA 1 // comment out if device shall not send data via LoRa +#define HAS_SPI 1 // comment out if device shall not send data via SPI +#define CFG_sx1276_radio 1 + +#define HAS_LED GPIO_NUM_22 // Green LED on board +#define HAS_RGB_LED GPIO_NUM_2 // WS2812B RGB LED on board +#define HAS_BUTTON GPIO_NUM_0 // button "FLASH" on board +#define DISABLE_BROWNOUT 1 // comment out if you want to keep brownout feature + +// re-define pin definitions of pins_arduino.h +#define PIN_SPI_SS GPIO_NUM_18 // ESP32 GPIO18 (Pin18) -- SX1276 NSS (Pin19) SPI Chip Select Input +#define PIN_SPI_MOSI GPIO_NUM_27 // ESP32 GPIO27 (Pin27) -- SX1276 MOSI (Pin18) SPI Data Input +#define PIN_SPI_MISO GPIO_NUM_19 // ESP32 GPIO19 (Pin19) -- SX1276 MISO (Pin17) SPI Data Output +#define PIN_SPI_SCK GPIO_NUM_5 // ESP32 GPIO5 (Pin5) -- SX1276 SCK (Pin16) SPI Clock Input + +// non arduino pin definitions +#define RST GPIO_NUM_14 // ESP32 GPIO14 (Pin14) -- SX1276 NRESET (Pin7) Reset Trigger Input +#define DIO0 GPIO_NUM_26 // ESP32 GPIO26 (Pin15) -- SX1276 DIO0 (Pin8) used by LMIC for detecting LoRa RX_Done & TX_Done +#define DIO1 GPIO_NUM_33 // ESP32 GPIO33 (Pin13) -- SX1276 DIO1 (Pin9) used by LMIC for detecting LoRa RX_Timeout +#define DIO2 GPIO_NUM_32 // ESP32 GPIO32 (Pin12) -- SX1276 DIO2 (Pin10) not used by LMIC for LoRa (Timeout for FSK only) \ No newline at end of file diff --git a/src/hal/lopy.h b/src/hal/lopy.h index 2ea2a097..b4a6a796 100644 --- a/src/hal/lopy.h +++ b/src/hal/lopy.h @@ -22,7 +22,7 @@ // uncomment this only if your LoPy runs on a PYTRACK BOARD //#define HAS_GPS 1 -//#define GPS_QUECTEL_L76 GPIO_NUM_25, GPIO_NUM_26 // SDA (P22), SCL (P21) +//#define GPS_I2C GPIO_NUM_25, GPIO_NUM_26 // SDA (P22), SCL (P21) //#define GPS_ADDR 0x10 // uncomment this only if your LoPy runs on a EXPANSION BOARD diff --git a/src/hal/lopy4.h b/src/hal/lopy4.h index 17ff92f8..db98eba9 100644 --- a/src/hal/lopy4.h +++ b/src/hal/lopy4.h @@ -23,7 +23,7 @@ // uncomment this only if your LoPy runs on a PYTRACK BOARD //#define HAS_GPS 1 -//#define GPS_QUECTEL_L76 GPIO_NUM_25, GPIO_NUM_26 // SDA (P22), SCL (P21) +//#define GPS_I2C GPIO_NUM_25, GPIO_NUM_26 // SDA (P22), SCL (P21) //#define GPS_ADDR 0x10 // uncomment this only if your LoPy runs on a EXPANSION BOARD