pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-25 17:42:48 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Thomas Göttgens 2024-06-17 22:33:54 +02:00 committed by GitHub
commit 275e393115
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/input/InputBroker.cpp
View File

@ -1,7 +1,7 @@
#include "InputBroker.h" #include "InputBroker.h"
#include "PowerFSM.h" // needed for event trigger #include "PowerFSM.h" // needed for event trigger
InputBroker *inputBroker; InputBroker *inputBroker = nullptr;
InputBroker::InputBroker(){}; InputBroker::InputBroker(){};

2
src/input/cardKbI2cImpl.cpp
View File

@ -1,6 +1,6 @@
#include "cardKbI2cImpl.h" #include "cardKbI2cImpl.h"
#include "InputBroker.h" #include "InputBroker.h"
#include "detect/ScanI2C.h" #include "main.h"
#include "detect/ScanI2CTwoWire.h" #include "detect/ScanI2CTwoWire.h"
CardKbI2cImpl *cardKbI2cImpl; CardKbI2cImpl *cardKbI2cImpl;

1
src/input/cardKbI2cImpl.h
View File

@ -1,6 +1,5 @@
#pragma once #pragma once
#include "kbI2cBase.h" #include "kbI2cBase.h"
#include "main.h"
/** /**
* @brief The idea behind this class to have static methods for the event handlers. * @brief The idea behind this class to have static methods for the event handlers.

13
src/main.cpp
View File

@ -41,13 +41,14 @@
#endif #endif
#if !MESHTASTIC_EXCLUDE_BLUETOOTH #if !MESHTASTIC_EXCLUDE_BLUETOOTH
#include "nimble/NimbleBluetooth.h" #include "nimble/NimbleBluetooth.h"
NimbleBluetooth *nimbleBluetooth; NimbleBluetooth *nimbleBluetooth = nullptr;
#endif #endif
#endif #endif
#ifdef ARCH_NRF52 #ifdef ARCH_NRF52
#include "NRF52Bluetooth.h" #include "NRF52Bluetooth.h"
NRF52Bluetooth *nrf52Bluetooth; NRF52Bluetooth *nrf52Bluetooth = nullptr;
;
#endif #endif
#if HAS_WIFI #if HAS_WIFI
@ -94,23 +95,23 @@ NRF52Bluetooth *nrf52Bluetooth;
#include "ButtonThread.h" #include "ButtonThread.h"
#endif #endif
#include "AmbientLightingThread.h"
#include "PowerFSMThread.h" #include "PowerFSMThread.h"
#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR #if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
#include "AccelerometerThread.h" #include "AccelerometerThread.h"
#include "AmbientLightingThread.h" AccelerometerThread *accelerometerThread = nullptr;
AccelerometerThread *accelerometerThread;
#endif #endif
#ifdef HAS_I2S #ifdef HAS_I2S
#include "AudioThread.h" #include "AudioThread.h"
AudioThread *audioThread; AudioThread *audioThread = nullptr;
#endif #endif
using namespace concurrency; using namespace concurrency;
// We always create a screen object, but we only init it if we find the hardware // We always create a screen object, but we only init it if we find the hardware
graphics::Screen *screen; graphics::Screen *screen = nullptr;
// Global power status // Global power status
meshtastic::PowerStatus *powerStatus = new meshtastic::PowerStatus(); meshtastic::PowerStatus *powerStatus = new meshtastic::PowerStatus();

1
src/modules/Modules.cpp
View File

@ -42,6 +42,7 @@
#include "modules/Telemetry/DeviceTelemetry.h" #include "modules/Telemetry/DeviceTelemetry.h"
#endif #endif
#if HAS_SENSOR && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR #if HAS_SENSOR && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
#include "main.h"
#include "modules/Telemetry/AirQualityTelemetry.h" #include "modules/Telemetry/AirQualityTelemetry.h"
#include "modules/Telemetry/EnvironmentTelemetry.h" #include "modules/Telemetry/EnvironmentTelemetry.h"
#endif #endif

13
src/modules/Telemetry/Sensor/OPT3001Sensor.cpp
View File

@ -1,7 +1,10 @@
#include "OPT3001Sensor.h"
#include "../mesh/generated/meshtastic/telemetry.pb.h"
#include "TelemetrySensor.h"
#include "configuration.h" #include "configuration.h"
#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
#include "../mesh/generated/meshtastic/telemetry.pb.h"
#include "OPT3001Sensor.h"
#include "TelemetrySensor.h"
#include <ClosedCube_OPT3001.h> #include <ClosedCube_OPT3001.h>
OPT3001Sensor::OPT3001Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_OPT3001, "OPT3001") {} OPT3001Sensor::OPT3001Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_OPT3001, "OPT3001") {}
@ -41,4 +44,6 @@ bool OPT3001Sensor::getMetrics(meshtastic_Telemetry *measurement)
LOG_INFO("Lux: %f\n", measurement->variant.environment_metrics.lux); LOG_INFO("Lux: %f\n", measurement->variant.environment_metrics.lux);
return true; return true;
} }
#endif

9
src/modules/Telemetry/Sensor/OPT3001Sensor.h
View File

@ -1,3 +1,8 @@
#pragma once
#include "configuration.h"
#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
#include "../mesh/generated/meshtastic/telemetry.pb.h" #include "../mesh/generated/meshtastic/telemetry.pb.h"
#include "TelemetrySensor.h" #include "TelemetrySensor.h"
#include <ClosedCube_OPT3001.h> #include <ClosedCube_OPT3001.h>
@ -14,4 +19,6 @@ class OPT3001Sensor : public TelemetrySensor
OPT3001Sensor(); OPT3001Sensor();
virtual int32_t runOnce() override; virtual int32_t runOnce() override;
virtual bool getMetrics(meshtastic_Telemetry *measurement) override; virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
}; };
#endif