From 90353f214f810042f6f24f012203b69775ad9b8a Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Fri, 19 Oct 2018 20:20:36 -0400
Subject: [PATCH] library conflict _reset corrected

---
 Makefile      | 2 +-
 afsk/ax5043.c | 4 ++--
 afsk/ax5043.h | 2 +-
 cw/cw_main.c  | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 174102fb..df539a65 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ radiocw: cw/cw_main.o
 radiocw: afsk/ax25.o
 radiocw: afsk/ax5043.o
 radiocw: afsk/send_afsk.o
-	gcc -o radiocw -pedantic -Wall -Wextra -L./ afsk/ax5043.o cw/cw_main.o -lwiringPi -lax5043
+	gcc -o radiocw -L./ afsk/ax25.o afsk/ax5043.o afsk/send_afsk.o cw/cw_main.o -lwiringPi -lax5043
 
 radiopiglatin: libax5043.a
 radiopiglatin: piglatin/piglatin_main.o
diff --git a/afsk/ax5043.c b/afsk/ax5043.c
index a6763050..2beb4d66 100644
--- a/afsk/ax5043.c
+++ b/afsk/ax5043.c
@@ -77,7 +77,7 @@ static uint8_t is_ax5043_conf_valid(ax5043_conf_t *conf) {
  * @param conf the AX5043 configuration handler
  * @return 0 on success or appropriate negative error code
  */
-int ax5043_reset(ax5043_conf_t *conf) {
+int ax5043_reset_a(ax5043_conf_t *conf) {
     int ret;
     uint8_t val;
 
@@ -152,7 +152,7 @@ int ax5043_init(ax5043_conf_t *conf, uint32_t f_xtal, vco_mode_t vco) {
         conf->f_xtaldiv = 1;
     }
 
-    ret = ax5043_reset(conf);
+    ret = ax5043_reset_a(conf);
     if (ret) {
         return ret;
     }
diff --git a/afsk/ax5043.h b/afsk/ax5043.h
index 855466cc..60f47ef8 100644
--- a/afsk/ax5043.h
+++ b/afsk/ax5043.h
@@ -527,7 +527,7 @@ typedef struct {
     vco_mode_t vco;
 } ax5043_conf_t;
 
-int ax5043_reset(ax5043_conf_t *conf);
+int ax5043_reset_a(ax5043_conf_t *conf);
 
 int ax5043_init(ax5043_conf_t *conf, uint32_t f_xtal, vco_mode_t vco);
 
diff --git a/cw/cw_main.c b/cw/cw_main.c
index e1bd33e2..1b32f635 100644
--- a/cw/cw_main.c
+++ b/cw/cw_main.c
@@ -1,6 +1,5 @@
 // Sends CubeSatSim telemetry encoded as CW (Morse Code) using AO-7 format
 //
-//
 // Portions Copyright (c) 2018 Brandenburg Tech, LLC
 // All right reserved.
 //