Skip to content

Commit

Permalink
v1.2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Klaus K Wilting authored and Klaus K Wilting committed Mar 27, 2018
1 parent 156aba2 commit 92cbaee
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 13 deletions.
4 changes: 2 additions & 2 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@

; ---> SELECT TARGET PLATFORM HERE! <---
[platformio]
env_default = heltec_wifi_lora_32
;env_default = heltec_wifi_lora_32
;env_default = ttgov1
;env_default = ttgov2
;env_default = lopy
;env_default = lopy4
;env_default = lolin32_lora
env_default = lolin32_lora

[env:heltec_wifi_lora_32]
platform = espressif32
Expand Down
2 changes: 1 addition & 1 deletion src/blecount.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class MyAdvertisedDeviceCallbacks: public BLEAdvertisedDeviceCallbacks {
void BLECount() {
u8x8.clearLine(3);
u8x8.drawString(0,3,"BLE Scan...");
BLEDevice::init("PaxCnt");
BLEDevice::init(PROGNAME);
BLEScan* pBLEScan = BLEDevice::getScan(); //create new scan
pBLEScan->setAdvertisedDeviceCallbacks(new MyAdvertisedDeviceCallbacks());
pBLEScan->setActiveScan(true); //active scan uses more power, but get results faster
Expand Down
4 changes: 4 additions & 0 deletions src/hal/ttgov2.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
#define CFG_sx1276_radio 1 // HPD13A LoRa SoC

#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
#define PIN_SPI_SS 18 // ESP32 GPIO18 (Pin18) -- HPD13A NSS/SEL (Pin4) SPI Chip Select Input
Expand Down
2 changes: 1 addition & 1 deletion src/main.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// 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"

// Verbose enables serial output
Expand Down
18 changes: 9 additions & 9 deletions src/rcommand.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@
// Local logging tag
static const char *TAG = "rcommand";

// table of remote commands and assigned functions
typedef struct {
const int nam;
void (*func)(int);
const bool store;
} cmd_t;

// functions defined in configmanager.cpp
void eraseConfig(void);
void saveConfig(void);

// defined in antenna.cpp
// function defined in antenna.cpp
#ifdef HAS_ANTENNA_SWITCH
void antenna_select(const int8_t _ant);
#endif

// table of remote commands and assigned functions
typedef struct {
const int nam;
void (*func)(int);
const bool store;
} cmd_t;

// help function to assign LoRa datarates to spreadfactor values
// help function to assign LoRa datarates to numeric spreadfactor values
void switch_lora (int sf, int tx) {
if ( tx > 20 ) return;
cfg.txpower = tx;
Expand Down

0 comments on commit 92cbaee

Please sign in to comment.