Merge branch 'master' of github.com:g4klx/MMDVM

This commit is contained in:
Jonathan Naylor 2016-08-25 17:34:20 +01:00
commit 70e3779d64
2 changed files with 5 additions and 0 deletions

1
IO.cpp
View File

@ -74,6 +74,7 @@ const uint16_t DC_OFFSET = 2048U;
#define PIN_DSTAR 9 #define PIN_DSTAR 9
#define PIN_DMR 8 #define PIN_DMR 8
#define PIN_YSF 7 #define PIN_YSF 7
#define PIN_RSSI 60
#define ADC_CHER_Chan (1<<7) // ADC on Due pin A0 - Due AD7 - (1 << 7) #define ADC_CHER_Chan (1<<7) // ADC on Due pin A0 - Due AD7 - (1 << 7)
#define ADC_ISR_EOC_Chan ADC_ISR_EOC7 #define ADC_ISR_EOC_Chan ADC_ISR_EOC7
#define ADC_CDR_Chan 7 #define ADC_CDR_Chan 7

View File

@ -61,7 +61,11 @@ const uint8_t MMDVM_DEBUG3 = 0xF3U;
const uint8_t MMDVM_DEBUG4 = 0xF4U; const uint8_t MMDVM_DEBUG4 = 0xF4U;
const uint8_t MMDVM_DEBUG5 = 0xF5U; const uint8_t MMDVM_DEBUG5 = 0xF5U;
#if defined(EXTERNAL_OSC)
const uint8_t HARDWARE[] = "MMDVM 20160816 24kHz TCXO (D-Star/DMR/System Fusion/CW Id)";
#else
const uint8_t HARDWARE[] = "MMDVM 20160816 24kHz (D-Star/DMR/System Fusion/CW Id)"; const uint8_t HARDWARE[] = "MMDVM 20160816 24kHz (D-Star/DMR/System Fusion/CW Id)";
#endif
const uint8_t PROTOCOL_VERSION = 1U; const uint8_t PROTOCOL_VERSION = 1U;