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

v1.6.95

Browse Source
This commit is contained in:
Klaus K Wilting 2018-11-27 10:10:20 +01:00
parent 624d647240
commit 72063b88b1
3 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platformio.ini
View File

@ -29,7 +29,7 @@ description = Paxcounter is a proof-of-concept ESP32 device for metering passeng
[common] [common]
; for release_version use max. 10 chars total, use any decimal format like "a.b.c" ; for release_version use max. 10 chars total, use any decimal format like "a.b.c"
release_version = 1.6.93 release_version = 1.6.95
; DEBUG LEVEL: For production run set to 0, otherwise device will leak RAM while running! ; DEBUG LEVEL: For production run set to 0, otherwise device will leak RAM while running!
; 0=None, 1=Error, 2=Warn, 3=Info, 4=Debug, 5=Verbose ; 0=None, 1=Error, 2=Warn, 3=Info, 4=Debug, 5=Verbose
debug_level = 0 debug_level = 0

14
src/bme680mems.cpp
View File

@ -163,14 +163,6 @@ void state_save(const uint8_t *state_buffer, uint32_t length) {
// ... // ...
} }
/*!
* @brief Load library config from non-volatile memory
*
* @param[in,out] config_buffer buffer to hold the loaded state string
* @param[in] n_buffer size of the allocated state buffer
*
* @return number of bytes copied to config_buffer
*/
uint32_t config_load(uint8_t *config_buffer, uint32_t n_buffer) { uint32_t config_load(uint8_t *config_buffer, uint32_t n_buffer) {
// Load a library config from non-volatile memory, if available. // Load a library config from non-volatile memory, if available.
@ -181,12 +173,6 @@ uint32_t config_load(uint8_t *config_buffer, uint32_t n_buffer) {
return sizeof(bsec_config_iaq); return sizeof(bsec_config_iaq);
} }
/*!
* @brief Interrupt handler for press of a ULP plus button
*
* @return none
*/
void user_delay_ms(uint32_t period) { vTaskDelay(period / portTICK_PERIOD_MS); } void user_delay_ms(uint32_t period) { vTaskDelay(period / portTICK_PERIOD_MS); }
int64_t get_timestamp_us() { return (int64_t)millis() * 1000; } int64_t get_timestamp_us() { return (int64_t)millis() * 1000; }

8
src/lorawan.cpp
View File

@ -9,18 +9,18 @@ static const char TAG[] = "lora";
osjob_t sendjob; osjob_t sendjob;
QueueHandle_t LoraSendQueue; QueueHandle_t LoraSendQueue;
class cMyHalConfig_t : public Arduino_LMIC::HalConfiguration_t { class MyHalConfig_t : public Arduino_LMIC::HalConfiguration_t {
public: public:
cMyHalConfig_t(){}; MyHalConfig_t(){};
virtual void begin(void) override { virtual void begin(void) override {
SPI.begin(LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS); SPI.begin(LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS);
} }
}; };
cMyHalConfig_t myHalConfig{}; MyHalConfig_t myHalConfig{};
// LMIC enhanced Pin mapping // LMIC pin mapping
const lmic_pinmap lmic_pins = { const lmic_pinmap lmic_pins = {
.nss = LORA_CS, .nss = LORA_CS,
.rxtx = LMIC_UNUSED_PIN, .rxtx = LMIC_UNUSED_PIN,