From 9b435bbd59f26434deb82d411a3762af91e5cf83 Mon Sep 17 00:00:00 2001
From: Mark Qvist <markq@qvistconsult.com>
Date: Thu, 3 Apr 2014 22:41:49 +0200
Subject: [PATCH] Cleanup

---
 Modem/afsk.c   |  5 +---
 Modem/afsk.h   | 10 +++-----
 Modem/config.h | 68 +++-----------------------------------------------
 Modem/main.c   |  2 +-
 buildrev.h     |  2 +-
 5 files changed, 10 insertions(+), 77 deletions(-)

diff --git a/Modem/afsk.c b/Modem/afsk.c
index 5114598..d5936bb 100644
--- a/Modem/afsk.c
+++ b/Modem/afsk.c
@@ -9,8 +9,6 @@
 #define HDLC_RESET 0x7F
 #define AX25_ESC   0x1B
 
-#define LOG_LEVEL   AFSK_LOG_LEVEL
-#define LOG_FORMAT  AFSK_LOG_FORMAT
 #include <cfg/log.h>
 
 #include <cpu/power.h>
@@ -28,7 +26,6 @@
 // Modulator constants
 #define MARK_FREQ  1200
 #define MARK_INC   (uint16_t)(DIV_ROUND(SIN_LEN * (uint32_t)MARK_FREQ, CONFIG_AFSK_DAC_SAMPLERATE))
-
 #define SPACE_FREQ 2200
 #define SPACE_INC  (uint16_t)(DIV_ROUND(SIN_LEN * (uint32_t)SPACE_FREQ, CONFIG_AFSK_DAC_SAMPLERATE))
 
@@ -519,7 +516,7 @@ void afsk_init(Afsk *af, int adc_ch, int dac_ch)
 	AFSK_ADC_INIT(adc_ch, af);
 	AFSK_DAC_INIT(dac_ch, af);
 	AFSK_STROBE_INIT();
-	LOG_INFO("MARK_INC %d, SPACE_INC %d\n", MARK_INC, SPACE_INC);
+	//LOG_INFO("MARK_INC %d, SPACE_INC %d\n", MARK_INC, SPACE_INC);
 
 	DB(af->fd._type = KFT_AFSK);
 	af->fd.write = afsk_write;
diff --git a/Modem/afsk.h b/Modem/afsk.h
index 51c4686..3288aae 100644
--- a/Modem/afsk.h
+++ b/Modem/afsk.h
@@ -1,14 +1,12 @@
 
-#ifndef NET_AFSK_H
-#define NET_AFSK_H
+#ifndef FSK_MODEM_H
+#define FSK_MODEM_H
 
-#include "cfg/cfg_afsk.h"
-#include "hw/hw_afsk.h"
+#include "config.h"
+#include "hardware.h"
 
 #include <cfg/compiler.h>
-
 #include <io/kfile.h>
-
 #include <struct/fifobuf.h>
 
 
diff --git a/Modem/config.h b/Modem/config.h
index c051ab1..3dc7801 100644
--- a/Modem/config.h
+++ b/Modem/config.h
@@ -1,77 +1,15 @@
 
-#ifndef CFG_AFSK_H
-#define CFG_AFSK_H
+#ifndef FSK_CFG
+#define FSK_CFG
 
-/**
- * Module logging level.
- *
- * $WIZ$ type = "enum"
- * $WIZ$ value_list = "log_level"
- */
-//#define AFSK_LOG_LEVEL      LOG_LVL_WARN
-
-/**
- * Module logging format.
- *
- * $WIZ$ type = "enum"
- * $WIZ$ value_list = "log_format"
- */
-#define AFSK_LOG_FORMAT     LOG_FMT_TERSE
-
-
-/**
- * AFSK discriminator filter type.
- *
- * $WIZ$ type = "enum"; value_list = "afsk_filter_list"
- */
 #define CONFIG_AFSK_FILTER AFSK_CHEBYSHEV
-
-
-/**
- * AFSK receiver buffer length.
- *
- * $WIZ$ type = "int"
- * $WIZ$ min = 2
- */
 #define CONFIG_AFSK_RX_BUFLEN 64
-
-/**
- * AFSK transimtter buffer length.
- *
- * $WIZ$ type = "int"
- * $WIZ$ min = 2
- */
 #define CONFIG_AFSK_TX_BUFLEN 64
-
-/**
- * AFSK DAC sample rate for modem outout.
- * $WIZ$ type = "int"
- * $WIZ$ min = 2400
- */
 #define CONFIG_AFSK_DAC_SAMPLERATE 9600
-
-/**
- * AFSK RX timeout in ms, set to -1 to disable.
- * $WIZ$ type = "int"
- * $WIZ$ min = -1
- */
 #define CONFIG_AFSK_RXTIMEOUT 0
 
 
-/**
- * AFSK Preamble length in [ms], before starting transmissions.
- * $WIZ$ type = "int"
- * $WIZ$ min = 1
- */
 #define CONFIG_AFSK_PREAMBLE_LEN 300UL
-
-
-
-/**
- * AFSK Trailer length in [ms], before stopping transmissions.
- * $WIZ$ type = "int"
- * $WIZ$ min = 1
- */
 #define CONFIG_AFSK_TRAILER_LEN 50UL
 
-#endif /* CFG_AFSK_H */
+#endif
\ No newline at end of file
diff --git a/Modem/main.c b/Modem/main.c
index 3722b3e..834b3fb 100644
--- a/Modem/main.c
+++ b/Modem/main.c
@@ -40,4 +40,4 @@ int main(void)
 		}
 	}
 	return 0;
-}
+}
\ No newline at end of file
diff --git a/buildrev.h b/buildrev.h
index 1186ae7..59edb03 100644
--- a/buildrev.h
+++ b/buildrev.h
@@ -1,2 +1,2 @@
-#define VERS_BUILD 10
+#define VERS_BUILD 30
 #define VERS_HOST  "vixen"