Skip to content

Commit

Permalink
Merge pull request #41 from mathieucarbou/espdash-v5
Browse files Browse the repository at this point in the history 
ESP-DASH v5
  • Loading branch information
@mathieucarbou
mathieucarbou authored Nov 29, 2024
2 parents ce3a1c2 + a078122 commit 0975df3
Show file tree
Hide file tree
Showing 5 changed files with 948 additions and 904 deletions.
178 changes: 160 additions & 18 deletions include/YaSolRWebsite.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

#include <YaSolR.h>

#include <string>
#include <unordered_map>

namespace YaSolR {
Expand All @@ -19,23 +20,164 @@ namespace YaSolR {
void resetPID();

private:
void _boolConfig(Card& card, const char* key);
void _daysConfig(Card& card, const char* key);
void _floatConfig(Card& card, const char* key);
void _numConfig(Card& card, const char* key);
void _pinConfig(Card& card, const char* key);
void _passwordConfig(Card& card, const char* key);
void _sliderConfig(Card& card, const char* key);
void _percentageSlider(Card& card, const char* key);
void _textConfig(Card& card, const char* key);

void _outputDimmerSlider(Card& card, Mycila::RouterOutput& output);
void _outputBypassSwitch(Card& card, Mycila::RouterOutput& output);
void _relaySwitch(Card& card, Mycila::RouterRelay& relay);

void _pinout(Card& card, int32_t pin, std::unordered_map<int32_t, Card*>& pinout);
void _status(Card& card, const char* key, bool enabled, bool state = true, const char* err = "");
void _temperature(Card& card, Mycila::DS18& sensor);
void _temperature(Card& card, Mycila::RouterOutput& output);
void _boolConfig(dash::SwitchCard& card, const char* key) {
card.onChange([key, &card, this](bool value) {
config.setBool(key, value);
card.setValue(config.getBool(key) ? 1 : 0);
dashboard.refresh(card);
dashboardInitTask.resume();
});
}

template <typename T, std::enable_if_t<std::is_integral_v<T>, bool> = true>
void _sliderConfig(dash::SliderCard<T>& card, const char* key) {
card.onChange([key, &card](const T& value) {
config.set(key, std::to_string(value));
card.setValue(static_cast<T>(config.getInt(key)));
dashboard.refresh(card);
});
}

void _outputDimmerSlider(dash::SliderCard<float, 2>& card, Mycila::RouterOutput& output) {
card.onChange([&card, &output, this](float value) {
if (output.isDimmerEnabled()) {
output.setDimmerDutyCycle(value / 100);
}
card.setValue(output.getDimmerDutyCycle() * 100);
dashboard.refresh(card);
dashboardUpdateTask.requestEarlyRun();
});
}

void _outputBypassSwitch(dash::SwitchCard& card, Mycila::RouterOutput& output) {
card.onChange([&card, &output, this](bool value) {
if (output.isBypassEnabled()) {
output.setBypass(value);
}
card.setValue(output.isBypassOn());
dashboard.refresh(card);
dashboardUpdateTask.requestEarlyRun();
});
}

void _relaySwitch(dash::SwitchCard& card, Mycila::RouterRelay& relay) {
card.onChange([&card, &relay, this](bool value) {
relay.tryRelayState(value);
card.setValue(relay.isOn());
dashboard.refresh(card);
});
}

#ifdef APP_MODEL_PRO
void _daysConfig(dash::WeekCard<const char*>& card, const char* key) {
card.onChange([key, &card, this](const char* value) {
config.set(key, value[0] ? value : YASOLR_WEEK_DAYS_EMPTY);
card.setValue(value);
dashboard.refresh(card);
});
}

template <typename T, std::enable_if_t<std::is_integral_v<T>, bool> = true>
void _numConfig(dash::TextInputCard<T>& card, const char* key) {
card.onChange([key, &card](const std::optional<T>& value) {
if (value.has_value()) {
config.set(key, std::to_string(value.value()));
} else {
config.unset(key);
}
card.setValue(static_cast<T>(config.getInt(key)));
dashboard.refresh(card);
});
}

template <typename T, std::enable_if_t<std::is_integral_v<T>, bool> = true>
void _numConfig(dash::DropdownCard<T>& card, const char* key) {
card.onChange([key, &card](const T& value) {
config.set(key, std::to_string(value));
card.setValue(config.getInt(key));
dashboard.refresh(card);
});
}

void _pinConfig(dash::FeedbackTextInputCard<int32_t>& card, const char* key) {
card.onChange([key, &card, this](const std::optional<int32_t> value) {
if (value.has_value()) {
config.set(key, std::to_string(value.value()));
} else {
config.unset(key);
}
card.setValue(config.getInt(key));
initCards();
dashboard.refresh(card);
});
}

void _passwordConfig(dash::PasswordCard& card, const char* key) {
card.onChange([key, &card, this](const std::optional<const char*>& value) {
if (value.has_value()) {
config.set(key, value.value());
card.setValue(value.value()); // will be replaced by stars
} else {
config.unset(key);
card.removeValue();
}
dashboard.refresh(card);
});
}

void _textConfig(dash::DropdownCard<const char*>& card, const char* key) {
card.onChange([key, &card](const char* value) {
config.set(key, value);
card.setValue(config.get(key));
dashboard.refresh(card);
});
}

void _textConfig(dash::TextInputCard<const char*>& card, const char* key) {
card.onChange([key, &card](const std::optional<std::string>& value) {
if (value.has_value()) {
config.set(key, value.value());
card.setValue(config.get(key));
} else {
config.unset(key);
card.removeValue();
}
dashboard.refresh(card);
});
}

void _pinout(dash::FeedbackTextInputCard<int32_t>& card, const char* key, std::unordered_map<int32_t, dash::FeedbackTextInputCard<int32_t>*>& pinout) {
int32_t pin = config.getInt(key);
card.setValue(pin);
if (pin == GPIO_NUM_NC) {
card.setFeedback("(" YASOLR_LBL_115 ")", dash::Status::IDLE);
} else if (pinout.find(pin) != pinout.end()) {
pinout[pin]->setFeedback("(" YASOLR_LBL_153 ")", dash::Status::DANGER);
card.setFeedback("(" YASOLR_LBL_153 ")", dash::Status::DANGER);
} else if (!GPIO_IS_VALID_GPIO(pin)) {
pinout[pin] = &card;
card.setFeedback("(" YASOLR_LBL_154 ")", dash::Status::DANGER);
} else if (!GPIO_IS_VALID_OUTPUT_GPIO(pin)) {
pinout[pin] = &card;
card.setFeedback("(" YASOLR_LBL_155 ")", dash::Status::WARNING);
} else {
pinout[pin] = &card;
card.setFeedback("(" YASOLR_LBL_156 ")", dash::Status::SUCCESS);
}
}

void _status(dash::FeedbackSwitchCard& card, const char* key, bool enabled, bool active = true, const char* err = "") {
const bool configEnabled = config.getBool(key);
card.setValue(configEnabled);
if (!configEnabled)
card.setFeedback(YASOLR_LBL_115, dash::Status::IDLE);
else if (!enabled)
card.setFeedback(YASOLR_LBL_124, dash::Status::DANGER);
else if (!active)
card.setFeedback(err, dash::Status::WARNING);
else
card.setFeedback(YASOLR_LBL_130, dash::Status::SUCCESS);
}
#endif
};
} // namespace YaSolR
2 changes: 1 addition & 1 deletion lib/ESPDASHPro
Submodule ESPDASHPro updated from 72144f to 335d17
2 changes: 1 addition & 1 deletion platformio.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ build_flags = -D APP_MODEL_OSS
lib_deps =
mathieucarbou/MycilaWebSerial @ 7.0.1
; ayushsharma82/ESP-DASH @ 4.0.8
https://github.com/mathieucarbou/ayushsharma82-ESP-DASH#dev
https://github.com/mathieucarbou/ayushsharma82-ESP-DASH#dev-v5
lib_ignore =
ESPDASHPro
WebSerialPro
Expand Down
Loading

0 comments on commit 0975df3

Please sign in to comment.