changeset 468:aa1d71875e25 Improve_Logtansfer

Moved and deactivated analyse sample buffer switch: The repair function behind the maintainance button is no longer needed and meanwhile an external tool supporting better analysis is available
author ideenmodellierer
date Tue, 14 Apr 2020 19:44:19 +0200
parents 5387e684d797
children 04d94851cd1b
files Discovery/Inc/configuration.h Discovery/Src/tMenuEditSystem.c
diffstat 2 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/Discovery/Inc/configuration.h	Tue Apr 14 19:29:23 2020 +0200
+++ b/Discovery/Inc/configuration.h	Tue Apr 14 19:44:19 2020 +0200
@@ -40,10 +40,10 @@
 /* Enable this to skip coplete scan of dive log during startup */
 /* #define TRUST_LOG_CONSISTENCY */
 
-/* Enable this to reset the profile data by pressing enter within log info menu */
-/* #define ENABLE_PROFILE_RESET */
-
 /* Enable this to transfer additional data list last dive ID and last sample index during raw data requests */
 /* define SEND_DATA_DETAILS */
 
+/* Enable to activate a menu item in reset menu which provide sample ring analysis / repair functionality */
+/* #define ENABLE_ANALYSE_SAMPLES */
+
 #endif
--- a/Discovery/Src/tMenuEditSystem.c	Tue Apr 14 19:29:23 2020 +0200
+++ b/Discovery/Src/tMenuEditSystem.c	Tue Apr 14 19:44:19 2020 +0200
@@ -41,9 +41,6 @@
 #include "motion.h"
 #include "t7.h"
 
-/* Uncomment to activate a menu item in reset menu which provide sample ring analysis / repair functionality */
-#define ENABLE_ANALYSE_SAMPLES
-
 #define CV_SUBPAGE_MAX		(2u)	/* max number of customer view selection pages */
 /*#define HAVE_DEBUG_VIEW */
 static uint8_t infoPage = 0;
@@ -97,7 +94,9 @@
 uint8_t OnAction_LogbookOffset(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
 uint8_t OnAction_SetFactoryDefaults(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
 uint8_t OnAction_SetBatteryCharge(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
+#ifdef ENABLE_ANALYSE_SAMPLES
 uint8_t OnAction_RecoverSampleIdx(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
+#endif
 #ifdef SCREENTEST
 uint8_t OnAction_ScreenTest		(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
 #endif
@@ -1635,18 +1634,18 @@
     return EXIT_TO_MENU;
 }
 
-
+#ifdef ENABLE_ANALYSE_SAMPLES
 uint8_t OnAction_RecoverSampleIdx(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
 {
 	char text[32];
 	char strResult[20];
 
-
 	ext_flash_AnalyseSampleBuffer(strResult);
     snprintf(&text[0],30,"Ring: %s",strResult); //"Code: %X",settingsGetPointer()->logFlashNextSampleStartAddress); //getLicence());
     write_label_var(  30, 800, ME_Y_LINE6, &FontT42, text);
     return UNSPECIFIC_RETURN;
 }
+#endif
 
 uint8_t OnAction_SetBatteryCharge(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
 {