From cf33b1e884b817381d8b15561763bcb4f1937019 Mon Sep 17 00:00:00 2001 From: Turbyho Date: Mon, 20 Mar 2017 21:22:57 +0100 Subject: [PATCH] v0.1.4 --- README.md | 8 +++----- doc/{IMG_6741.jpg => dabduino_01.jpg} | Bin doc/{IMG_6728.jpg => dabduino_02.jpg} | Bin doc/{IMG_6731.jpg => dabduino_03.jpg} | Bin .../Dabduino_example_1/DABDUINO_example_1.ino | 14 +++++++------- library.properties | 2 +- src/DABDUINO.cpp | 12 ++++++------ 7 files changed, 17 insertions(+), 19 deletions(-) rename doc/{IMG_6741.jpg => dabduino_01.jpg} (100%) rename doc/{IMG_6728.jpg => dabduino_02.jpg} (100%) rename doc/{IMG_6731.jpg => dabduino_03.jpg} (100%) diff --git a/README.md b/README.md index 3dba4ee..e593497 100644 --- a/README.md +++ b/README.md @@ -6,16 +6,14 @@ Open library manager in Arduino IDE and install the DABDUINO library. ## References For command reference visit [DABDUINO.cpp](https://github.com/turbyho/DABDUINO/blob/master/src/DABDUINO.cpp). +Example is here [DABDUINO_example_1.ino](https://github.com/turbyho/DABDUINO/blob/master/examples/Dabduino_example_1/DABDUINO_example_1.ino). ## Where buy the DABDUINO? I waiting for first batch of DABDUINO boards. First boards will be ready for dispatch on 05/2017. Send me preorders please. ## Final DABDUINO - - - - - + + ### Second prototype video [](https://www.youtube.com/watch?v=LBgsKTtB7Bs) diff --git a/doc/IMG_6741.jpg b/doc/dabduino_01.jpg similarity index 100% rename from doc/IMG_6741.jpg rename to doc/dabduino_01.jpg diff --git a/doc/IMG_6728.jpg b/doc/dabduino_02.jpg similarity index 100% rename from doc/IMG_6728.jpg rename to doc/dabduino_02.jpg diff --git a/doc/IMG_6731.jpg b/doc/dabduino_03.jpg similarity index 100% rename from doc/IMG_6731.jpg rename to doc/dabduino_03.jpg diff --git a/examples/Dabduino_example_1/DABDUINO_example_1.ino b/examples/Dabduino_example_1/DABDUINO_example_1.ino index 5be63d8..3d789ec 100644 --- a/examples/Dabduino_example_1/DABDUINO_example_1.ino +++ b/examples/Dabduino_example_1/DABDUINO_example_1.ino @@ -42,24 +42,24 @@ void setup() { dab.playStatus(status); if (status != lastStatus) { Serial.println(); - // 1=playing, 2=searching, 3=tuning, 4=stop, 5=sorting change, 6=reconfiguration + // 0=playing, 1=searching, 2=tuning, 3=stop, 4=sorting change, 5=reconfiguration switch (status) { - case 1: + case 0: Serial.print("Playing"); break; - case 2: + case 1: Serial.print("Searching"); break; - case 3: + case 2: Serial.print("Tuning"); break; - case 4: + case 3: Serial.print("Stop"); break; - case 5: + case 4: Serial.print("Sorting"); break; - case 6: + case 5: Serial.print("Reconfiguration"); break; } diff --git a/library.properties b/library.properties index 7b9f909..1eff0ae 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=DABDUINO -version=0.1.3 +version=0.1.4 author=Tomas Urbanek maintainer=Tomas Urbanek sentence=Library for controlling DABDUINO - DAB/DAB+ (digital radio) shield diff --git a/src/DABDUINO.cpp b/src/DABDUINO.cpp index f79c320..e8b124d 100755 --- a/src/DABDUINO.cpp +++ b/src/DABDUINO.cpp @@ -465,7 +465,7 @@ int8_t DABDUINO::playStatus(unsigned int data) { byte dabCommand[7] = { 0xFE, 0x01, 0x05, 0x00, 0x00, 0x00, 0xFD }; if (sendCommand(dabCommand, dabData, &dabDataSize)) { if (dabDataSize) { - data = dabData[0] + 1; + data = dabData[0]; return 1; } else { return 0; @@ -477,7 +477,7 @@ int8_t DABDUINO::playStatus(unsigned int data) { /* * Radio module play mode - * return data: 1=DAB, 2=FM, 4=BEEP, 255=Stream stop + * return data: 0=DAB, 1=FM, 2=BEEP, 255=Stream stop */ int8_t DABDUINO::playMode(unsigned int data) { @@ -487,7 +487,7 @@ int8_t DABDUINO::playMode(unsigned int data) { if (sendCommand(dabCommand, dabData, &dabDataSize)) { if (dabDataSize) { if (dabData[0] != 0xFF) { - data = dabData[0] + 1; + data = dabData[0]; return 1; } else { data = dabData[0]; @@ -564,7 +564,7 @@ int8_t DABDUINO::setStereoMode(boolean stereo = true) { /* * Get stereo mode - * 1=force mono, 2=auto detect stereo + * 0=force mono, 1=auto detect stereo */ int8_t DABDUINO::getStereoMode(unsigned int data) { @@ -573,7 +573,7 @@ int8_t DABDUINO::getStereoMode(unsigned int data) { byte dabCommand[7] = { 0xFE, 0x01, 0x0A, 0x00, 0x00, 0x00, 0xFD }; if (sendCommand(dabCommand, dabData, &dabDataSize)) { if (dabDataSize) { - data = dabData[0] + 1; + data = dabData[0]; return 1; } else { return 0; @@ -585,7 +585,7 @@ int8_t DABDUINO::getStereoMode(unsigned int data) { /* * Get stereo type - * return data: 1=stereo, 2=join stereo, 3=dual channel, 4=single channel (mono) + * return data: 0=stereo, 1=join stereo, 2=dual channel, 3=single channel (mono) */ int8_t DABDUINO::getStereoType(unsigned int data) {