NR strength limits df8oe#2

DD4WH · Feb 4, 2018 · 9cd3a58 · 9cd3a58
1 parent c1cdee6
commit 9cd3a58
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/mchf-eclipse/drivers/audio/audio_driver.h b/mchf-eclipse/drivers/audio/audio_driver.h
@@ -467,7 +467,9 @@ enum	{
 #define	RX_DECIMATION_RATE_24KHZ		2		// Decimation/Interpolation rate in receive function for 24 kHz sample rate
 #define RX_DECIMATION_RATE_48KHZ		1		// Deimcation/Interpolation rate in receive function for 48 kHz sample rate (e.g. no decimation!)
 
+#define DSP_NR_STRENGTH_MIN		5
 #define	DSP_NR_STRENGTH_MAX		100	// Maximum menu setting for DSP "Strength"
+#define DSP_NR_STRENGTH_STEP	5
 #define	DSP_NR_STRENGTH_DEFAULT	60	// Default setting
 #ifdef OBSOLETE_NR
 //

diff --git a/mchf-eclipse/drivers/ui/menu/ui_menu.c b/mchf-eclipse/drivers/ui/menu/ui_menu.c
@@ -784,10 +784,10 @@ void UiMenu_UpdateItem(uint16_t select, uint16_t mode, int pos, int var, char* o
     case MENU_DSP_NR_STRENGTH:  // DSP Noise reduction strength
 
         var_change = UiDriverMenuItemChangeUInt8(var, mode, &ts.dsp_nr_strength,
-                                              1,
+                                              DSP_NR_STRENGTH_MIN,
                                               DSP_NR_STRENGTH_MAX,
                                               DSP_NR_STRENGTH_DEFAULT,
-											  2
+											  DSP_NR_STRENGTH_STEP
                                              );
         if(var_change)
         {

diff --git a/mchf-eclipse/drivers/ui/ui_driver.c b/mchf-eclipse/drivers/ui/ui_driver.c
@@ -3437,8 +3437,8 @@ static void UiDriver_CheckEncoderTwo()
 					break;
 				case ENC_TWO_MODE_NR:
 					if (is_dsp_nr())        // only allow adjustment if DSP NR is active
-					{
-						ts.dsp_nr_strength = change_and_limit_uint(ts.dsp_nr_strength,pot_diff_step * 2,1,DSP_NR_STRENGTH_MAX);
+					{	//
+						ts.dsp_nr_strength = change_and_limit_uint(ts.dsp_nr_strength,pot_diff_step * DSP_NR_STRENGTH_STEP,DSP_NR_STRENGTH_MIN,DSP_NR_STRENGTH_MAX);
 
 						// this causes considerable noise
 						//AudioDriver_SetRxAudioProcessing(ts.dmod_mode, false);