From a6bad602339d2a8ea05979acee091cc6bf767e90 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Sun, 6 Apr 2014 20:29:39 +0200 Subject: [PATCH] Removed dacPin sillyness --- Modem/afsk.c | 3 +-- Modem/afsk.h | 3 +-- Modem/main.c | 2 +- buildrev.h | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Modem/afsk.c b/Modem/afsk.c index b575ef1..b68bdc0 100644 --- a/Modem/afsk.c +++ b/Modem/afsk.c @@ -524,13 +524,12 @@ static void afsk_clearerr(KFile *fd) { // Modem Initialization // ////////////////////////////////////////////////////// -void afsk_init(Afsk *afsk, int _adcPin, int _dacPin) { +void afsk_init(Afsk *afsk, int _adcPin) { // Allocate memory for struct memset(afsk, 0, sizeof(*afsk)); // Configure pins afsk->adcPin = _adcPin; - afsk->dacPin = _dacPin; afsk->phaseInc = MARK_INC; // Init FIFO buffers diff --git a/Modem/afsk.h b/Modem/afsk.h index 1fcfd48..acf8240 100644 --- a/Modem/afsk.h +++ b/Modem/afsk.h @@ -48,7 +48,6 @@ typedef struct Afsk // I/O hardware pins int adcPin; // Pin for incoming signal - int dacPin; // Pin for outgoing signal // General values Hdlc hdlc; // We need a link control structure @@ -116,6 +115,6 @@ INLINE Afsk *AFSK_CAST(KFile *fd) { // and initialization functions void afsk_adc_isr(Afsk *af, int8_t sample); uint8_t afsk_dac_isr(Afsk *af); -void afsk_init(Afsk *af, int adc_ch, int dac_ch); +void afsk_init(Afsk *af, int adc_ch); #endif \ No newline at end of file diff --git a/Modem/main.c b/Modem/main.c index cc04d98..afc87a5 100644 --- a/Modem/main.c +++ b/Modem/main.c @@ -68,7 +68,7 @@ static void init(void) ser_setbaudrate(&ser, 57600); // Create a modem context - afsk_init(&afsk, ADC_CH, 0); + afsk_init(&afsk, ADC_CH); // ... and a protocol context with the modem mp1Init(&mp1, &afsk.fd, mp1Callback); diff --git a/buildrev.h b/buildrev.h index e184b9e..a383596 100644 --- a/buildrev.h +++ b/buildrev.h @@ -1,2 +1,2 @@ -#define VERS_BUILD 377 +#define VERS_BUILD 382 #define VERS_HOST "vixen"