diff --git a/Conf.cpp b/Conf.cpp index dd12307..5afec64 100644 --- a/Conf.cpp +++ b/Conf.cpp @@ -273,7 +273,14 @@ bool CConf::read() char* value = ::strtok(NULL, "\r\n"); if (value == NULL) continue; - + + // Remove quotes from the value + size_t len = ::strlen(value); + if (len > 1U && *value == '"' && value[len - 1U] == '"') { + value[len - 1U] = '\0'; + value++; + } + if (section == SECTION_GENERAL) { if (::strcmp(key, "Callsign") == 0) { // Convert the callsign to upper case diff --git a/DMRNetwork.cpp b/DMRNetwork.cpp index d296b57..51843db 100644 --- a/DMRNetwork.cpp +++ b/DMRNetwork.cpp @@ -498,6 +498,9 @@ void CDMRNetwork::receiveData(const unsigned char* data, unsigned int length) if (slotNo == 2U && !m_slot2) return; + m_jitterBuffers[slotNo]->appendData(data, length); + + /* unsigned char dataType = data[15U] & 0x3FU; if (dataType == (0x20U | DT_CSBK) || dataType == (0x20U | DT_DATA_HEADER) || @@ -511,6 +514,7 @@ void CDMRNetwork::receiveData(const unsigned char* data, unsigned int length) unsigned char seqNo = data[4U]; m_jitterBuffers[slotNo]->addData(data, length, seqNo); } + */ } bool CDMRNetwork::writeLogin() diff --git a/Makefile.Pi.OLED b/Makefile.Pi.OLED index 1845bc2..4cf1b2e 100644 --- a/Makefile.Pi.OLED +++ b/Makefile.Pi.OLED @@ -3,7 +3,7 @@ CC = gcc CXX = g++ CFLAGS = -g -O3 -Wall -std=c++0x -pthread -DOLED -I/usr/local/include -LIBS = -lArduiPi_OLED -lpthread +LIBS = -lArduiPi_OLED -li2c -lpthread LDFLAGS = -g -L/usr/local/lib OBJECTS = \