Felícito Manzano
Proyecto ABInBev para la tarjeta Guaria 1/2.
Diff: Program/fmu130_exe.cpp
- Revision:
- 8:a174cef25049
- Parent:
- 7:01141979e5f2
- Child:
- 9:46112570c850
--- a/Program/fmu130_exe.cpp Mon Jul 04 23:23:01 2022 -0600
+++ b/Program/fmu130_exe.cpp Tue Jul 05 10:58:23 2022 -0600
@@ -513,8 +513,13 @@
myPC_debug.printf("BLE - OUT3:TRUE\r\n");
#endif
fingerprint_flag_poweroff = false;
- FP_Open();
- resultado = FP_SetTemplate(fingerprint_id, fingerprint_asc);
+ #if FP_READER_GT521 == 1
+ FP_Open();
+ resultado = FP_SetTemplate(fingerprint_id, fingerprint_asc);
+ FP_Close();
+ #else
+ #endif
+ wait_us(1000000);
if (resultado == 0) {
sprintf(fmu_buffer, "%s%d", TCA_ID_FP_SERVER_ADD, fingerprint_id);
tx_fmu130_message(fmu_buffer, &avl_uart);
@@ -529,9 +534,7 @@
myPC_debug.printf("BLE - Error al agregar huella\r\n");
myPC_debug.printf("%s\r\n", fmu_buffer);
#endif
- }
- FP_Close();
- wait_us(1000000);
+ }
fingerprint_flag_poweroff = true;
#ifdef DEBUG_FMU130_CPP
myPC_debug.printf("BLE - Pendiente apagar FP GT521Fx...\r\n");
@@ -545,11 +548,20 @@
myPC_debug.printf("BLE - OUT3:TRUE\r\n");
#endif
fingerprint_flag_poweroff = false;
- FP_Open();
+ #if FP_READER_GT521 == 1
+ FP_Open();
+ #else
+ #endif
if (fingerprint_id == 3000) {
- resultado = FP_DeleteAll();
+ #if FP_READER_GT521 == 1
+ resultado = FP_DeleteAll();
+ #else
+ #endif
} else {
- resultado = FP_DeleteID(fingerprint_id);
+ #if FP_READER_GT521 == 1
+ resultado = FP_DeleteID(fingerprint_id);
+ #else
+ #endif
}
if (resultado >= 0) {
sprintf(fmu_buffer, "%s%d", TCA_ID_FP_SERVER_DEL, fingerprint_id);
@@ -566,7 +578,10 @@
myPC_debug.printf("%s\r\n", fmu_buffer);
#endif
}
- FP_Close();
+ #if FP_READER_GT521 == 1
+ FP_Close();
+ #else
+ #endif
wait_us(1000000);
fingerprint_flag_poweroff = true;
#ifdef DEBUG_FMU130_CPP
@@ -582,7 +597,10 @@
ep.write(eprom_AddressArray[EE_Address_FINGERPRINT_RE], ((uint16_t) false));
sprintf(fmu_buffer, "%s1", TCA_ID_FP_WORKING_STATUS);
tx_fmu130_message(fmu_buffer, &avl_uart);
- FP_Flush();
+ #if FP_READER_GT521 == 1
+ FP_Flush();
+ #else
+ #endif
#ifdef DEBUG_FMU130_CPP
myPC_debug.printf("BLE - Lector Huella Habilitado\r\n");
myPC_debug.printf("%s\r\n", fmu_buffer);
@@ -624,12 +642,15 @@
myPC_debug.printf("BLE - OUT3:TRUE\r\n");
#endif
fingerprint_flag_poweroff = false;
- FP_Open();
- resultado = FP_GetEnrollCount();
+ #if FP_READER_GT521 == 1
+ FP_Open();
+ resultado = FP_GetEnrollCount();
+ FP_Close();
+ #else
+ #endif
+ wait_us(1000000);
sprintf(fmu_buffer, "%s%d", TCA_ID_FP_ENROLL_CNT, resultado);
tx_fmu130_message(fmu_buffer, &avl_uart);
- FP_Close();
- wait_us(1000000);
fingerprint_flag_poweroff = true;
#ifdef DEBUG_FMU130_CPP
myPC_debug.printf("%s\r\n", fmu_buffer);
@@ -640,22 +661,21 @@
case CMD_CHECK_ENROLLED_ID:
out3_gt521fx = out4_gt521fx = finterprint_flag_working= true;
fingerprint_flag_poweroff = false;
+ consultar_ID_FP = fingerprint_id;
wait_us(500000);
#ifdef DEBUG_FMU130_CPP
myPC_debug.printf("BLE - OUT3:TRUE\r\n");
+ myPC_debug.printf("BLE - Consulta de Posicion de Memoria - Lector de Huellas\r\n");
#endif
-
- FP_Open();
- #ifdef DEBUG_FMU130_CPP
- myPC_debug.printf("BLE - Consulta de Posicion de Memoria - Lector de Huellas\r\n");
-
+ #if FP_READER_GT521 == 1
+ FP_Open();
+ enrolado = FP_CheckEnrolled(consultar_ID_FP);
+ FP_Close();
+ #else
#endif
- consultar_ID_FP = fingerprint_id;
- enrolado = FP_CheckEnrolled(consultar_ID_FP);
+ wait_us(1000000);
sprintf(fmu_buffer, "%s%d", TCA_ID_CHECK_ENROLLED_ID, enrolado);
tx_fmu130_message(fmu_buffer, &avl_uart);
- FP_Close();
- wait_us(1000000);
fingerprint_flag_poweroff = true;
#ifdef DEBUG_FMU130_CPP
myPC_debug.printf("BLE - Posicion de huella %d: %d\r\n", consultar_ID_FP, enrolado);