Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-10 01:07:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

VEML7700 Fix GCC build warnings (#6881)

Browse source
This commit is contained in:
Anton Viktorov 2024-06-16 09:50:00 +02:00 committed by GitHub
parent 2fc43fa9c7
commit 290816be11
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
esphome/components/veml7700/veml7700.cpp
View file

@ -243,7 +243,7 @@ ErrorCode VEML7700Component::configure_() {
} }
PSMRegister psm{0}; PSMRegister psm{0};
psm.PSM = PSM::PSM_MODE_1; psm.PSM = PSMMode::PSM_MODE_1;
psm.PSM_EN = false; psm.PSM_EN = false;
ESP_LOGV(TAG, "Setting PSM to 0x%04X", psm.raw); ESP_LOGV(TAG, "Setting PSM to 0x%04X", psm.raw);
err = this->write_register((uint8_t) CommandRegisters::PWR_SAVING, psm.raw_bytes, VEML_REG_SIZE); err = this->write_register((uint8_t) CommandRegisters::PWR_SAVING, psm.raw_bytes, VEML_REG_SIZE);

10
esphome/components/veml7700/veml7700.h
View file

@ -24,7 +24,7 @@ enum class CommandRegisters : uint8_t {
ALS_INT = 0x06 // R: ALS INT trigger event ALS_INT = 0x06 // R: ALS INT trigger event
}; };
enum Gain : uint8_t { enum Gain : uint16_t {
X_1 = 0, X_1 = 0,
X_2 = 1, X_2 = 1,
X_1_8 = 2, X_1_8 = 2,
@ -32,7 +32,7 @@ enum Gain : uint8_t {
}; };
const uint8_t GAINS_COUNT = 4; const uint8_t GAINS_COUNT = 4;
enum IntegrationTime : uint8_t { enum IntegrationTime : uint16_t {
INTEGRATION_TIME_25MS = 0b1100, INTEGRATION_TIME_25MS = 0b1100,
INTEGRATION_TIME_50MS = 0b1000, INTEGRATION_TIME_50MS = 0b1000,
INTEGRATION_TIME_100MS = 0b0000, INTEGRATION_TIME_100MS = 0b0000,
@ -42,14 +42,14 @@ enum IntegrationTime : uint8_t {
}; };
const uint8_t INTEGRATION_TIMES_COUNT = 6; const uint8_t INTEGRATION_TIMES_COUNT = 6;
enum Persistence : uint8_t { enum Persistence : uint16_t {
PERSISTENCE_1 = 0, PERSISTENCE_1 = 0,
PERSISTENCE_2 = 1, PERSISTENCE_2 = 1,
PERSISTENCE_4 = 2, PERSISTENCE_4 = 2,
PERSISTENCE_8 = 3, PERSISTENCE_8 = 3,
}; };
enum PSM : uint8_t { enum PSMMode : uint16_t {
PSM_MODE_1 = 0, PSM_MODE_1 = 0,
PSM_MODE_2 = 1, PSM_MODE_2 = 1,
PSM_MODE_3 = 2, PSM_MODE_3 = 2,
@ -92,7 +92,7 @@ union PSMRegister {
uint8_t raw_bytes[2]; uint8_t raw_bytes[2];
struct { struct {
bool PSM_EN : 1; bool PSM_EN : 1;
uint8_t PSM : 2; PSMMode PSM : 2;
uint16_t reserved : 13; uint16_t reserved : 13;
} __attribute__((packed)); } __attribute__((packed));
}; };