From b94f54822f59533a58832f55f37a1d6ffa2aed8e Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Wed, 23 Jan 2013 21:16:44 +0000
Subject: [PATCH] Code cleaning session

---
 src/simpgmspace.cpp | 64 +++++++++++++++++++++++----------------------
 src/simu.cpp        | 38 +++++++++++++--------------
 2 files changed, 52 insertions(+), 50 deletions(-)

diff --git a/src/simpgmspace.cpp b/src/simpgmspace.cpp
index 7d3d72bf6..8fc2dd489 100644
--- a/src/simpgmspace.cpp
+++ b/src/simpgmspace.cpp
@@ -133,6 +133,8 @@ void simuSetKey(uint8_t key, bool state)
 
 void simuSetTrim(uint8_t trim, bool state)
 {
+  // printf("trim=%d state=%d\n", trim, state); fflush(stdout);
+
   switch (trim) {
     TRIM_CASE(0, GPIO_TRIM_LH_L, PIN_TRIM_LH_L)
     TRIM_CASE(1, GPIO_TRIM_LH_R, PIN_TRIM_LH_R)
@@ -151,43 +153,43 @@ void simuSetSwitch(uint8_t swtch, int8_t state)
   switch (swtch) {
 #if defined(PCBACT)
 #elif defined(PCBX9D)
-    SWITCH_3_CASE(SW_SA0, GPIOB->IDR, GPIOE->IDR, PIN_SW_A_H, PIN_SW_A_L)
-    SWITCH_3_CASE(SW_SB0, GPIOB->IDR, GPIOB->IDR, PIN_SW_B_H, PIN_SW_B_L)
-    SWITCH_3_CASE(SW_SC0, GPIOB->IDR, GPIOE->IDR, PIN_SW_C_H, PIN_SW_C_L)
-    SWITCH_3_CASE(SW_SD0, GPIOE->IDR, GPIOE->IDR, PIN_SW_D_H, PIN_SW_D_L)
-    SWITCH_3_CASE(SW_SE0, GPIOB->IDR, GPIOB->IDR, PIN_SW_E_H, PIN_SW_E_L)
-    SWITCH_CASE(SW_SF0, GPIOE->IDR, PIN_SW_F)
-    SWITCH_3_CASE(SW_SG0, GPIOA->IDR, GPIOB->IDR, PIN_SW_G_H, PIN_SW_G_L)
-    SWITCH_CASE(SW_SH0, GPIOE->IDR, PIN_SW_H)
+    SWITCH_3_CASE(0, GPIOB->IDR, GPIOE->IDR, PIN_SW_A_H, PIN_SW_A_L)
+    SWITCH_3_CASE(1, GPIOB->IDR, GPIOB->IDR, PIN_SW_B_H, PIN_SW_B_L)
+    SWITCH_3_CASE(2, GPIOB->IDR, GPIOE->IDR, PIN_SW_C_H, PIN_SW_C_L)
+    SWITCH_3_CASE(3, GPIOE->IDR, GPIOE->IDR, PIN_SW_D_H, PIN_SW_D_L)
+    SWITCH_3_CASE(4, GPIOB->IDR, GPIOB->IDR, PIN_SW_E_H, PIN_SW_E_L)
+    SWITCH_CASE(5, GPIOE->IDR, PIN_SW_F)
+    SWITCH_3_CASE(6, GPIOA->IDR, GPIOB->IDR, PIN_SW_G_H, PIN_SW_G_L)
+    SWITCH_CASE(7, GPIOE->IDR, PIN_SW_H)
 #elif defined(PCBSKY9X)
-    SWITCH_CASE(SW_THR, PIOC->PIO_PDSR, 1<<20)
-    SWITCH_CASE(SW_RUD, PIOA->PIO_PDSR, 1<<15)
-    SWITCH_CASE(SW_ELE, PIOC->PIO_PDSR, 1<<31)
-    SWITCH_3_CASE(SW_ID0, PIOC->PIO_PDSR, PIOC->PIO_PDSR, 0x00004000, 0x00000800)
-    SWITCH_CASE(SW_AIL, PIOA->PIO_PDSR, 1<<2)
-    SWITCH_CASE(SW_GEA, PIOC->PIO_PDSR, 1<<16)
-    SWITCH_CASE(SW_TRN, PIOC->PIO_PDSR, 1<<8)
+    SWITCH_CASE(0, PIOC->PIO_PDSR, 1<<20)
+    SWITCH_CASE(1, PIOA->PIO_PDSR, 1<<15)
+    SWITCH_CASE(2, PIOC->PIO_PDSR, 1<<31)
+    SWITCH_3_CASE(3, PIOC->PIO_PDSR, PIOC->PIO_PDSR, 0x00004000, 0x00000800)
+    SWITCH_CASE(4, PIOA->PIO_PDSR, 1<<2)
+    SWITCH_CASE(5, PIOC->PIO_PDSR, 1<<16)
+    SWITCH_CASE(6, PIOC->PIO_PDSR, 1<<8)
 #elif defined(PCBGRUVIN9X)
-    SWITCH_CASE(SW_THR, ping, 1<<INP_G_ThrCt)
-    SWITCH_CASE(SW_RUD, ping, 1<<INP_G_RuddDR)
-    SWITCH_CASE(SW_ELE, pinc, 1<<INP_C_ElevDR)
-    SWITCH_3_CASE(SW_ID0, ping, pinb, (1<<INP_G_ID1), (1<<INP_B_ID2))
-    SWITCH_CASE(SW_AIL, pinc, 1<<INP_C_AileDR)
-    SWITCH_CASE(SW_GEA, ping, 1<<INP_G_Gear)
-    SWITCH_CASE(SW_TRN, pinb, 1<<INP_B_Trainer)
+    SWITCH_CASE(0, ping, 1<<INP_G_ThrCt)
+    SWITCH_CASE(1, ping, 1<<INP_G_RuddDR)
+    SWITCH_CASE(2, pinc, 1<<INP_C_ElevDR)
+    SWITCH_3_CASE(3, ping, pinb, (1<<INP_G_ID1), (1<<INP_B_ID2))
+    SWITCH_CASE(4, pinc, 1<<INP_C_AileDR)
+    SWITCH_CASE(5, ping, 1<<INP_G_Gear)
+    SWITCH_CASE(6, pinb, 1<<INP_B_Trainer)
 #else // STOCK
 #if defined(JETI) || defined(FRSKY) || defined(NMEA) || defined(ARDUPILOT)
-    SWITCH_CASE(SW_THR, pinc, 1<<INP_C_ThrCt)
-    SWITCH_CASE(SW_AIL, pinc, 1<<INP_C_AileDR)
+    SWITCH_CASE(0, pinc, 1<<INP_C_ThrCt)
+    SWITCH_CASE(4, pinc, 1<<INP_C_AileDR)
 #else
-    SWITCH_CASE(SW_THR, pine, 1<<INP_E_ThrCt)
-    SWITCH_CASE(SW_AIL, pine, 1<<INP_E_AileDR)
+    SWITCH_CASE(0, pine, 1<<INP_E_ThrCt)
+    SWITCH_CASE(4, pine, 1<<INP_E_AileDR)
 #endif
-    SWITCH_3_CASE(SW_ID0, ping, pine, (1<<INP_G_ID1), (1<<INP_E_ID2))
-    SWITCH_CASE(SW_RUD, ping, 1<<INP_G_RuddDR)
-    SWITCH_CASE(SW_ELE, pine, 1<<INP_E_ElevDR)
-    SWITCH_CASE(SW_GEA, pine, 1<<INP_E_Gear)
-    SWITCH_CASE(SW_TRN, pine, 1<<INP_E_Trainer)
+    SWITCH_3_CASE(3, ping, pine, (1<<INP_G_ID1), (1<<INP_E_ID2))
+    SWITCH_CASE(1, ping, 1<<INP_G_RuddDR)
+    SWITCH_CASE(2, pine, 1<<INP_E_ElevDR)
+    SWITCH_CASE(5, pine, 1<<INP_E_Gear)
+    SWITCH_CASE(6, pine, 1<<INP_E_Trainer)
 #endif
 
     default:
diff --git a/src/simu.cpp b/src/simu.cpp
index 5c0f6c2d9..7ad1397cd 100644
--- a/src/simu.cpp
+++ b/src/simu.cpp
@@ -302,36 +302,36 @@ long Open9xSim::onTimeout(FXObject*,FXSelector,void*)
 
 #define SWITCH_KEY(key, swtch, states) \
     static bool state##key = 0; \
-    static int8_t state##swtch = 2; \
+    static int8_t state_##swtch = 2; \
     if (getApp()->getKeyState(KEY_##key)) { \
       if (!state##key) { \
-        state##swtch = (state##swtch+1); \
-        if (state##swtch == 2+states) state##swtch = 2; \
+        state_##swtch = (state_##swtch+1); \
+        if (state_##swtch == 2+states) state_##swtch = 2; \
         state##key = true; \
       } \
     } \
     else { \
       state##key = false; \
     } \
-    simuSetSwitch(SW_##swtch, state##swtch-states);
+    simuSetSwitch(swtch, state_##swtch-states);
 
 #if defined(PCBX9D) || defined(PCBACT)
-    SWITCH_KEY(A, SA0, 3);
-    SWITCH_KEY(B, SB0, 3);
-    SWITCH_KEY(C, SC0, 3);
-    SWITCH_KEY(D, SD0, 3);
-    SWITCH_KEY(E, SE0, 3);
-    SWITCH_KEY(F, SF0, 2);
-    SWITCH_KEY(G, SG0, 3);
-    SWITCH_KEY(H, SH0, 2);
+    SWITCH_KEY(A, 0, 3);
+    SWITCH_KEY(B, 1, 3);
+    SWITCH_KEY(C, 2, 3);
+    SWITCH_KEY(D, 3, 3);
+    SWITCH_KEY(E, 4, 3);
+    SWITCH_KEY(F, 5, 2);
+    SWITCH_KEY(G, 6, 3);
+    SWITCH_KEY(H, 7, 2);
 #else
-    SWITCH_KEY(1, THR, 2);
-    SWITCH_KEY(2, RUD, 2);
-    SWITCH_KEY(3, ELE, 2);
-    SWITCH_KEY(4, ID0, 3);
-    SWITCH_KEY(5, AIL, 2);
-    SWITCH_KEY(6, GEA, 2);
-    SWITCH_KEY(7, TRN, 2);
+    SWITCH_KEY(1, 0, 2);
+    SWITCH_KEY(2, 1, 2);
+    SWITCH_KEY(3, 2, 2);
+    SWITCH_KEY(4, 3, 3);
+    SWITCH_KEY(5, 4, 2);
+    SWITCH_KEY(6, 5, 2);
+    SWITCH_KEY(7, 6, 2);
 #endif
   }