mirror of
https://github.com/meshcore-dev/MeshCore.git
synced 2026-03-30 17:05:52 +00:00
Merge branch 'dev' of https://github.com/cod3doomy/MeshCore_HW_Dev into dev
This commit is contained in:
@@ -67,8 +67,8 @@ build_flags =
|
||||
-D MAX_CONTACTS=100
|
||||
-D MAX_GROUP_CHANNELS=8
|
||||
-D BLE_PIN_CODE=123456
|
||||
-D BLE_DEBUG_LOGGING=1
|
||||
-D OFFLINE_QUEUE_SIZE=256
|
||||
; -D BLE_DEBUG_LOGGING=1
|
||||
; -D ENABLE_PRIVATE_KEY_IMPORT=1
|
||||
; -D ENABLE_PRIVATE_KEY_EXPORT=1
|
||||
; -D MESH_PACKET_LOGGING=8
|
||||
|
||||
@@ -392,7 +392,7 @@ void TbeamSupSensorManager::loop() {
|
||||
}
|
||||
|
||||
int TbeamSupSensorManager::getNumSettings() const {
|
||||
return sensorNum;
|
||||
return 1;
|
||||
}
|
||||
|
||||
const char* TbeamSupSensorManager::getSettingName(int i) const {
|
||||
|
||||
@@ -16,7 +16,6 @@ class TbeamSupSensorManager: public SensorManager {
|
||||
LocationProvider * _nmea;
|
||||
Adafruit_BME280 bme;
|
||||
double node_temp, node_hum, node_pres;
|
||||
int sensorNum = 1;
|
||||
|
||||
#define SEALEVELPRESSURE_HPA (1013.25)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user