From 2007b88ae128a65d24bc5cc9d1a4bf57cfabfd52 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Wed, 28 Mar 2012 18:51:03 +0000
Subject: [PATCH] Function rename

---
 src/eeprom_arm.cpp  |  2 +-
 src/gtests.cpp      | 18 +++++++++---------
 src/model_menus.cpp |  2 +-
 src/open9x.cpp      |  8 ++++----
 src/open9x.h        |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/eeprom_arm.cpp b/src/eeprom_arm.cpp
index f47bb4fe0..fe8fb8ea9 100644
--- a/src/eeprom_arm.cpp
+++ b/src/eeprom_arm.cpp
@@ -192,7 +192,7 @@ void eeSwapModels(uint8_t id1, uint8_t id2)
     memset(ModelNames[id2], 0, sizeof(g_model.name));
 
   Eeprom32_source_address = (uint8_t *)&Eeprom_buffer.data.model_data;    // Get data from here
-  Eeprom32_data_size = sizeof(g_model) ;                                  // This much
+  Eeprom32_data_size = id1_size ;                                         // This much
   Eeprom32_file_index = id2 + 1 ;                                         // This file system entry
   Eeprom32_process_state = E32_BLANKCHECK ;
   eeWaitFinished();
diff --git a/src/gtests.cpp b/src/gtests.cpp
index ed23e4f5b..34e0cf52a 100644
--- a/src/gtests.cpp
+++ b/src/gtests.cpp
@@ -42,27 +42,27 @@ uint16_t anaIn(uint8_t chan)
 TEST(trims, greaterTrimLink)
 {
  memset(&g_model, 0, sizeof(g_model));
- setRawTrimValue(1, 0, TRIM_EXTENDED_MAX+3); // link to FP3 trim
- setRawTrimValue(3, 0, 32);
+ setTrimValue(1, 0, TRIM_EXTENDED_MAX+3); // link to FP3 trim
+ setTrimValue(3, 0, 32);
  EXPECT_EQ(getRawTrimValue(getTrimFlightPhase(0, 1), 0), 32);
 }
 
 TEST(trims, chainedTrims)
 {
  memset(&g_model, 0, sizeof(g_model));
- setRawTrimValue(0, 0, 32);
- setRawTrimValue(1, 0, TRIM_EXTENDED_MAX+1); // link to FP0 trim
- setRawTrimValue(2, 0, TRIM_EXTENDED_MAX+2); // link to FP1 trim
+ setTrimValue(0, 0, 32);
+ setTrimValue(1, 0, TRIM_EXTENDED_MAX+1); // link to FP0 trim
+ setTrimValue(2, 0, TRIM_EXTENDED_MAX+2); // link to FP1 trim
  EXPECT_EQ(getRawTrimValue(getTrimFlightPhase(0, 2), 0), 32);
 }
 
 TEST(trims, infiniteChainedTrims)
 {
  memset(&g_model, 0, sizeof(g_model));
- setRawTrimValue(0, 0, 32);
- setRawTrimValue(1, 0, TRIM_EXTENDED_MAX+3); // link to FP3 trim
- setRawTrimValue(2, 0, TRIM_EXTENDED_MAX+2); // link to FP1 trim
- setRawTrimValue(3, 0, TRIM_EXTENDED_MAX+3); // link to FP2 trim
+ setTrimValue(0, 0, 32);
+ setTrimValue(1, 0, TRIM_EXTENDED_MAX+3); // link to FP3 trim
+ setTrimValue(2, 0, TRIM_EXTENDED_MAX+2); // link to FP1 trim
+ setTrimValue(3, 0, TRIM_EXTENDED_MAX+3); // link to FP2 trim
  EXPECT_EQ(getRawTrimValue(getTrimFlightPhase(0, 2), 0), 32);
 }
 
diff --git a/src/model_menus.cpp b/src/model_menus.cpp
index b5f4baf26..99142c88b 100644
--- a/src/model_menus.cpp
+++ b/src/model_menus.cpp
@@ -668,7 +668,7 @@ void menuProcPhaseOne(uint8_t event)
             v = checkIncDec(event, v, TRIM_EXTENDED_MAX, TRIM_EXTENDED_MAX+MAX_PHASES-1, EE_MODEL);
             if (checkIncDec_Ret) {
               if (v == TRIM_EXTENDED_MAX) v = 0;
-              setRawTrimValue(s_currIdx, t, v);
+              setTrimValue(s_currIdx, t, v);
             }
           }
         }
diff --git a/src/open9x.cpp b/src/open9x.cpp
index be9ed8744..4fd2c202f 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -589,7 +589,7 @@ int16_t getTrimValue(uint8_t phase, uint8_t idx)
   return getRawTrimValue(getTrimFlightPhase(phase, idx), idx);
 }
 
-void setRawTrimValue(uint8_t phase, uint8_t idx, int16_t trim)
+void setTrimValue(uint8_t phase, uint8_t idx, int16_t trim)
 {
   if (s_trimPtr[idx]) {
     *s_trimPtr[idx] = limit((int16_t)-125, trim, (int16_t)+125);
@@ -837,7 +837,7 @@ uint8_t checkTrim(uint8_t event)
       after = TRIM_EXTENDED_MAX;
     }
 
-    setRawTrimValue(phase, idx, after);
+    setTrimValue(phase, idx, after);
 
 #if defined (AUDIO)
     // toneFreq higher/lower according to trim position
@@ -2224,7 +2224,7 @@ void instantTrim()
       if (trim > TRIM_EXTENDED_MAX) {
         trim = TRIM_EXTENDED_MAX;
       }
-      setRawTrimValue(trim_phase, i, trim);
+      setTrimValue(trim_phase, i, trim);
     }
   }
 
@@ -2263,7 +2263,7 @@ void moveTrimsToOffsets() // copy state of 3 primary to subtrim
       for (uint8_t phase=0; phase<MAX_PHASES; phase++) {
         int16_t trim = getRawTrimValue(phase, i);
         if (trim <= TRIM_EXTENDED_MAX)
-          setRawTrimValue(phase, i, trim - original_trim);
+          setTrimValue(phase, i, trim - original_trim);
       }
     }
   }
diff --git a/src/open9x.h b/src/open9x.h
index e77994b25..fe429f01a 100644
--- a/src/open9x.h
+++ b/src/open9x.h
@@ -490,7 +490,7 @@ extern uint8_t getFlightPhase();
 extern uint8_t getTrimFlightPhase(uint8_t phase, uint8_t idx);
 extern int16_t getRawTrimValue(uint8_t phase, uint8_t idx);
 extern int16_t getTrimValue(uint8_t phase, uint8_t idx);
-extern void setRawTrimValue(uint8_t phase, uint8_t idx, int16_t trim);
+extern void setTrimValue(uint8_t phase, uint8_t idx, int16_t trim);
 
 extern uint16_t s_timeCumTot;
 extern uint16_t s_timeCumThr;  //gewichtete laufzeit in 1/16 sec