Subversion Repositories MK3Mag

Compare Revisions

Regard whitespace Rev 68 → Rev 69

/trunk/main.c
107,8 → 107,8
 
int16_t Heading = -1; // the current compass heading in deg
int16_t ZeroHeading = 180;
unsigned char InternalCalstate = 0, ActualCalstate = 0;
signed char PotiToFC[8] = {10,20,30,40,50,60,70,80};
uint8_t InternalCalstate = 0, ActualCalstate = 0;
int8_t PotiToFC[8] = {10,20,30,40,50,60,70,80};
 
void CalcFields(void)
{
415,7 → 415,7
#ifdef HEADTRACKER
void CalcFcPotis(void)
{
signed int tmp0, tmp1, tmp2;
int16_t tmp0, tmp1, tmp2;
if(AccPresent)
{
tmp0 = AccAttitudeNick/4;
/trunk/main.h
1,7 → 1,6
#ifndef _MAIN_H_
#define _MAIN_H_
 
#define HEADTRACKER
 
#include <avr/eeprom.h>
#include <inttypes.h>
27,10 → 26,10
 
extern AttitudeSource_t AttitudeSource;
extern Orientation_t Orientation;
extern unsigned char InternalCalstate, ActualCalstate;
extern uint8_t InternalCalstate, ActualCalstate;
 
extern int16_t MagX, MagY, MagZ;
extern signed char PotiToFC[8];
extern int8_t PotiToFC[8];
 
void SetDebugValues(void);
 
/trunk/makefile
5,6 → 5,8
#-------------------------------------------------------------------
#BOARD = 10
BOARD = 11
#OPTION = HEADTRACKER
 
VERSION_MAJOR = 0
VERSION_MINOR = 23
VERSION_PATCH = 0
105,8 → 107,8
CFLAGS += $(CDEFS)
CFLAGS += -DVERSION_MAJOR=$(VERSION_MAJOR) -DVERSION_MINOR=$(VERSION_MINOR) -DVERSION_PATCH=$(VERSION_PATCH) -DVERSION_SERIAL_MAJOR=$(VERSION_SERIAL_MAJOR) -DVERSION_SERIAL_MINOR=$(VERSION_SERIAL_MINOR) -DBOARD=$(BOARD) -DNC_I2C_COMPATIBLE=$(NC_I2C_COMPATIBLE)
 
ifeq ($(AVR_CTRL_PLATINE), 1)
CFLAGS += -DAVR_CTRL_PLATINE=$(AVR_CTRL_PLATINE)
ifeq ($(OPTION), HEADTRACKER)
CFLAGS += -DHEADTRACKER
endif