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

Don't allow fingerprint_grow enroll cancellation when no enrollment started (#4745)

Browse source
This commit is contained in:
itpeters 2023-04-26 22:34:20 -06:00 committed by Jesse Hills
parent ba4ef72d56
commit 4e21cf0bdd
No known key found for this signature in database
GPG key ID: BEAAE804EFD8E83A
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
esphome/components/fingerprint_grow/fingerprint_grow.cpp
View file

@ -77,10 +77,12 @@ void FingerprintGrowComponent::finish_enrollment(uint8_t result) {
this->enrollment_done_callback_.call(this->enrollment_slot_); this->enrollment_done_callback_.call(this->enrollment_slot_);
this->get_fingerprint_count_(); this->get_fingerprint_count_();
} else { } else {
this->enrollment_failed_callback_.call(this->enrollment_slot_); if (this->enrollment_slot_ != ENROLLMENT_SLOT_UNUSED) {
this->enrollment_failed_callback_.call(this->enrollment_slot_);
}
} }
this->enrollment_image_ = 0; this->enrollment_image_ = 0;
this->enrollment_slot_ = 0; this->enrollment_slot_ = ENROLLMENT_SLOT_UNUSED;
if (this->enrolling_binary_sensor_ != nullptr) { if (this->enrolling_binary_sensor_ != nullptr) {
this->enrolling_binary_sensor_->publish_state(false); this->enrolling_binary_sensor_->publish_state(false);
} }

4
esphome/components/fingerprint_grow/fingerprint_grow.h
View file

@ -13,6 +13,8 @@ namespace fingerprint_grow {
static const uint16_t START_CODE = 0xEF01; static const uint16_t START_CODE = 0xEF01;
static const uint16_t ENROLLMENT_SLOT_UNUSED = 0xFFFF;
enum GrowPacketType { enum GrowPacketType {
COMMAND = 0x01, COMMAND = 0x01,
DATA = 0x02, DATA = 0x02,
@ -158,7 +160,7 @@ class FingerprintGrowComponent : public PollingComponent, public uart::UARTDevic
uint32_t new_password_ = -1; uint32_t new_password_ = -1;
GPIOPin *sensing_pin_{nullptr}; GPIOPin *sensing_pin_{nullptr};
uint8_t enrollment_image_ = 0; uint8_t enrollment_image_ = 0;
uint16_t enrollment_slot_ = 0; uint16_t enrollment_slot_ = ENROLLMENT_SLOT_UNUSED;
uint8_t enrollment_buffers_ = 5; uint8_t enrollment_buffers_ = 5;
bool waiting_removal_ = false; bool waiting_removal_ = false;
uint32_t last_aura_led_control_ = 0; uint32_t last_aura_led_control_ = 0;