Subversion Repositories MK3Mag

Compare Revisions

Ignore whitespace Rev 46 → Rev 47

/trunk/makefile
9,7 → 9,8
VERSION_MINOR = 19
VERSION_PATCH = 1
 
VERSION_SERIAL_COMPATIBLE = 10 # Serial Protocol Version
VERSION_SERIAL_MAJOR = 10 # Serial Protocol Major Version
VERSION_SERIAL_MINOR = 0 # Serial Protocol Minor Version
NC_I2C_COMPATIBLE = 2 # I2C Protocol Version
#-------------------------------------------------------------------
 
102,7 → 103,7
#CFLAGS += -std=c99
CFLAGS += -std=gnu99
CFLAGS += $(CDEFS)
CFLAGS += -DVERSION_MAJOR=$(VERSION_MAJOR) -DVERSION_MINOR=$(VERSION_MINOR) -DVERSION_PATCH=$(VERSION_PATCH) -DVERSION_SERIAL_COMPATIBLE=$(VERSION_SERIAL_COMPATIBLE) -DBOARD=$(BOARD) -DNC_I2C_COMPATIBLE=$(NC_I2C_COMPATIBLE)
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)
/trunk/uart.c
219,10 → 219,11
txd_complete = TRUE;
 
 
UART_VersionInfo.Major = VERSION_MAJOR;
UART_VersionInfo.Minor = VERSION_MINOR;
UART_VersionInfo.Patch = VERSION_PATCH;
UART_VersionInfo.Compatible = VERSION_SERIAL_COMPATIBLE;
UART_VersionInfo.SWMajor = VERSION_MAJOR;
UART_VersionInfo.SWMinor = VERSION_MINOR;
UART_VersionInfo.SWPatch = VERSION_PATCH;
UART_VersionInfo.ProtoMajor = VERSION_SERIAL_MAJOR;
UART_VersionInfo.ProtoMinor = VERSION_SERIAL_MINOR;
 
// Version beim Start ausgeben (nicht schön, aber geht... )
USART0_putchar ('\n');
/trunk/uart.h
62,11 → 62,12
 
typedef struct
{
uint8_t Major;
uint8_t Minor;
uint8_t Patch;
uint8_t Compatible;
uint8_t Reserved[6];
uint8_t SWMajor;
uint8_t SWMinor;
uint8_t ProtoMajor;
uint8_t ProtoMinor;
uint8_t SWPatch;
uint8_t Reserved[5];
} UART_VersionInfo_t;
 
extern uint8_t PC_Connected;