Removed board option in _config.h

This commit is contained in:
pascallanger 2017-02-06 21:50:56 +01:00
parent cc03c27d17
commit bf5598515e
3 changed files with 9 additions and 12 deletions

View File

@ -26,6 +26,9 @@
//Multiprotocol module configuration file //Multiprotocol module configuration file
#include "_Config.h" #include "_Config.h"
#ifdef __arm__
#define STM32_BOARD // Let's automatically select this board if arm is selected since this is the only one for now...
#endif
#include "Pins.h" #include "Pins.h"
#include "TX_Def.h" #include "TX_Def.h"
#include "Validate.h" #include "Validate.h"

View File

@ -78,8 +78,12 @@
#undef HUB_TELEMETRY #undef HUB_TELEMETRY
#undef SPORT_TELEMETRY #undef SPORT_TELEMETRY
#undef DSM_TELEMETRY #undef DSM_TELEMETRY
#undef MULTI_STATUS
#undef MULTI_TELEMETRY #undef MULTI_TELEMETRY
#else #else
#if defined MULTI_TELEMETRY && not defined INVERT_TELEMETRY
#warning MULTI_TELEMETRY has been defined but not INVERT_TELEMETRY. They should be both enabled for OpenTX telemetry and status to work.
#endif
#if not defined(BAYANG_NRF24L01_INO) #if not defined(BAYANG_NRF24L01_INO)
#undef BAYANG_HUB_TELEMETRY #undef BAYANG_HUB_TELEMETRY
#endif #endif

View File

@ -17,16 +17,6 @@
/** Multiprotocol module configuration file ***/ /** Multiprotocol module configuration file ***/
/**********************************************/ /**********************************************/
/********************/
/*** BOARD TYPE ***/
/********************/
//Uncomment one of the line below if you have a different module not based on the original Multi Atmega328p design which includes the 4-in-1.
//If you don't know then leave them commented.
#ifdef __arm__
#define STM32_BOARD // Let's automatically select this board if arm is selected since this is the only one for now...
#endif
/*******************/ /*******************/
/*** TX SETTINGS ***/ /*** TX SETTINGS ***/
/*******************/ /*******************/
@ -114,9 +104,9 @@
//Comment to invert the polarity of the output telemetry serial signal. //Comment to invert the polarity of the output telemetry serial signal.
//This function takes quite some flash space and processor power on an atmega. //This function takes quite some flash space and processor power on an atmega.
//For OpenTX and ersky9x it must be uncommented. //For OpenTX it must be uncommented.
//On a 9XR_PRO running ersky9x both commented and uncommented will work depending on the radio setting Invert COM1 under the Telemetry menu. //On a 9XR_PRO running ersky9x both commented and uncommented will work depending on the radio setting Invert COM1 under the Telemetry menu.
//On other addon/replacement boards like the 9xtreme board or the Ar9x board, you need to uncomment the line below. //On other addon/replacement boards like the 9xtreme board or the Ar9x board running ersky9x, you need to uncomment the line below.
//For er9x it depends if you have an inveter mod or not on the telemetry pin. If you don't have an inverter comment this line. //For er9x it depends if you have an inveter mod or not on the telemetry pin. If you don't have an inverter comment this line.
//#define INVERT_TELEMETRY //#define INVERT_TELEMETRY