make all aux error messages configurableINSTRUMENT_6_2_36c

3 files changed, 7 insertions, 3 deletions

diff --git a/error_utils.c b/error_utils.c
index 6055ae5..dfd6f93 100644
--- a/error_utils.c
+++ b/error_utils.c
@@ -446,11 +446,11 @@ void get_error_text(gchar **response, int error_num)
 		break;
 
 	case Overtemp_Detected:
-		format_error_text(response,-300,"Overheating or interlock problem. Output disabled.");
+		format_error_text(response,-300,globals.Flash.ot_error_message);
 		break;
 
 	case Overvolt_Detected:
-		format_error_text(response,-300,"Over-voltage or over-current. Output disabled.");
+		format_error_text(response,-300,globals.Flash.ov_error_message);
 		break;
 
 	case Soft_Limit_Exceeded:
diff --git a/flash.c b/flash.c
index bff0caa..05bd0ed 100644
--- a/flash.c
+++ b/flash.c
@@ -899,7 +899,8 @@ static void initFlashValues(FlashStruct *mem)
 	mem->extended_relay_delay_in_sec=0.5;
 
 	strcpy(mem->aux_error_message,"PRF too high! Output disabled.");
-
+	strcpy(mem->ot_error_message,"Over-heating problem. Output off.");
+	strcpy(mem->ov_error_message,"Over-voltage/over-current. Output off.");
 
 	/* default PW DACs */
 	mem->pw_dac[0]=2;		/* channel 1: ONLY used for EXTERNAL voltage-controlled PW */
diff --git a/globals.h b/globals.h
index 82fa556..947bb2b 100644
--- a/globals.h
+++ b/globals.h
@@ -772,6 +772,9 @@ typedef struct {
 
 	float os_zero_equiv[max_channels];			// addr 10684
 
+	char ot_error_message[40];                     /* addr 10692 */
+	char ov_error_message[40];                     /* addr 10732 */
+
 	char flash_end;
 
 } FlashStruct;