Merge pull request #920 from recrof/heltec_v3_cleanup
heltec v3 cleanup
This commit is contained in:
@@ -2,16 +2,7 @@
|
|||||||
|
|
||||||
#include <Arduino.h>
|
#include <Arduino.h>
|
||||||
#include <helpers/RefCountedDigitalPin.h>
|
#include <helpers/RefCountedDigitalPin.h>
|
||||||
|
#include <helpers/ESP32Board.h>
|
||||||
// LoRa radio module pins for Heltec V3
|
|
||||||
// Also for Heltec Wireless Tracker/Paper
|
|
||||||
#define P_LORA_DIO_1 14
|
|
||||||
#define P_LORA_NSS 8
|
|
||||||
#define P_LORA_RESET RADIOLIB_NC
|
|
||||||
#define P_LORA_BUSY 13
|
|
||||||
#define P_LORA_SCLK 9
|
|
||||||
#define P_LORA_MISO 11
|
|
||||||
#define P_LORA_MOSI 10
|
|
||||||
|
|
||||||
// built-ins
|
// built-ins
|
||||||
#ifndef PIN_VBAT_READ // set in platformio.ini for boards like Heltec Wireless Paper (20)
|
#ifndef PIN_VBAT_READ // set in platformio.ini for boards like Heltec Wireless Paper (20)
|
||||||
@@ -22,9 +13,6 @@
|
|||||||
#endif
|
#endif
|
||||||
#define PIN_ADC_CTRL_ACTIVE LOW
|
#define PIN_ADC_CTRL_ACTIVE LOW
|
||||||
#define PIN_ADC_CTRL_INACTIVE HIGH
|
#define PIN_ADC_CTRL_INACTIVE HIGH
|
||||||
//#define PIN_LED_BUILTIN 35
|
|
||||||
|
|
||||||
#include "ESP32Board.h"
|
|
||||||
|
|
||||||
#include <driver/rtc_io.h>
|
#include <driver/rtc_io.h>
|
||||||
|
|
||||||
@@ -43,7 +31,7 @@ public:
|
|||||||
// Auto-detect correct ADC_CTRL pin polarity (different for boards >3.2)
|
// Auto-detect correct ADC_CTRL pin polarity (different for boards >3.2)
|
||||||
pinMode(PIN_ADC_CTRL, INPUT);
|
pinMode(PIN_ADC_CTRL, INPUT);
|
||||||
adc_active_state = !digitalRead(PIN_ADC_CTRL);
|
adc_active_state = !digitalRead(PIN_ADC_CTRL);
|
||||||
|
|
||||||
pinMode(PIN_ADC_CTRL, OUTPUT);
|
pinMode(PIN_ADC_CTRL, OUTPUT);
|
||||||
digitalWrite(PIN_ADC_CTRL, !adc_active_state); // Initially inactive
|
digitalWrite(PIN_ADC_CTRL, !adc_active_state); // Initially inactive
|
||||||
|
|
||||||
@@ -64,7 +52,7 @@ public:
|
|||||||
void enterDeepSleep(uint32_t secs, int pin_wake_btn = -1) {
|
void enterDeepSleep(uint32_t secs, int pin_wake_btn = -1) {
|
||||||
esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
|
esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
|
||||||
|
|
||||||
// Make sure the DIO1 and NSS GPIOs are hold on required levels during deep sleep
|
// Make sure the DIO1 and NSS GPIOs are hold on required levels during deep sleep
|
||||||
rtc_gpio_set_direction((gpio_num_t)P_LORA_DIO_1, RTC_GPIO_MODE_INPUT_ONLY);
|
rtc_gpio_set_direction((gpio_num_t)P_LORA_DIO_1, RTC_GPIO_MODE_INPUT_ONLY);
|
||||||
rtc_gpio_pulldown_en((gpio_num_t)P_LORA_DIO_1);
|
rtc_gpio_pulldown_en((gpio_num_t)P_LORA_DIO_1);
|
||||||
|
|
||||||
@@ -7,6 +7,13 @@ build_flags =
|
|||||||
-I variants/heltec_v3
|
-I variants/heltec_v3
|
||||||
-D HELTEC_LORA_V3
|
-D HELTEC_LORA_V3
|
||||||
-D ESP32_CPU_FREQ=80
|
-D ESP32_CPU_FREQ=80
|
||||||
|
-D P_LORA_DIO_1=14
|
||||||
|
-D P_LORA_NSS=8
|
||||||
|
-D P_LORA_RESET=RADIOLIB_NC
|
||||||
|
-D P_LORA_BUSY=13
|
||||||
|
-D P_LORA_SCLK=9
|
||||||
|
-D P_LORA_MISO=11
|
||||||
|
-D P_LORA_MOSI=10
|
||||||
-D RADIO_CLASS=CustomSX1262
|
-D RADIO_CLASS=CustomSX1262
|
||||||
-D WRAPPER_CLASS=CustomSX1262Wrapper
|
-D WRAPPER_CLASS=CustomSX1262Wrapper
|
||||||
-D LORA_TX_POWER=22
|
-D LORA_TX_POWER=22
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
#define RADIOLIB_STATIC_ONLY 1
|
#define RADIOLIB_STATIC_ONLY 1
|
||||||
#include <RadioLib.h>
|
#include <RadioLib.h>
|
||||||
#include <helpers/radiolib/RadioLibWrappers.h>
|
#include <helpers/radiolib/RadioLibWrappers.h>
|
||||||
#include <helpers/HeltecV3Board.h>
|
#include <HeltecV3Board.h>
|
||||||
#include <helpers/radiolib/CustomSX1262Wrapper.h>
|
#include <helpers/radiolib/CustomSX1262Wrapper.h>
|
||||||
#include <helpers/AutoDiscoverRTCClock.h>
|
#include <helpers/AutoDiscoverRTCClock.h>
|
||||||
#include <helpers/SensorManager.h>
|
#include <helpers/SensorManager.h>
|
||||||
|
|||||||
Reference in New Issue
Block a user