From db3bd97935098f968f042f983901a9f8b65909f0 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Tue, 28 Aug 2012 20:54:36 +0000
Subject: [PATCH] Code factorization

---
 src/ersky9x/bluetooth.cpp |  6 ++++++
 src/ersky9x/bluetooth.h   |  1 +
 src/general_menus.cpp     |  3 +--
 src/open9x.cpp            | 19 +++----------------
 4 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/ersky9x/bluetooth.cpp b/src/ersky9x/bluetooth.cpp
index 2ab0481eb..dd5a13c16 100644
--- a/src/ersky9x/bluetooth.cpp
+++ b/src/ersky9x/bluetooth.cpp
@@ -33,6 +33,12 @@
 
 #include "../open9x.h"
 
+void btInit()
+{
+  uint32_t baudrate = (g_eeGeneral.btBaudrate==0 ? 115200 : (g_eeGeneral.btBaudrate==1 ? 9600 : 19200));
+  UART3_Configure(baudrate, Master_frequency);
+}
+
 class Fifo32
 {
   public:
diff --git a/src/ersky9x/bluetooth.h b/src/ersky9x/bluetooth.h
index a905bcaa4..a8727dfe7 100644
--- a/src/ersky9x/bluetooth.h
+++ b/src/ersky9x/bluetooth.h
@@ -34,6 +34,7 @@
 #ifndef bluetooth_h
 #define bluetooth_h
 
+void btInit();
 void btTask(void* pdata);
 void btPushByte(uint8_t data);
 
diff --git a/src/general_menus.cpp b/src/general_menus.cpp
index 13c12de53..166b8d2cd 100644
--- a/src/general_menus.cpp
+++ b/src/general_menus.cpp
@@ -328,8 +328,7 @@ void menuProcSetup(uint8_t event)
       case ITEM_SETUP_BT_BAUDRATE:
         g_eeGeneral.btBaudrate = selectMenuItem(y, PSTR("BT Baudrate"), PSTR("\005115k 9600 19200"), g_eeGeneral.btBaudrate, 0, 2, attr, event);
         if (attr && checkIncDec_Ret) {
-          uint32_t baudrate = (g_eeGeneral.btBaudrate==0 ? 115200 : (g_eeGeneral.btBaudrate==1 ? 9600 : 19200));
-          UART3_Configure(baudrate, Master_frequency);
+          btInit();
         }
         break;
 #endif
diff --git a/src/open9x.cpp b/src/open9x.cpp
index f7111e3f9..e0fe5fa80 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -3116,23 +3116,10 @@ inline void open9xInit(OPEN9X_INIT_ARGS)
 #if defined(PCBARM)
   setVolume(g_eeGeneral.speakerVolume);
   PWM->PWM_CH_NUM[0].PWM_CDTYUPD = g_eeGeneral.backlightBright;
-
-#if defined(BLUETOOTH)
-  uint32_t brate ;
-  switch (g_eeGeneral.btBaudrate) {
-    default :
-    case 0 :
-      brate = 115200 ;
-      break ;
-    case 1 :
-      brate = 9600 ;
-      break ;
-    case 2 :
-      brate = 19200 ;
-      break ;
-  }
-  UART3_Configure(brate, Master_frequency);
 #endif
+
+#if defined(PCBARM) && defined(BLUETOOTH)
+  btInit();
 #endif
 
   if (g_eeGeneral.backlightMode != e_backlight_mode_off) backlightOn(); // on Tx start turn the light on