AVR-D4-B mods: if min+max ampl both positive, do not reset to zero

1 files changed, 8 insertions, 3 deletions

diff --git a/flash.c b/flash.c
index f71f19a..23a7823 100644
--- a/flash.c
+++ b/flash.c
@@ -948,9 +948,7 @@ void fixFlash(FlashStruct *mem)
 		gboolean uses_fixed_ampl;
 
 		uses_fixed_ampl = (number_of_fixed_ampl_points(i) > 0);
-		if (uses_fixed_ampl) {
-			safe_val = rst_fixed_ampl_point (i);
-		}
+		safe_val = rst_ampl_value (i);
 
 		for (j=0; j<max_stored_settings; j++) {
 			if (mem->rcl_burst_time[i][j] < globals.Constraints.composite_min_burst_time[i]) {
@@ -971,6 +969,13 @@ void fixFlash(FlashStruct *mem)
 			}
 
 			if (uses_fixed_ampl && !fixed_ampl_ok(i,mem->rcl_amplitude[i][j])) {
+				// AVRQ-4-B
+				mem->rcl_amplitude[i][j] = safe_val;
+				++fix_initial_constants;
+			}
+
+			if ((safe_val != 0.0) && (mem->rcl_amplitude[i][j] == 0.0)) {
+				// AVR-D4-B
 				mem->rcl_amplitude[i][j] = safe_val;
 				++fix_initial_constants;
 			}