From bb494ecfbe08bcc488015b7a1921577ce4659293 Mon Sep 17 00:00:00 2001 From: Turbyho Date: Thu, 6 Apr 2017 09:25:24 +0200 Subject: [PATCH] hw v1.0 --- examples/Dabduino_example_1/DABDUINO_example_1.ino | 10 ++++------ examples/Dabduino_example_2/DABDUINO_example_2.ino | 10 ++++------ src/DABDUINO.cpp | 12 +----------- src/DABDUINO.h | 4 +--- 4 files changed, 10 insertions(+), 26 deletions(-) diff --git a/examples/Dabduino_example_1/DABDUINO_example_1.ino b/examples/Dabduino_example_1/DABDUINO_example_1.ino index 180d7c2..24620c8 100644 --- a/examples/Dabduino_example_1/DABDUINO_example_1.ino +++ b/examples/Dabduino_example_1/DABDUINO_example_1.ino @@ -8,13 +8,11 @@ #include "DABDUINO.h" #define _DAB_SERIAL_PORT Serial1 -#define _DAB_RESET_PIN 2 -#define _DAB_DAC_MUTE_PIN 3 -#define _DAB_DAC_FLT_PIN 4 -#define _DAB_DAC_DEMP_PIN 5 -#define _DAB_SPI_CS_PIN 6 +#define _DAB_RESET_PIN 7 +#define _DAB_DAC_MUTE_PIN 9 +#define _DAB_SPI_CS_PIN 10 -DABDUINO dab = DABDUINO(_DAB_SERIAL_PORT, _DAB_RESET_PIN, _DAB_DAC_MUTE_PIN, _DAB_DAC_FLT_PIN, _DAB_DAC_DEMP_PIN, _DAB_SPI_CS_PIN); +DABDUINO dab = DABDUINO(_DAB_SERIAL_PORT, _DAB_RESET_PIN, _DAB_DAC_MUTE_PIN, _DAB_SPI_CS_PIN); // DAB variables char dabText[DAB_MAX_TEXT_LENGTH]; diff --git a/examples/Dabduino_example_2/DABDUINO_example_2.ino b/examples/Dabduino_example_2/DABDUINO_example_2.ino index 177dacb..edcb927 100644 --- a/examples/Dabduino_example_2/DABDUINO_example_2.ino +++ b/examples/Dabduino_example_2/DABDUINO_example_2.ino @@ -8,13 +8,11 @@ #include "DABDUINO.h" #define _DAB_SERIAL_PORT Serial1 -#define _DAB_RESET_PIN 2 -#define _DAB_DAC_MUTE_PIN 3 -#define _DAB_DAC_FLT_PIN 4 -#define _DAB_DAC_DEMP_PIN 5 -#define _DAB_SPI_CS_PIN 6 +#define _DAB_RESET_PIN 7 +#define _DAB_DAC_MUTE_PIN 9 +#define _DAB_SPI_CS_PIN 10 -DABDUINO dab = DABDUINO(_DAB_SERIAL_PORT, _DAB_RESET_PIN, _DAB_DAC_MUTE_PIN, _DAB_DAC_FLT_PIN, _DAB_DAC_DEMP_PIN, _DAB_SPI_CS_PIN); +DABDUINO dab = DABDUINO(_DAB_SERIAL_PORT, _DAB_RESET_PIN, _DAB_DAC_MUTE_PIN, _DAB_SPI_CS_PIN); // DAB variables char dabText[DAB_MAX_TEXT_LENGTH]; diff --git a/src/DABDUINO.cpp b/src/DABDUINO.cpp index 144f730..33e9ffc 100755 --- a/src/DABDUINO.cpp +++ b/src/DABDUINO.cpp @@ -7,13 +7,11 @@ #include "DABDUINO.h" -DABDUINO::DABDUINO(HardwareSerial& serial, int8_t RESET_PIN, int8_t DAC_MUTE_PIN, int8_t DAC_FLT_PIN, int8_t DAC_DEMP_PIN, int8_t SPI_CS_PIN) : _s(serial) { +DABDUINO::DABDUINO(HardwareSerial& serial, int8_t RESET_PIN, int8_t DAC_MUTE_PIN, int8_t SPI_CS_PIN) : _s(serial) { _Serial = &serial; resetPin = RESET_PIN; dacMutePin = DAC_MUTE_PIN; - dacFltPin = DAC_FLT_PIN; - dacDempPin = DAC_DEMP_PIN; spiCsPin = SPI_CS_PIN; } @@ -122,14 +120,6 @@ void DABDUINO::init() { pinMode(dacMutePin, OUTPUT); digitalWrite(dacMutePin, HIGH); - // DAC FLT - pinMode(dacFltPin, OUTPUT); - digitalWrite(dacFltPin, HIGH); - - // DAC DEMP - pinMode(dacDempPin, OUTPUT); - digitalWrite(dacDempPin, LOW); - // SPI CS pinMode(spiCsPin, OUTPUT); digitalWrite(spiCsPin, LOW); diff --git a/src/DABDUINO.h b/src/DABDUINO.h index 490dd0d..79dacab 100755 --- a/src/DABDUINO.h +++ b/src/DABDUINO.h @@ -19,7 +19,7 @@ class DABDUINO { public: - DABDUINO (HardwareSerial& serial, int8_t RESET_PIN, int8_t DAC_MUTE_PIN, int8_t DAC_FLT_PIN, int8_t DAC_DEMP_PIN, int8_t SPI_CS_PIN); + DABDUINO (HardwareSerial& serial, int8_t RESET_PIN, int8_t DAC_MUTE_PIN, int8_t SPI_CS_PIN); Stream& _s; unsigned char charToAscii(byte byte0, byte byte1); @@ -123,8 +123,6 @@ class DABDUINO HardwareSerial *_Serial; int8_t resetPin; int8_t dacMutePin; - int8_t dacFltPin; - int8_t dacDempPin; int8_t spiCsPin; };