o Fixes compile switch logic
pull/15/head^2
DigitalConfections 2020-06-24 21:46:25 -04:00
rodzic d0f7726b16
commit 7988098e81
3 zmienionych plików z 15 dodań i 15 usunięć

Wyświetl plik

@ -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();

Wyświetl plik

@ -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

Wyświetl plik

@ -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 */