DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v1.2.5

Browse Source
This commit is contained in:
Klaus K Wilting 2018-03-27 12:46:38 +02:00
parent 156aba2709
commit 92cbaeeaa6
5 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platformio.ini
View File

@ -10,12 +10,12 @@
; ---> SELECT TARGET PLATFORM HERE! <--- ; ---> SELECT TARGET PLATFORM HERE! <---
[platformio] [platformio]
env_default = heltec_wifi_lora_32 ;env_default = heltec_wifi_lora_32
;env_default = ttgov1 ;env_default = ttgov1
;env_default = ttgov2 ;env_default = ttgov2
;env_default = lopy ;env_default = lopy
;env_default = lopy4 ;env_default = lopy4
;env_default = lolin32_lora env_default = lolin32_lora
[env:heltec_wifi_lora_32] [env:heltec_wifi_lora_32]
platform = espressif32 platform = espressif32

2
src/blecount.cpp
View File

@ -19,7 +19,7 @@ class MyAdvertisedDeviceCallbacks: public BLEAdvertisedDeviceCallbacks {
void BLECount() { void BLECount() {
u8x8.clearLine(3); u8x8.clearLine(3);
u8x8.drawString(0,3,"BLE Scan..."); u8x8.drawString(0,3,"BLE Scan...");
BLEDevice::init("PaxCnt"); BLEDevice::init(PROGNAME);
BLEScan* pBLEScan = BLEDevice::getScan(); //create new scan BLEScan* pBLEScan = BLEDevice::getScan(); //create new scan
pBLEScan->setAdvertisedDeviceCallbacks(new MyAdvertisedDeviceCallbacks()); pBLEScan->setAdvertisedDeviceCallbacks(new MyAdvertisedDeviceCallbacks());
pBLEScan->setActiveScan(true); //active scan uses more power, but get results faster pBLEScan->setActiveScan(true); //active scan uses more power, but get results faster

4
src/hal/ttgov2.h
View File

@ -3,6 +3,10 @@
#define CFG_sx1276_radio 1 // HPD13A LoRa SoC #define CFG_sx1276_radio 1 // HPD13A LoRa SoC
#define HAS_DISPLAY U8X8_SSD1306_128X64_NONAME_HW_I2C #define HAS_DISPLAY U8X8_SSD1306_128X64_NONAME_HW_I2C
//#define HAS_LED NOT_A_PIN // on-board LED is wired to SCL (used by display) therefore totally useless
// disable brownout detection (needed on TTGOv2 for battery powered operation)
#define DISABLE_BROWNOUT 1 // comment out if you want to keep brownout feature
// re-define pin definitions of pins_arduino.h // re-define pin definitions of pins_arduino.h
#define PIN_SPI_SS 18 // ESP32 GPIO18 (Pin18) -- HPD13A NSS/SEL (Pin4) SPI Chip Select Input #define PIN_SPI_SS 18 // ESP32 GPIO18 (Pin18) -- HPD13A NSS/SEL (Pin4) SPI Chip Select Input

2
src/main.h
View File

@ -1,5 +1,5 @@
// program version // program version
#define PROGVERSION "1.2.41" // use max 10 chars here! #define PROGVERSION "1.2.5" // use max 10 chars here!
#define PROGNAME "PAXCNT" #define PROGNAME "PAXCNT"
// Verbose enables serial output // Verbose enables serial output

20
src/rcommand.cpp
View File

@ -13,15 +13,6 @@
// Local logging tag // Local logging tag
static const char *TAG = "rcommand"; static const char *TAG = "rcommand";
// functions defined in configmanager.cpp
void eraseConfig(void);
void saveConfig(void);
// defined in antenna.cpp
#ifdef HAS_ANTENNA_SWITCH
void antenna_select(const int8_t _ant);
#endif
// table of remote commands and assigned functions // table of remote commands and assigned functions
typedef struct { typedef struct {
const int nam; const int nam;
@ -29,7 +20,16 @@ typedef struct {
const bool store; const bool store;
} cmd_t; } cmd_t;
// help function to assign LoRa datarates to spreadfactor values // functions defined in configmanager.cpp
void eraseConfig(void);
void saveConfig(void);
// function defined in antenna.cpp
#ifdef HAS_ANTENNA_SWITCH
void antenna_select(const int8_t _ant);
#endif
// help function to assign LoRa datarates to numeric spreadfactor values
void switch_lora (int sf, int tx) { void switch_lora (int sf, int tx) {
if ( tx > 20 ) return; if ( tx > 20 ) return;
cfg.txpower = tx; cfg.txpower = tx;