diff --git a/src/board_ersky9x.cpp b/src/board_ersky9x.cpp index e45401798..87e9d1926 100644 --- a/src/board_ersky9x.cpp +++ b/src/board_ersky9x.cpp @@ -55,9 +55,6 @@ volatile uint32_t Tenms ; /** Pins description corresponding to Rxd,Txd, (UART pins) */ #define SECOND_PINS {PINS_USART0} -#define BT_USART UART1 -#define BT_ID ID_UART1 - #define CPU_INT int32_t #define CPU_UINT uint32_t diff --git a/src/ersky9x/board.h b/src/ersky9x/board.h index b0a69db23..1ca8bd728 100644 --- a/src/ersky9x/board.h +++ b/src/ersky9x/board.h @@ -604,6 +604,10 @@ extern uint32_t transSpeed; #define BOARD_USART_BASE USART1 #define BOARD_ID_USART ID_USART1 +// BlueTooth +#define BT_USART UART1 +#define BT_ID ID_UART1 + //------------------------------------------------------------------------------ diff --git a/src/gruvin9x/somo14d.cpp b/src/gruvin9x/somo14d.cpp index 85613a2df..be1dc25df 100644 --- a/src/gruvin9x/somo14d.cpp +++ b/src/gruvin9x/somo14d.cpp @@ -40,9 +40,7 @@ old DSM2 code) which seemed to much for the interrupt. */ -#ifndef SIMU -#include "open9x.h" -#endif +#include "../open9x.h" // Start and stop bits need to be 2ms in duration. Start bit is low, stop bit is high #define SOMOSSBIT 4 //The 2ms of a stop/start bit diff --git a/src/simpgmspace.cpp b/src/simpgmspace.cpp index 801517237..d0f328f93 100644 --- a/src/simpgmspace.cpp +++ b/src/simpgmspace.cpp @@ -287,7 +287,9 @@ namespace simu { #include #endif +#if defined(PCBARM) FATFS g_FATFS_Obj; +#endif FRESULT f_stat (const TCHAR*, FILINFO*) { @@ -410,6 +412,9 @@ FRESULT f_getcwd (TCHAR *path, UINT sz_path) return FR_OK; } +#if defined(PCBARM) int32_t Card_state = SD_ST_MOUNTED; uint32_t Card_CSD[4]; // TODO elsewhere #endif + +#endif