From a9f19d4459a70e006636f0ae661da6422d4f59a8 Mon Sep 17 00:00:00 2001 From: Chrisotph Schultz Date: Fri, 25 Sep 2020 23:41:43 +0200 Subject: [PATCH] set configs --- src/loraconf.sample.h | 89 ------------------------------------------- src/paxcounter.conf | 8 ++-- 2 files changed, 4 insertions(+), 93 deletions(-) delete mode 100644 src/loraconf.sample.h diff --git a/src/loraconf.sample.h b/src/loraconf.sample.h deleted file mode 100644 index a088cdc2..00000000 --- a/src/loraconf.sample.h +++ /dev/null @@ -1,89 +0,0 @@ -#ifndef __LORACONF_H__ -#define __LORACONF_H__ - -#if (HAS_LORA) - -/************************************************************ - * LMIC LoRaWAN configuration - * - * Read the values from TTN console (or whatever applies), insert them here, - * and rename this file to src/loraconf.h - * - * You can configure OTAA or ABP Activation. In order to use ABP, uncomment - * (enable) the following line, but you should only do so, if you have good - * reasons for not using OTAA. - * - *************************************************************/ - -//#define LORA_ABP - -#ifndef LORA_ABP -/************************************************************ - * OTAA configuration - * - * DEVEUI, APPEUI and APPKEY should all be specified in MSB format as - * displayed in TTN console, so you can cut & paste from there. This is different - * from standard LMIC-Arduino which expects DEVEUI and APPEUI in LSB format. - * For TTN, APPEUI in MSB format always starts with 0x70, 0xB3, 0xD5. - - * Set your DEVEUI here, if your device has have a fixed one. - * If you leave this untouched, then the DEVEUI will be derived from device's - * MAC adress during startup and will be displayed on device's screen as well as - * on serial console, if you set 'verbose 1' in paxcounter.conf and - * 'debug_level 3' in platformio.ini. - * If using a board with Microchip 24AA02E64 Uinique ID for deveui, the DEVEUI - * will be overwritten by the one contained in the Microchip module. - * - ************************************************************/ - -static const u1_t DEVEUI[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - -static const u1_t APPEUI[8] = {0x70, 0xB3, 0xD5, 0x00, 0x00, 0x00, 0x00, 0x00}; - -static const u1_t APPKEY[16] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - -#endif - -#ifdef LORA_ABP -/************************************************************ - * ABP configuration (for development) - * - * Get your - * - Network Session Key (NWKSKEY) - * - App Session Key and your (APPSKEY) - * - Device Address (DEVADDR) - * from e.g. TTN console and replace the example values below. - * - * NOTE: Use MSB format (as displayed in TTN console, so you can cut & paste - * from there) - * - * NOTE: You may also need to adjust lorawan_abp.cpp in order to configure - * different channels and data rate channels to match your country's regulations - * and your network's settings. - * - ************************************************************/ - -// ID of LoRaAlliance assigned Network (for a list, see e.g. here -// https://www.thethingsnetwork.org/docs/lorawan/prefix-assignments.html) -static const u1_t NETID = 0x13; // TTN - -static const u1_t NWKSKEY[16] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00}; - -static const u1_t APPSKEY[16] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00}; - -static const u4_t DEVADDR = - 0x00000000; // <-- Change this address for every node! - -// set additional ABP parameters in loraconf_abp.cpp -void setABPParameters(); - -#endif - -#endif // HAS_LORA - -#endif // __LORACONF_H__ \ No newline at end of file diff --git a/src/paxcounter.conf b/src/paxcounter.conf index 57264b72..41a61673 100644 --- a/src/paxcounter.conf +++ b/src/paxcounter.conf @@ -16,8 +16,8 @@ // Set this to include BLE counting and vendor filter functions, or to switch off WIFI counting #define VENDORFILTER 0 // set to 0 if you want to scan all devices, not filtering smartphone OUIs -#define BLECOUNTER 0 // set to 0 if you do not want to install the BLE sniffer -#define WIFICOUNTER 1 // set to 0 if you do not want to install the WIFI sniffer +#define BLECOUNTER 1 // set to 0 if you do not want to install the BLE sniffer +#define WIFICOUNTER 0 // set to 0 if you do not want to install the WIFI sniffer // BLE scan parameters #define BLESCANTIME 0 // [seconds] scan duration, 0 means infinite [default], see note below @@ -25,11 +25,11 @@ #define BLESCANINTERVAL 80 // [illiseconds] scan interval, see below, 3 .. 10240, default 80ms = 100% duty cycle // Corona Exposure Notification Service(ENS) counter -#define COUNT_ENS 0 // count found number of devices which advertise Exposure Notification Service +#define COUNT_ENS 1 // count found number of devices which advertise Exposure Notification Service // set to 0 if you do not want to enable this function // for additional sensors (added by some user) -#define HAS_SENSOR_1 0 // set to 1 if you want to transmit CWA counter +#define HAS_SENSOR_1 1 // set to 1 if you want to transmit CWA counter #define HAS_SENSOR_2 0 // not used #define HAS_SENSOR_3 0 // not used #define HAS_SENSORS (HAS_SENSOR_1 || HAS_SENSOR_2 || HAS_SENSOR_3) // to simplify things