Skip to content

Commit 882d968

Browse files
DeyanVNikolovCrea7orX
DeyanVNikolov
authored and
Crea7orX
committed
refactor(device): Remove unnecessary LED control calls during fingerprint enrollment and heartbeat processes
1 parent 73e2dfb commit 882d968

File tree

3 files changed

+0
-34
lines changed

3 files changed

+0
-34
lines changed

‎device/lib/device-control/SecurDoor_DeviceControl.cpp‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ void DeviceController::buzzBuzzer(int times, int delayMs) {
126126
}
127127

128128
void DeviceController::beginEnrollmentOfFingerprint(Adafruit_Fingerprint &finger, DeviceController &deviceController, RemoteConnection &remoteConnection, TimeKeeping &timeKeeping, MessagingService &messagingService) {
129-
finger.LEDcontrol(false);
130129
deviceController.deleteRemovedFingerprints(finger, deviceController, remoteConnection, timeKeeping, messagingService);
131130

132131
finger.getTemplateCount();
@@ -138,7 +137,6 @@ void DeviceController::beginEnrollmentOfFingerprint(Adafruit_Fingerprint &finger
138137
return;
139138
}
140139

141-
finger.LEDcontrol(true);
142140
deviceController.buzzBuzzer(2, 150);
143141
logger.log(LoggingConfig::MYLOG, INFO, "Enrolling finger as ID %u", id);
144142

@@ -152,7 +150,6 @@ void DeviceController::beginEnrollmentOfFingerprint(Adafruit_Fingerprint &finger
152150
unsigned long startTime = millis();
153151
while (finger.getImage() != FINGERPRINT_OK) {
154152
if (millis() - startTime > 10000) {
155-
finger.LEDcontrol(false);
156153
logger.log(LoggingConfig::MYLOG, INFO, "Timeout");
157154
lcdDisplay.clear();
158155
lcdDisplay.setCursor(0, 0);
@@ -162,7 +159,6 @@ void DeviceController::beginEnrollmentOfFingerprint(Adafruit_Fingerprint &finger
162159
deviceController.buzzBuzzer(2, 400);
163160
delay(1000);
164161
lcdDisplay.standbyDisplay();
165-
finger.LEDcontrol(true);
166162
return;
167163
}
168164
}
@@ -177,12 +173,10 @@ void DeviceController::beginEnrollmentOfFingerprint(Adafruit_Fingerprint &finger
177173
deviceController.buzzBuzzer(2, 400);
178174
delay(1000);
179175
lcdDisplay.standbyDisplay();
180-
finger.LEDcontrol(true);
181176
return;
182177
}
183178

184179
// turn off fingerprint LED
185-
finger.LEDcontrol(false);
186180
lcdDisplay.clear();
187181
lcdDisplay.setCursor(0, 0);
188182
lcdDisplay.print("| SecurDoor |");
@@ -195,7 +189,6 @@ void DeviceController::beginEnrollmentOfFingerprint(Adafruit_Fingerprint &finger
195189
unsigned long startTime = millis();
196190
while (finger.getImage() != FINGERPRINT_NOFINGER) {
197191
if (millis() - startTime > 10000) {
198-
finger.LEDcontrol(false);
199192
logger.log(LoggingConfig::MYLOG, INFO, "Timeout");
200193
lcdDisplay.clear();
201194
lcdDisplay.setCursor(0, 0);
@@ -205,13 +198,11 @@ void DeviceController::beginEnrollmentOfFingerprint(Adafruit_Fingerprint &finger
205198
deviceController.buzzBuzzer(2, 400);
206199
delay(1000);
207200
lcdDisplay.standbyDisplay();
208-
finger.LEDcontrol(true);
209201
return;
210202
}
211203
}
212204
}
213205

214-
finger.LEDcontrol(true);
215206
deviceController.buzzBuzzer(1, 300);
216207
logger.log(LoggingConfig::MYLOG, INFO, "Place same finger again");
217208
lcdDisplay.clear();
@@ -223,7 +214,6 @@ void DeviceController::beginEnrollmentOfFingerprint(Adafruit_Fingerprint &finger
223214
unsigned long startTime = millis();
224215
while (finger.getImage() != FINGERPRINT_OK) {
225216
if (millis() - startTime > 10000) {
226-
finger.LEDcontrol(false);
227217
logger.log(LoggingConfig::MYLOG, INFO, "Timeout");
228218
lcdDisplay.clear();
229219
lcdDisplay.setCursor(0, 0);
@@ -233,13 +223,11 @@ void DeviceController::beginEnrollmentOfFingerprint(Adafruit_Fingerprint &finger
233223
deviceController.buzzBuzzer(2, 400);
234224
delay(1000);
235225
lcdDisplay.standbyDisplay();
236-
finger.LEDcontrol(true);
237226
return;
238227
}
239228
}
240229
}
241230
if (finger.image2Tz(2) != FINGERPRINT_OK) {
242-
finger.LEDcontrol(false);
243231
logger.log(LoggingConfig::MYLOG, INFO, "Image fail");
244232
lcdDisplay.clear();
245233
lcdDisplay.setCursor(0, 0);
@@ -249,12 +237,10 @@ void DeviceController::beginEnrollmentOfFingerprint(Adafruit_Fingerprint &finger
249237
deviceController.buzzBuzzer(2, 400);
250238
delay(1000);
251239
lcdDisplay.standbyDisplay();
252-
finger.LEDcontrol(true);
253240
return;
254241
}
255242

256243
if (finger.createModel() != FINGERPRINT_OK) {
257-
finger.LEDcontrol(false);
258244
logger.log(LoggingConfig::MYLOG, INFO, "Create fail");
259245
lcdDisplay.clear();
260246
lcdDisplay.setCursor(0, 0);
@@ -264,11 +250,9 @@ void DeviceController::beginEnrollmentOfFingerprint(Adafruit_Fingerprint &finger
264250
deviceController.buzzBuzzer(2, 400);
265251
delay(1000);
266252
lcdDisplay.standbyDisplay();
267-
finger.LEDcontrol(true);
268253
return;
269254
}
270255
if (finger.storeModel(id) != FINGERPRINT_OK) {
271-
finger.LEDcontrol(false);
272256
logger.log(LoggingConfig::MYLOG, INFO, "Store fail");
273257
lcdDisplay.clear();
274258
lcdDisplay.setCursor(0, 0);
@@ -278,10 +262,8 @@ void DeviceController::beginEnrollmentOfFingerprint(Adafruit_Fingerprint &finger
278262
deviceController.buzzBuzzer(2, 400);
279263
delay(1000);
280264
lcdDisplay.standbyDisplay();
281-
finger.LEDcontrol(true);
282265
return;
283266
}
284-
finger.LEDcontrol(false);
285267

286268
deviceController.buzzBuzzer(2, 200);
287269
lcdDisplay.clear();
@@ -294,7 +276,6 @@ void DeviceController::beginEnrollmentOfFingerprint(Adafruit_Fingerprint &finger
294276
remoteConnection.enrollFingerprintToServer(id, deviceController, timeKeeping, messagingService);
295277

296278
delay(1000);
297-
finger.LEDcontrol(true);
298279
lcdDisplay.standbyDisplay();
299280
}
300281

‎device/lib/remote-connection/SecurDoor_RemoteConnection.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ void RemoteConnection::sendHeartbeat(TimeKeeping &timeKeepingService,
157157
if (millis() - lastHeartbeat > 5000) {
158158
// deviceController.rgbLed(50, 0, 0, true, false);
159159
deviceController.setLED(1, true);
160-
fingerprintSensor.LEDcontrol(false);
161160
lastHeartbeat = millis();
162161

163162
// Build headers
@@ -235,7 +234,6 @@ void RemoteConnection::sendHeartbeat(TimeKeeping &timeKeepingService,
235234
deviceController.setEmergency(true);
236235
deviceController.setDashboardOverride(true);
237236
}
238-
fingerprintSensor.LEDcontrol(!deviceController.isEmergency());
239237
delay(1000);
240238
return;
241239
} else {

‎device/src/main.cpp‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ void setup() {
8787
hasFingerprintSensor = true;
8888
finger.getTemplateCount();
8989
logger.log(LoggingConfig::MYLOG, INFO, String("Fingerprint sensor ready, " + String(finger.templateCount) + " templates stored.").c_str());
90-
finger.LEDcontrol(false);
9190
}
9291

9392

@@ -204,7 +203,6 @@ void setup() {
204203

205204
if (hasFingerprintSensor) {
206205
deviceController.deleteRemovedFingerprints(finger, deviceController, remoteConnection, timeKeepingService, messagingService);
207-
finger.LEDcontrol(true);
208206
}
209207

210208
logger.log(LoggingConfig::MYLOG, INFO, "===================== SECURDOOR =====================");
@@ -292,7 +290,6 @@ void loop() {
292290
if (DeviceConfig::CONTINUOUSLY_CHECK_FOR_DOOR && DeviceConfig::USE_DOOR_SWITCH) {
293291
// if door is open when it should be closed, red led, alarm
294292
if (digitalRead(DoorSwitchConfig::DOOR_SWITCH_PIN) == LOW && deviceController.isLocked()) {
295-
finger.LEDcontrol(false);
296293
logger.log(LoggingConfig::MYLOG, WARNING, "Door is open when it should be closed.");
297294
lcdDisplay.clear();
298295
lcdDisplay.setCursor(0, 0);
@@ -323,45 +320,35 @@ void loop() {
323320

324321
if (hasFingerprintSensor) {
325322
if ((!deviceController.isLocked() && !deviceController.isDoorClosed()) || deviceController.isEmergency()) {
326-
finger.LEDcontrol(false);
327323
} else {
328-
finger.LEDcontrol(true);
329324
if (finger.getImage() == FINGERPRINT_OK) {
330325
logger.log(LoggingConfig::MYLOG, INFO, "Finger detected!");
331326
lcdDisplay.readingDisplay();
332327
deviceController.setLED(1, true);
333328
if (finger.image2Tz() != FINGERPRINT_OK) {
334-
finger.LEDcontrol(false);
335329
lcdDisplay.accessDeniedDisplay();
336330
deviceController.buzzBuzzer(2, 400);
337331
delay(500);
338332
lcdDisplay.standbyDisplay();
339333
deviceController.setLED(2, true);
340-
finger.LEDcontrol(true);
341334
}
342-
finger.LEDcontrol(false);
343335
if (finger.fingerFastSearch() != FINGERPRINT_OK) {
344-
finger.LEDcontrol(false);
345336
lcdDisplay.accessDeniedDisplay();
346337
deviceController.buzzBuzzer(2, 400);
347338
delay(500);
348339
lcdDisplay.standbyDisplay();
349340
deviceController.setLED(2, true);
350-
finger.LEDcontrol(true);
351341
return;
352342
} else {
353343
logger.log(LoggingConfig::MYLOG, INFO, String("Match: ID " + String(finger.fingerID) + " confidence " + String(finger.confidence)).c_str());
354344
if (finger.confidence > FingerprintConfig::FINGERPRINT_SENSOR_MINIMUM_FINGERPRINT_SCORE) {
355-
finger.LEDcontrol(false);
356345
remoteConnection.authenticateFingerprint(finger.fingerID, deviceController, timeKeepingService, messagingService);
357346
} else {
358-
finger.LEDcontrol(false);
359347
lcdDisplay.accessDeniedDisplay();
360348
deviceController.buzzBuzzer(2, 400);
361349
delay(500);
362350
lcdDisplay.standbyDisplay();
363351
deviceController.setLED(2, true);
364-
finger.LEDcontrol(true);
365352
}
366353
}
367354
}

0 commit comments

Comments
 (0)