jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-27 05:06:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small code improvements

Browse Source
This commit is contained in:
fvanroie 2021-03-06 00:53:35 +01:00
parent 719f0c4038
commit aeb9c03bd1
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.vscode/extensions.json vendored
View File

@ -1,5 +1,8 @@
{ {
// See http://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format
"recommendations": [ "recommendations": [
"platformio.platformio-ide","ms-vscode.cpptools" "ms-vscode.cpptools",
"platformio.platformio-ide"
] ]
} }

2
src/hasp/hasp_dispatch.h
View File

@ -54,7 +54,7 @@ void dispatch_page_prev();
void dispatch_dim(const char* level); void dispatch_dim(const char* level);
void dispatch_backlight(const char* payload); void dispatch_backlight(const char* payload);
void dispatch_web_update(const char* espOtaUrl); void dispatch_web_update(const char*, const char* espOtaUrl);
void dispatch_reboot(bool saveConfig); void dispatch_reboot(bool saveConfig);
void dispatch_output_idle_state(uint8_t state); void dispatch_output_idle_state(uint8_t state);

23
src/sys/gpio/hasp_gpio.cpp
View File

@ -294,12 +294,21 @@ void gpio_set_normalized_value(hasp_gpio_config_t gpio, uint16_t state)
case HASP_GPIO_LED_R: case HASP_GPIO_LED_R:
case HASP_GPIO_LED_G: case HASP_GPIO_LED_G:
case HASP_GPIO_LED_B: case HASP_GPIO_LED_B:
#if defined(ARDUINO_ARCH_ESP32)
gpio.val = map(state, 0, 0xFFFFU, 0, 4095);
ledcWrite(gpio.group, gpio.val); // ledChannel and value
#else
gpio.val = map(state, 0, 0xFFFFU, 0, 1023);
analogWrite(gpio.pin, gpio.val);
#endif
break;
case HASP_GPIO_PWM: case HASP_GPIO_PWM:
#if defined(ARDUINO_ARCH_ESP32) #if defined(ARDUINO_ARCH_ESP32)
gpio.val = map(state, 0, 0xFFFFU, 0, 4095); gpio.val = map(state, 0, 0xFFFFU, 0, 4095);
ledcWrite(gpio.group, gpio.val); // ledChannel and value ledcWrite(gpio.group, gpio.val); // ledChannel and value
#else #else
analogWrite(gpio.pin, map(state, 0, 0xFFFFU, 0, 1023)); gpio.val = map(state, 0, 0xFFFFU, 0, 1023);
analogWrite(gpio.pin, gpio.val);
#endif #endif
break; break;
case HASP_GPIO_LED_INVERTED: case HASP_GPIO_LED_INVERTED:
@ -311,7 +320,8 @@ void gpio_set_normalized_value(hasp_gpio_config_t gpio, uint16_t state)
gpio.val = map(0xFFFFU - state, 0, 0xFFFFU, 0, 4095); gpio.val = map(0xFFFFU - state, 0, 0xFFFFU, 0, 4095);
ledcWrite(gpio.group, gpio.val); // ledChannel and value ledcWrite(gpio.group, gpio.val); // ledChannel and value
#else #else
analogWrite(gpio.pin, map(0xFFFFU - state, 0, 0xFFFFU, 0, 1023)); gpio.val = map(0xFFFFU - state, 0, 0xFFFFU, 0, 1023);
analogWrite(gpio.pin, gpio.val);
#endif #endif
break; break;
@ -342,19 +352,22 @@ void gpio_set_normalized_group_value(uint8_t groupid, uint16_t state)
void gpio_set_moodlight(uint8_t r, uint8_t g, uint8_t b) void gpio_set_moodlight(uint8_t r, uint8_t g, uint8_t b)
{ {
// uint16_t max_level = power == 0 ? 0 : map(brightness, 0, 0xFF, 0, 0xFFFFU);
uint16_t max_level = 0xFFFFU;
for(uint8_t i = 0; i < HASP_NUM_GPIO_CONFIG; i++) { for(uint8_t i = 0; i < HASP_NUM_GPIO_CONFIG; i++) {
switch(gpioConfig[i].type) { switch(gpioConfig[i].type) {
case HASP_GPIO_LED_R: case HASP_GPIO_LED_R:
case HASP_GPIO_LED_R_INVERTED: case HASP_GPIO_LED_R_INVERTED:
gpio_set_normalized_value(gpioConfig[i], map(r, 0, 0xFF, 0, 0xFFFFU)); gpio_set_normalized_value(gpioConfig[i], map(r, 0, 0xFF, 0, max_level));
break; break;
case HASP_GPIO_LED_G: case HASP_GPIO_LED_G:
case HASP_GPIO_LED_G_INVERTED: case HASP_GPIO_LED_G_INVERTED:
gpio_set_normalized_value(gpioConfig[i], map(g, 0, 0xFF, 0, 0xFFFFU)); gpio_set_normalized_value(gpioConfig[i], map(g, 0, 0xFF, 0, max_level));
break; break;
case HASP_GPIO_LED_B: case HASP_GPIO_LED_B:
case HASP_GPIO_LED_B_INVERTED: case HASP_GPIO_LED_B_INVERTED:
gpio_set_normalized_value(gpioConfig[i], map(b, 0, 0xFF, 0, 0xFFFFU)); gpio_set_normalized_value(gpioConfig[i], map(b, 0, 0xFF, 0, max_level));
break; break;
} }
} }