commit
b5849b413f
|
@ -34,7 +34,7 @@
|
||||||
#include "morse.h"
|
#include "morse.h"
|
||||||
#include <avr/wdt.h>
|
#include <avr/wdt.h>
|
||||||
|
|
||||||
#ifdef COMPILE_FOR_ATMELSTUDIO7
|
#if COMPILE_FOR_ATMELSTUDIO7
|
||||||
#include <avr/io.h>
|
#include <avr/io.h>
|
||||||
#include <avr/eeprom.h>
|
#include <avr/eeprom.h>
|
||||||
#include <string.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_pin_stable = FALSE;
|
||||||
volatile BOOL g_sync_enabled = TRUE;
|
volatile BOOL g_sync_enabled = TRUE;
|
||||||
|
|
||||||
#ifndef COMPILE_FOR_ATMELSTUDIO7
|
#if !COMPILE_FOR_ATMELSTUDIO7
|
||||||
FoxType& operator++ (FoxType & orig)
|
FoxType& operator++ (FoxType & orig)
|
||||||
{
|
{
|
||||||
orig = static_cast < FoxType > (orig + 1); /* static_cast required because enum + int -> int */
|
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 wdt_init(WDReset resetType);
|
||||||
void doSynchronization(void);
|
void doSynchronization(void);
|
||||||
|
|
||||||
#ifdef COMPILE_FOR_ATMELSTUDIO7
|
#if COMPILE_FOR_ATMELSTUDIO7
|
||||||
void loop(void);
|
void loop(void);
|
||||||
int main(void)
|
int main(void)
|
||||||
#else
|
#else
|
||||||
|
@ -344,7 +344,7 @@ void doSynchronization(void);
|
||||||
|
|
||||||
wdt_init(WD_HW_RESETS);
|
wdt_init(WD_HW_RESETS);
|
||||||
|
|
||||||
#ifdef COMPILE_FOR_ATMELSTUDIO7
|
#if COMPILE_FOR_ATMELSTUDIO7
|
||||||
while(1)
|
while(1)
|
||||||
{
|
{
|
||||||
loop();
|
loop();
|
||||||
|
|
|
@ -26,11 +26,19 @@
|
||||||
#ifndef DEFS_H
|
#ifndef DEFS_H
|
||||||
#define 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 HARDWARE_EXTERNAL_DIP_PULLUPS_INSTALLED FALSE
|
||||||
#define CAL_SIGNAL_ON_PD3 FALSE
|
#define CAL_SIGNAL_ON_PD3 FALSE
|
||||||
|
|
||||||
#ifdef COMPILE_FOR_ATMELSTUDIO7
|
#if COMPILE_FOR_ATMELSTUDIO7
|
||||||
#include <avr/io.h>
|
#include <avr/io.h>
|
||||||
#include <util/delay.h>
|
#include <util/delay.h>
|
||||||
#include <avr/interrupt.h>
|
#include <avr/interrupt.h>
|
||||||
|
@ -163,14 +171,6 @@ typedef enum
|
||||||
#define EEPROM_ENABLE_LEDS_DEFAULT 1
|
#define EEPROM_ENABLE_LEDS_DEFAULT 1
|
||||||
#define EEPROM_ENABLE_STARTTIMER_DEFAULT 1
|
#define EEPROM_ENABLE_STARTTIMER_DEFAULT 1
|
||||||
|
|
||||||
#ifndef FALSE
|
|
||||||
#define FALSE 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef TRUE
|
|
||||||
#define TRUE !FALSE
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef BOOL
|
#ifndef BOOL
|
||||||
typedef uint8_t BOOL;
|
typedef uint8_t BOOL;
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
#include "linkbus.h"
|
#include "linkbus.h"
|
||||||
#include "defs.h"
|
#include "defs.h"
|
||||||
|
|
||||||
#ifdef COMPILE_FOR_ATMELSTUDIO7
|
#if COMPILE_FOR_ATMELSTUDIO7
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#endif /* COMPILE_FOR_ATMELSTUDIO7 */
|
#endif /* COMPILE_FOR_ATMELSTUDIO7 */
|
||||||
|
|
Ładowanie…
Reference in New Issue