From 7988098e81d2c5df2c9bb63c9f8279cbe9472e10 Mon Sep 17 00:00:00 2001
From: DigitalConfections <support@digitalconfections.com>
Date: Wed, 24 Jun 2020 21:46:25 -0400
Subject: [PATCH] Cleanup

o Fixes compile switch logic
---
 Arduino-microfox/Arduino-microfox.ino |  8 ++++----
 Arduino-microfox/defs.h               | 20 ++++++++++----------
 Arduino-microfox/linkbus.cpp          |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Arduino-microfox/Arduino-microfox.ino b/Arduino-microfox/Arduino-microfox.ino
index 3082271..33dcb32 100644
--- a/Arduino-microfox/Arduino-microfox.ino
+++ b/Arduino-microfox/Arduino-microfox.ino
@@ -34,7 +34,7 @@
 #include "morse.h"
 #include <avr/wdt.h>
 
-#ifdef COMPILE_FOR_ATMELSTUDIO7
+#if COMPILE_FOR_ATMELSTUDIO7
 #include <avr/io.h>
 #include <avr/eeprom.h>
 #include <string.h>
@@ -76,7 +76,7 @@ volatile int16_t g_sync_pin_timer = 0;
 volatile BOOL g_sync_pin_stable = FALSE;
 volatile BOOL g_sync_enabled = TRUE;
 
-#ifndef COMPILE_FOR_ATMELSTUDIO7
+#if !COMPILE_FOR_ATMELSTUDIO7
 	FoxType& operator++ (FoxType & orig)
 	{
 		orig = static_cast < FoxType > (orig + 1);  /* static_cast required because enum + int -> int */
@@ -169,7 +169,7 @@ void playStartingTone(uint8_t toneFreq);
 void wdt_init(WDReset resetType);
 void doSynchronization(void);
 
-#ifdef COMPILE_FOR_ATMELSTUDIO7
+#if COMPILE_FOR_ATMELSTUDIO7
 	void loop(void);
 	int main(void)
 #else
@@ -344,7 +344,7 @@ void doSynchronization(void);
 
 	wdt_init(WD_HW_RESETS);
 
-#ifdef COMPILE_FOR_ATMELSTUDIO7
+#if COMPILE_FOR_ATMELSTUDIO7
 		while(1)
 		{
 			loop();
diff --git a/Arduino-microfox/defs.h b/Arduino-microfox/defs.h
index 23df6c6..56a25ef 100644
--- a/Arduino-microfox/defs.h
+++ b/Arduino-microfox/defs.h
@@ -26,11 +26,19 @@
 #ifndef DEFS_H
 #define DEFS_H
 
-// #define COMPILE_FOR_ATMELSTUDIO7
+#ifndef FALSE
+#define FALSE 0
+#endif
+
+#ifndef TRUE
+#define TRUE !FALSE
+#endif
+
+#define COMPILE_FOR_ATMELSTUDIO7 FALSE
 #define HARDWARE_EXTERNAL_DIP_PULLUPS_INSTALLED FALSE
 #define CAL_SIGNAL_ON_PD3 FALSE
 
-#ifdef COMPILE_FOR_ATMELSTUDIO7
+#if COMPILE_FOR_ATMELSTUDIO7
 	#include <avr/io.h>
 	#include <util/delay.h>
 	#include <avr/interrupt.h>
@@ -163,14 +171,6 @@ typedef enum
 #define EEPROM_ENABLE_LEDS_DEFAULT 1
 #define EEPROM_ENABLE_STARTTIMER_DEFAULT 1
 
-#ifndef FALSE
-   #define FALSE 0
-#endif
-
-#ifndef TRUE
-   #define TRUE !FALSE
-#endif
-
 #ifndef BOOL
 	typedef uint8_t BOOL;
 #endif
diff --git a/Arduino-microfox/linkbus.cpp b/Arduino-microfox/linkbus.cpp
index 2709b8a..35b4096 100644
--- a/Arduino-microfox/linkbus.cpp
+++ b/Arduino-microfox/linkbus.cpp
@@ -28,7 +28,7 @@
 #include "linkbus.h"
 #include "defs.h"
 
-#ifdef COMPILE_FOR_ATMELSTUDIO7
+#if COMPILE_FOR_ATMELSTUDIO7
 #include <string.h>
 #include <stdio.h>
 #endif  /* COMPILE_FOR_ATMELSTUDIO7 */