From 6694535decd7c59ab4596b4eddafb98052080c21 Mon Sep 17 00:00:00 2001 From: Luca Marchesano Date: Tue, 24 Jul 2018 09:35:51 +0200 Subject: [PATCH] Delete Globals.h.bak --- Globals.h.bak | 144 -------------------------------------------------- 1 file changed, 144 deletions(-) delete mode 100644 Globals.h.bak diff --git a/Globals.h.bak b/Globals.h.bak deleted file mode 100644 index cd70da8..0000000 --- a/Globals.h.bak +++ /dev/null @@ -1,144 +0,0 @@ -/* - * Copyright (C) 2015,2016,2017,2018 by Jonathan Naylor G4KLX - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#if !defined(GLOBALS_H) -#define GLOBALS_H - -#if defined(STM32F4XX) -#include "stm32f4xx.h" -#elif defined(STM32F7XX) -#include "stm32f7xx.h" -#elif defined(STM32F105xC) -#include "stm32f1xx.h" -#include "STM32Utils.h" -#else -#include -#endif - -#if defined(__SAM3X8E__) || defined(STM32F105xC) -#define ARM_MATH_CM3 -#elif defined(STM32F7XX) -#define ARM_MATH_CM7 -#elif defined(STM32F4XX) || defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__) -#define ARM_MATH_CM4 -#else -#error "Unknown processor type" -#endif - -#include - -enum MMDVM_STATE { - STATE_IDLE = 0, - STATE_DSTAR = 1, - STATE_DMR = 2, - STATE_YSF = 3, - STATE_P25 = 4, - STATE_NXDN = 5, - STATE_POCSAG = 6, - - // Dummy states start at 90 - STATE_NXDNCAL1K = 91, - STATE_DMRDMO1K = 92, - STATE_P25CAL1K = 93, - STATE_DMRCAL1K = 94, - STATE_LFCAL = 95, - STATE_RSSICAL = 96, - STATE_CWID = 97, - STATE_DMRCAL = 98, - STATE_DSTARCAL = 99 -}; - -#include "SerialPort.h" -#include "DMRIdleRX.h" -#include "DMRDMORX.h" -#include "DMRDMOTX.h" -#include "DStarRX.h" -#include "DStarTX.h" -#include "DMRRX.h" -#include "DMRTX.h" -#include "YSFRX.h" -#include "YSFTX.h" -#include "P25RX.h" -#include "P25TX.h" -#include "NXDNRX.h" -#include "NXDNTX.h" -#include "CalDStarRX.h" -#include "CalDStarTX.h" -#include "CalDMR.h" -#include "CalP25.h" -#include "CalNXDN.h" -#include "CalRSSI.h" -#include "CWIdTX.h" -#include "Debug.h" -#include "IO.h" - -const uint8_t MARK_SLOT1 = 0x08U; -const uint8_t MARK_SLOT2 = 0x04U; -const uint8_t MARK_NONE = 0x00U; - -const uint16_t RX_BLOCK_SIZE = 2U; - -const uint16_t TX_RINGBUFFER_SIZE = 1000U; -const uint16_t RX_RINGBUFFER_SIZE = 1200U; - -extern MMDVM_STATE m_modemState; - -extern bool m_dstarEnable; -extern bool m_dmrEnable; -extern bool m_ysfEnable; -extern bool m_p25Enable; -extern bool m_nxdnEnable; - -extern bool m_duplex; - -extern bool m_tx; -extern bool m_dcd; - -extern CSerialPort serial; -extern CIO io; - -extern CDStarRX dstarRX; -extern CDStarTX dstarTX; - -extern CDMRIdleRX dmrIdleRX; -extern CDMRRX dmrRX; -extern CDMRTX dmrTX; - -extern CDMRDMORX dmrDMORX; -extern CDMRDMOTX dmrDMOTX; - -extern CYSFRX ysfRX; -extern CYSFTX ysfTX; - -extern CP25RX p25RX; -extern CP25TX p25TX; - -extern CNXDNRX nxdnRX; -extern CNXDNTX nxdnTX; - -extern CCalDStarRX calDStarRX; -extern CCalDStarTX calDStarTX; -extern CCalDMR calDMR; -extern CCalP25 calP25; -extern CCalNXDN calNXDN; -extern CCalRSSI calRSSI; - -extern CCWIdTX cwIdTX; - -#endif -