From 4016cbfaa344e6843ad66ce78f9b621ebc3f6d57 Mon Sep 17 00:00:00 2001
From: DieHertz <diehertz@gmail.com>
Date: Tue, 27 Dec 2016 12:31:40 +0300
Subject: [PATCH] switch main.c to use PG preprocessor macros

---
 src/main/main.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/main.c b/src/main/main.c
index 7b40976ee..aed6c9ba8 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -239,7 +239,7 @@ void init(void)
                 // Spektrum satellite binding if enabled on startup.
                 // Must be called before that 100ms sleep so that we don't lose satellite's binding window after startup.
                 // The rest of Spektrum initialization will happen later - via spektrumInit()
-                spektrumBind(&masterConfig.rxConfig);
+                spektrumBind(rxConfig());
                 break;
         }
     }
@@ -250,16 +250,16 @@ void init(void)
     timerInit();  // timer must be initialized before any channel is allocated
 
 #if defined(AVOID_UART1_FOR_PWM_PPM)
-    serialInit(&masterConfig.serialConfig, feature(FEATURE_SOFTSERIAL),
+    serialInit(serialConfig(), feature(FEATURE_SOFTSERIAL),
             feature(FEATURE_RX_PPM) || feature(FEATURE_RX_PARALLEL_PWM) ? SERIAL_PORT_USART1 : SERIAL_PORT_NONE);
 #elif defined(AVOID_UART2_FOR_PWM_PPM)
-    serialInit(&masterConfig.serialConfig, feature(FEATURE_SOFTSERIAL),
+    serialInit(serialConfig(), feature(FEATURE_SOFTSERIAL),
             feature(FEATURE_RX_PPM) || feature(FEATURE_RX_PARALLEL_PWM) ? SERIAL_PORT_USART2 : SERIAL_PORT_NONE);
 #elif defined(AVOID_UART3_FOR_PWM_PPM)
-    serialInit(&masterConfig.serialConfig, feature(FEATURE_SOFTSERIAL),
+    serialInit(serialConfig(), feature(FEATURE_SOFTSERIAL),
             feature(FEATURE_RX_PPM) || feature(FEATURE_RX_PARALLEL_PWM) ? SERIAL_PORT_USART3 : SERIAL_PORT_NONE);
 #else
-    serialInit(&masterConfig.serialConfig, feature(FEATURE_SOFTSERIAL), SERIAL_PORT_NONE);
+    serialInit(serialConfig(), feature(FEATURE_SOFTSERIAL), SERIAL_PORT_NONE);
 #endif
 
     mixerInit(mixerConfig()->mixerMode, masterConfig.customMotorMixer);
@@ -278,13 +278,13 @@ void init(void)
     }
 
     mixerConfigureOutput();
-    motorInit(&masterConfig.motorConfig, idlePulse, getMotorCount());
+    motorInit(motorConfig(), idlePulse, getMotorCount());
 
 #ifdef USE_SERVOS
     servoConfigureOutput();
     if (isMixerUsingServos()) {
         //pwm_params.useChannelForwarding = feature(FEATURE_CHANNEL_FORWARDING);
-        servoInit(&masterConfig.servoConfig);
+        servoInit(servoConfig());
     }
 #endif
 
@@ -386,7 +386,7 @@ void init(void)
     if (feature(FEATURE_OSD)) {
 #ifdef USE_MAX7456
         // if there is a max7456 chip for the OSD then use it, otherwise use MSP
-        displayPort_t *osdDisplayPort = max7456DisplayPortInit(&masterConfig.vcdProfile);
+        displayPort_t *osdDisplayPort = max7456DisplayPortInit(vcdProfile());
 #else
         displayPort_t *osdDisplayPort = displayPortMspInit();
 #endif
@@ -395,7 +395,7 @@ void init(void)
 #endif
 
 #ifdef SONAR
-    const sonarConfig_t *sonarConfig = &masterConfig.sonarConfig;
+    const sonarConfig_t *sonarConfig = sonarConfig();
 #else
     const void *sonarConfig = NULL;
 #endif
@@ -446,11 +446,11 @@ void init(void)
 #ifdef GPS
     if (feature(FEATURE_GPS)) {
         gpsInit(
-            &masterConfig.serialConfig,
-            &masterConfig.gpsConfig
+            serialConfig(),
+            gpsConfig()
         );
         navigationInit(
-            &masterConfig.gpsProfile,
+            gpsProfile(),
             &currentProfile->pidProfile
         );
     }
@@ -491,7 +491,7 @@ void init(void)
 
 #ifdef USE_FLASHFS
 #if defined(USE_FLASH_M25P16)
-    m25p16_init(&masterConfig.flashConfig);
+    m25p16_init(flashConfig());
 #endif
 
     flashfsInit();
@@ -536,7 +536,7 @@ void init(void)
     // Now that everything has powered up the voltage and cell count be determined.
 
     if (feature(FEATURE_VBAT | FEATURE_CURRENT_METER))
-        batteryInit(&masterConfig.batteryConfig);
+        batteryInit(batteryConfig());
 
 #ifdef USE_DASHBOARD
     if (feature(FEATURE_DASHBOARD)) {