Merge pull request #546 from PhracturedBlue/trimfix

Fix trim calculation

Author: PhracturedBlue

src/mixer.c

@@ -448,6 +448,7 @@ s32 MIXER_ApplyLimits(unsigned channel, struct Limit *limit, volatile s32 *_raw,
     return value;
 }
 
+//Returns the raw trim value (between -100 and 100)
 s8 *MIXER_GetTrim(unsigned i)
 {
     if (Model.trims[i].sw) {
@@ -465,10 +466,12 @@ s32 MIXER_GetTrimValue(int i)
 {
     s32 value = *(MIXER_GetTrim(i));
     //0 to 100 step is 0.1
-    if (Model.trims[i].step < 10)
+    if (Model.trims[i].step < 100) //Trims are in tenths of a percent from 0 - 100
         return PCT_TO_RANGE(value * Model.trims[i].step) / 10;
-    else
-        return PCT_TO_RANGE(value);
+    else if (Model.trims[i].step <= TRIM_MAX_VALUE) //Trims are in 1% increments from 100-190
+        value = value * (Model.trims[i].step - 90);
+    return PCT_TO_RANGE(value);
+        
 }
 
 s32 get_trim(unsigned src)
@@ -772,35 +775,22 @@ unsigned MIXER_UpdateTrim(u32 buttons, unsigned flags, void *data)
 #define START_TONE 1000
     (void)data;
     int i;
-    int orig_step_size = 1;
     int tmp;
     unsigned reach_end = 0; // reach either 100 , 0, or -100
-    if (flags & BUTTON_LONGPRESS) {
-        if (orig_step_size == 1)
-            orig_step_size = 9;
-        else if (orig_step_size == 9)
-            orig_step_size = 10;
-    }
-    if (! orig_step_size)
-        return 1;
+    int orig_step_size = (flags & BUTTON_LONGPRESS)  ? 9 : 1;
     unsigned volume = 10 * Transmitter.volume;
     for (i = 0; i < NUM_TRIMS; i++) {
         int step_size = orig_step_size;
         reach_end = 0;
         int neg_button = CHAN_ButtonIsPressed(buttons, Model.trims[i].neg);
         if (neg_button || CHAN_ButtonIsPressed(buttons, Model.trims[i].pos)) {
-            if (Model.trims[i].step > 190) {
+            if (Model.trims[i].step > TRIM_MAX_VALUE) {
                 _trim_as_switch(flags, i, neg_button);
                 continue;
             }
             if (flags & BUTTON_RELEASE)
                 continue;
             int max = 100;
-            if (Model.trims[i].step >= 100) {
-                step_size = Model.trims[i].step - 90;
-            } else if (Model.trims[i].step > 10) {
-                step_size = step_size * Model.trims[i].step / 10;
-            }
             if (neg_button)
                 step_size = -step_size;
             s8 *value = MIXER_GetTrim(i);

src/mixer.h

@@ -34,6 +34,7 @@
 
 
 enum {
+    TRIM_MAX_VALUE = 190,
     TRIM_ONOFF     = 191,
     TRIM_TOGGLE    = 192,
     TRIM_MOMENTARY = 193,

src/pages/common/_trim_page.c

@@ -89,9 +89,9 @@ static const char *set_trimstep_cb(guiObject_t *obj, int dir, void *data)
     int i = ((long)data)& 0xff;
     u8 *value = ((long)data >> 8) ? &tp->trim.step : &Model.trims[i].step;
     //place switches before 0.1 on the spinbox
-    u8 v = ((int)*value + TRIM_SWITCH_TYPES - 1) % (190 + TRIM_SWITCH_TYPES);
-    v = GUI_TextSelectHelper(v, 0, 190 + TRIM_SWITCH_TYPES - 1, dir, 1, 5, NULL);
-    *value = ((int)v + 190) % (190 + TRIM_SWITCH_TYPES) + 1;
+    u8 v = ((int)*value + TRIM_SWITCH_TYPES - 1) % (TRIM_MAX_VALUE + TRIM_SWITCH_TYPES);
+    v = GUI_TextSelectHelper(v, 0, TRIM_MAX_VALUE + TRIM_SWITCH_TYPES - 1, dir, 1, 5, NULL);
+    *value = ((int)v + TRIM_MAX_VALUE) % (TRIM_MAX_VALUE + TRIM_SWITCH_TYPES) + 1;
 
     guiObject_t *negtrimObj = _get_obj(i, TRIM_MINUS);
     guiObject_t *switchObj  = _get_obj(i, TRIM_SWITCH);