Vladimir N. Shilov před 5 roky
rodič
revize
a9007a936c
6 změnil soubory, kde provedl 761 přidání a 35 odebrání
  1. 4 0
      .gitignore
  2. 657 0
      Makefile
  3. 30 11
      main.c
  4. 51 12
      main.h
  5. 14 12
      twim.c
  6. 5 0
      twim.h

+ 4 - 0
.gitignore

@@ -21,3 +21,7 @@ Backup*
 
 # IAR .dep files
 *.dep
+
+*.log
+bin/
+obj/

+ 657 - 0
Makefile

@@ -0,0 +1,657 @@
+# Hey Emacs, this is a -*- makefile -*-
+#----------------------------------------------------------------------------
+# WinAVR Makefile Template written by Eric B. Weddington, Jörg Wunsch, et al.
+#
+# Released to the Public Domain
+#
+# Additional material for this makefile was written by:
+# Peter Fleury
+# Tim Henigan
+# Colin O'Flynn
+# Reiner Patommel
+# Markus Pfaff
+# Sander Pool
+# Frederik Rouleau
+# Carlos Lamas
+#
+#----------------------------------------------------------------------------
+# On command line:
+#
+# make all = Make software.
+#
+# make clean = Clean out built project files.
+#
+# make coff = Convert ELF to AVR COFF.
+#
+# make extcoff = Convert ELF to AVR Extended COFF.
+#
+# make program = Download the hex file to the device, using avrdude.
+#                Please customize the avrdude settings below first!
+#
+# make debug = Start either simulavr or avarice as specified for debugging,
+#              with avr-gdb or avr-insight as the front end for debugging.
+#
+# make filename.s = Just compile filename.c into the assembler code only.
+#
+# make filename.i = Create a preprocessed source file for use in submitting
+#                   bug reports to the GCC project.
+#
+# To rebuild project do "make clean" then "make all".
+#----------------------------------------------------------------------------
+
+
+# MCU name
+MCU = atmega8a
+
+
+# Processor frequency.
+#     This will define a symbol, F_CPU, in all source code files equal to the
+#     processor frequency. You can then use this symbol in your source code to
+#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
+#     automatically to create a 32-bit value in your source code.
+#     Typical values are:
+#         F_CPU =  1000000
+#         F_CPU =  1843200
+#         F_CPU =  2000000
+#         F_CPU =  3686400
+#         F_CPU =  4000000
+#         F_CPU =  7372800
+#         F_CPU =  8000000
+#         F_CPU = 11059200
+#         F_CPU = 14745600
+#         F_CPU = 16000000
+#         F_CPU = 18432000
+#         F_CPU = 20000000
+F_CPU = 8000000
+
+
+# Output format. (can be srec, ihex, binary)
+FORMAT = ihex
+
+
+# Target file name (without extension).
+TARGET = megaclock
+
+
+# Object files directory
+#     To put object files in current directory, use a dot (.), do NOT make
+#     this an empty or blank macro!
+OBJDIR = ./obj
+
+
+# Binary files directory
+#     To put object files in current directory, use a dot (.), do NOT make
+#     this an empty or blank macro!
+BINDIR = ./bin
+
+
+# List C source files here. (C dependencies are automatically generated.)
+SRC = main.c
+SRC += twim.c
+
+
+# List C++ source files here. (C dependencies are automatically generated.)
+CPPSRC =
+
+
+# List Assembler source files here.
+#     Make them always end in a capital .S.  Files ending in a lowercase .s
+#     will not be considered source files but generated files (assembler
+#     output from the compiler), and will be deleted upon "make clean"!
+#     Even though the DOS/Win* filesystem matches both .s and .S the same,
+#     it will preserve the spelling of the filenames, and gcc itself does
+#     care about how the name is spelled on its command-line.
+ASRC =
+
+
+# Optimization level, can be [0, 1, 2, 3, s].
+#     0 = turn off optimization. s = optimize for size.
+#     (Note: 3 is not always the best optimization level. See avr-libc FAQ.)
+OPT = s
+
+
+# Debugging format.
+#     Native formats for AVR-GCC's -g are dwarf-2 [default] or stabs.
+#     AVR Studio 4.10 requires dwarf-2.
+#     AVR [Extended] COFF format requires stabs, plus an avr-objcopy run.
+DEBUG = dwarf-2
+
+
+# List any extra directories to look for include files here.
+#     Each directory must be seperated by a space.
+#     Use forward slashes for directory separators.
+#     For a directory that has spaces, enclose it in quotes.
+EXTRAINCDIRS = 
+
+
+# Compiler flag to set the C Standard level.
+#     c89   = "ANSI" C
+#     gnu89 = c89 plus GCC extensions
+#     c99   = ISO C99 standard (not yet fully implemented)
+#     gnu99 = c99 plus GCC extensions
+CSTANDARD = -std=gnu99
+
+
+# Place -D or -U options here for C sources
+CDEFS = -DF_CPU=$(F_CPU)UL
+
+
+# Place -D or -U options here for ASM sources
+ADEFS = -DF_CPU=$(F_CPU)
+
+
+# Place -D or -U options here for C++ sources
+CPPDEFS = -DF_CPU=$(F_CPU)UL
+#CPPDEFS += -D__STDC_LIMIT_MACROS
+#CPPDEFS += -D__STDC_CONSTANT_MACROS
+
+
+
+#---------------- Compiler Options C ----------------
+#  -g*:          generate debugging information
+#  -O*:          optimization level
+#  -f...:        tuning, see GCC manual and avr-libc documentation
+#  -Wall...:     warning level
+#  -Wa,...:      tell GCC to pass this to the assembler.
+#    -adhlns...: create assembler listing
+CFLAGS = -g$(DEBUG)
+CFLAGS += $(CDEFS)
+CFLAGS += -O$(OPT)
+CFLAGS += -funsigned-char
+CFLAGS += -funsigned-bitfields
+CFLAGS += -fshort-enums
+CFLAGS += -ffunction-sections
+CFLAGS += -fdata-sections
+CFLAGS += -ffreestanding
+CFLAGS += -mrelax
+#CFLAGS += -fno-ivopts
+#CFLAGS += -fwhole-program
+#CFLAGS += -mcall-prologues
+#CFLAGS += -fno-split-wide-types
+CFLAGS += -W -Wall -Wextra -Wstrict-prototypes -Wundef -Werror
+#CFLAGS += -Wunreachable-code
+#CFLAGS += -Wsign-compare
+CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
+CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
+CFLAGS += $(CSTANDARD)
+
+
+#---------------- Compiler Options C++ ----------------
+#  -g*:          generate debugging information
+#  -O*:          optimization level
+#  -f...:        tuning, see GCC manual and avr-libc documentation
+#  -Wall...:     warning level
+#  -Wa,...:      tell GCC to pass this to the assembler.
+#    -adhlns...: create assembler listing
+CPPFLAGS = -g$(DEBUG)
+CPPFLAGS += $(CPPDEFS)
+CPPFLAGS += -O$(OPT)
+CPPFLAGS += -funsigned-char
+CPPFLAGS += -funsigned-bitfields
+CPPFLAGS += -fpack-struct
+CPPFLAGS += -fshort-enums
+CPPFLAGS += -fno-exceptions
+CPPFLAGS += -Wall
+CPPFLAGS += -Wundef
+#CPPFLAGS += -mshort-calls
+#CPPFLAGS += -ffunction-sections
+#CPPFLAGS += -fdata-sections
+#CPPFLAGS += -mcall-prologues
+#CPPFLAGS += -fno-unit-at-a-time
+#CPPFLAGS += --param inline-call-cost=1
+#CPPFLAGS += -fno-split-wide-types
+#CPPFLAGS += -Wstrict-prototypes
+#CPPFLAGS += -Wunreachable-code
+#CPPFLAGS += -Wsign-compare
+#CPPFLAGS += -fvtable-gc
+CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)
+CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
+#CPPFLAGS += $(CSTANDARD)
+
+
+#---------------- Assembler Options ----------------
+#  -Wa,...:   tell GCC to pass this to the assembler.
+#  -adhlns:   create listing
+#  -gstabs:   have the assembler create line number information; note that
+#             for use in COFF files, additional information about filenames
+#             and function names needs to be present in the assembler source
+#             files -- see avr-libc docs [FIXME: not yet described there]
+#  -listing-cont-lines: Sets the maximum number of continuation lines of hex
+#       dump that will be displayed for a given single line of source input.
+ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gdwarf-2,--listing-cont-lines=100
+#ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100
+
+
+#---------------- Library Options ----------------
+# Minimalistic printf version
+PRINTF_LIB_MIN = -Wl,-u,vfprintf -lprintf_min
+
+# Floating point printf version (requires MATH_LIB = -lm below)
+PRINTF_LIB_FLOAT = -Wl,-u,vfprintf -lprintf_flt
+
+# If this is left blank, then it will use the Standard printf version.
+PRINTF_LIB =
+#PRINTF_LIB = $(PRINTF_LIB_MIN)
+#PRINTF_LIB = $(PRINTF_LIB_FLOAT)
+
+
+# Minimalistic scanf version
+SCANF_LIB_MIN = -Wl,-u,vfscanf -lscanf_min
+
+# Floating point + %[ scanf version (requires MATH_LIB = -lm below)
+SCANF_LIB_FLOAT = -Wl,-u,vfscanf -lscanf_flt
+
+# If this is left blank, then it will use the Standard scanf version.
+SCANF_LIB =
+#SCANF_LIB = $(SCANF_LIB_MIN)
+#SCANF_LIB = $(SCANF_LIB_FLOAT)
+
+
+MATH_LIB = -lm
+
+
+# List any extra directories to look for libraries here.
+#     Each directory must be seperated by a space.
+#     Use forward slashes for directory separators.
+#     For a directory that has spaces, enclose it in quotes.
+EXTRALIBDIRS =
+
+
+
+#---------------- External Memory Options ----------------
+
+# 64 KB of external RAM, starting after internal RAM (ATmega128!),
+# used for variables (.data/.bss) and heap (malloc()).
+#EXTMEMOPTS = -Wl,-Tdata=0x801100,--defsym=__heap_end=0x80ffff
+
+# 64 KB of external RAM, starting after internal RAM (ATmega128!),
+# only used for heap (malloc()).
+#EXTMEMOPTS = -Wl,--section-start,.data=0x801100,--defsym=__heap_end=0x80ffff
+
+EXTMEMOPTS =
+
+
+
+#---------------- Linker Options ----------------
+#  -Wl,...:     tell GCC to pass this to linker.
+#    -Map:      create map file
+#    --cref:    add cross reference to  map file
+LDFLAGS = -Wl,-Map=$(BINDIR)/$(TARGET).map,--cref
+#LDFLAGS += -Wl,-static
+LDFLAGS += -Wl,-gc-sections
+#LDFLAGS += -Wl,-s
+#LDFLAGS += -Wl,-relax
+LDFLAGS += $(EXTMEMOPTS)
+LDFLAGS += $(patsubst %,-L%,$(EXTRALIBDIRS))
+LDFLAGS += $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB)
+#LDFLAGS += -T $(TARGET).ld
+
+
+
+#---------------- Programming Options (avrdude) ----------------
+
+# Programming hardware
+# Type: avrdude -c ?
+# to get a full listing.
+#
+AVRDUDE_PROGRAMMER = usbasp
+#AVRDUDE_PROGRAMMER = avr910
+
+# com1 = serial port. Use lpt1 to connect to parallel port.
+#AVRDUDE_PORT = com3    # programmer connected to serial device
+AVRDUDE_PORT = usb	# programmer connected to serial device
+
+# set com port baudrate
+#AVRDUDE_COM_BAUD = -b 115200
+
+AVRDUDE_WRITE_FLASH = -U flash:w:$(BINDIR)/$(TARGET).hex
+#AVRDUDE_WRITE_EEPROM = -U eeprom:w:$(BINDIR)/$(TARGET).eep
+
+
+# Uncomment the following if you want avrdude's erase cycle counter.
+# Note that this counter needs to be initialized first using -Yn,
+# see avrdude manual.
+AVRDUDE_ERASE_COUNTER = -y
+
+# Uncomment the following if you do /not/ wish a verification to be
+# performed after programming the device.
+AVRDUDE_NO_VERIFY = -V
+
+AVRDUDE_MCU = m164p
+#AVRDUDE_MCU = $(MCU)
+
+# Increase verbosity level.  Please use this when submitting bug
+# reports about avrdude. See <http://savannah.nongnu.org/projects/avrdude>
+# to submit bug reports.
+#AVRDUDE_VERBOSE = -v -v
+
+AVRDUDE_FLAGS = -p $(AVRDUDE_MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER)
+AVRDUDE_FLAGS += $(AVRDUDE_COM_BAUD)
+AVRDUDE_FLAGS += $(AVRDUDE_NO_VERIFY)
+AVRDUDE_FLAGS += $(AVRDUDE_VERBOSE)
+AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER)
+
+
+
+#---------------- Debugging Options ----------------
+
+# For simulavr only - target MCU frequency.
+DEBUG_MFREQ = $(F_CPU)
+
+# Set the DEBUG_UI to either gdb or insight.
+# DEBUG_UI = gdb
+DEBUG_UI = insight
+
+# Set the debugging back-end to either avarice, simulavr.
+#DEBUG_BACKEND = avarice
+DEBUG_BACKEND = simulavr
+
+# GDB Init Filename.
+GDBINIT_FILE = __avr_gdbinit
+
+# When using avarice settings for the JTAG
+JTAG_DEV = /dev/com1
+
+# Debugging port used to communicate between GDB / avarice / simulavr.
+DEBUG_PORT = 4242
+
+# Debugging host used to communicate between GDB / avarice / simulavr, normally
+#     just set to localhost unless doing some sort of crazy debugging when
+#     avarice is running on a different computer.
+DEBUG_HOST = localhost
+
+
+
+#============================================================================
+
+
+# Define programs and commands.
+SHELL = sh
+GCCPATH = C:/mcu/avr-gcc/bin
+CC = $(GCCPATH)/avr-gcc
+OBJCOPY = $(GCCPATH)/avr-objcopy
+OBJDUMP = $(GCCPATH)/avr-objdump
+SIZE = $(GCCPATH)/avr-size
+AR = $(GCCPATH)/avr-ar rcs
+NM = $(GCCPATH)/avr-nm
+AVRDUDE = avrdude
+REMOVE = rm -f
+REMOVEDIR = rm -rf
+COPY = cp
+WINSHELL = cmd
+
+
+# Define Messages
+# English
+MSG_ERRORS_NONE = Errors: none
+MSG_BEGIN = -------- begin --------
+MSG_END = --------  end  --------
+MSG_SIZE_BEFORE = Size before:
+MSG_SIZE_AFTER = Size after:
+MSG_COFF = Converting to AVR COFF:
+MSG_EXTENDED_COFF = Converting to AVR Extended COFF:
+MSG_FLASH = Creating load file for Flash:
+MSG_EEPROM = Creating load file for EEPROM:
+MSG_EXTENDED_LISTING = Creating Extended Listing:
+MSG_SYMBOL_TABLE = Creating Symbol Table:
+MSG_LINKING = Linking:
+MSG_COMPILING = Compiling C:
+MSG_COMPILING_CPP = Compiling C++:
+MSG_ASSEMBLING = Assembling:
+MSG_CLEANING = Cleaning project:
+MSG_CREATING_LIBRARY = Creating library:
+
+
+
+
+# Define all object files.
+OBJ = $(SRC:%.c=$(OBJDIR)/%.o) $(CPPSRC:%.cpp=$(OBJDIR)/%.o) $(ASRC:%.S=$(OBJDIR)/%.o)
+
+# Define all listing files.
+LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OBJDIR)/%.lst)
+
+
+# Compiler flags to generate dependency files.
+GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d
+
+
+# Combine all necessary flags and optional flags.
+# Add target processor to flags.
+ALL_CFLAGS = -mmcu=$(MCU) -I. $(CFLAGS) $(GENDEPFLAGS)
+ALL_CPPFLAGS = -mmcu=$(MCU) -I. -x c++ $(CPPFLAGS) $(GENDEPFLAGS)
+ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
+
+
+
+
+
+# Default target.
+all: begin gccversion sizebefore build sizeafter end
+
+# Change the build target to build a HEX file or a library.
+build: elf hex eep lss sym
+#build: lib
+
+
+elf: $(BINDIR)/$(TARGET).elf
+hex: $(BINDIR)/$(TARGET).hex
+eep: $(BINDIR)/$(TARGET).eep
+lss: $(BINDIR)/$(TARGET).lss
+sym: $(BINDIR)/$(TARGET).sym
+LIBNAME=$(BINDIR)/lib$(TARGET).a
+lib: $(LIBNAME)
+
+
+
+# Eye candy.
+# AVR Studio 3.x does not check make's exit code but relies on
+# the following magic strings to be generated by the compile job.
+begin:
+	@echo
+	@echo $(MSG_BEGIN)
+
+end:
+	@echo $(MSG_END)
+	@echo
+
+
+# Display size of file.
+HEXSIZE = $(SIZE) --target=$(FORMAT) $(BINDIR)/$(TARGET).hex
+ELFSIZE = $(SIZE) --target=elf32-avr $(BINDIR)/$(TARGET).elf
+
+sizebefore:
+	@if test -f $(BINDIR)/$(TARGET).elf; then echo; echo $(MSG_SIZE_BEFORE); $(ELFSIZE); \
+	2>/dev/null; echo; fi
+
+sizeafter:
+	@if test -f $(BINDIR)/$(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \
+	2>/dev/null; echo; fi
+
+
+
+# Display compiler version information.
+gccversion :
+	@$(CC) --version
+
+
+
+# Program the device.
+program: $(BINDIR)/$(TARGET).hex $(BINDIR)/$(TARGET).eep
+	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)
+
+
+# Generate avr-gdb config/init file which does the following:
+#     define the reset signal, load the target file, connect to target, and set
+#     a breakpoint at main().
+gdb-config:
+	@$(REMOVE) $(GDBINIT_FILE)
+	@echo define reset >> $(GDBINIT_FILE)
+	@echo SIGNAL SIGHUP >> $(GDBINIT_FILE)
+	@echo end >> $(GDBINIT_FILE)
+	@echo file $(BINDIR)/$(TARGET).elf >> $(GDBINIT_FILE)
+	@echo target remote $(DEBUG_HOST):$(DEBUG_PORT)  >> $(GDBINIT_FILE)
+ifeq ($(DEBUG_BACKEND),simulavr)
+	@echo load  >> $(GDBINIT_FILE)
+endif
+	@echo break main >> $(GDBINIT_FILE)
+
+debug: gdb-config $(BINDIR)/$(TARGET).elf
+ifeq ($(DEBUG_BACKEND), avarice)
+	@echo Starting AVaRICE - Press enter when "waiting to connect" message displays.
+	@$(WINSHELL) /c start avarice --jtag $(JTAG_DEV) --erase --program --file \
+	$(BINDIR)/$(TARGET).elf $(DEBUG_HOST):$(DEBUG_PORT)
+	@$(WINSHELL) /c pause
+
+else
+	@$(WINSHELL) /c start simulavr --gdbserver --device $(MCU) --clock-freq \
+	$(DEBUG_MFREQ) --port $(DEBUG_PORT)
+endif
+	@$(WINSHELL) /c start avr-$(DEBUG_UI) --command=$(GDBINIT_FILE)
+
+
+
+
+# Convert ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB.
+COFFCONVERT = $(OBJCOPY) --debugging
+COFFCONVERT += --change-section-address .data-0x800000
+COFFCONVERT += --change-section-address .bss-0x800000
+COFFCONVERT += --change-section-address .noinit-0x800000
+COFFCONVERT += --change-section-address .eeprom-0x810000
+
+
+
+coff: $(BINDIR)/$(TARGET).elf
+	@echo
+	@echo $(MSG_COFF) $(BINDIR)/$(TARGET).cof
+	$(COFFCONVERT) -O coff-avr $< $(BINDIR)/$(TARGET).cof
+
+
+extcoff: $(BINDIR)/$(TARGET).elf
+	@echo
+	@echo $(MSG_EXTENDED_COFF) $(BINDIR)/$(TARGET).cof
+	$(COFFCONVERT) -O coff-ext-avr $< $(BINDIR)/$(TARGET).cof
+
+
+
+# Create final output files (.hex, .eep) from ELF output file.
+%.hex: %.elf
+	@echo
+	@echo $(MSG_FLASH) $@
+	$(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature $< $@
+
+%.eep: %.elf
+	@echo
+	@echo $(MSG_EEPROM) $@
+	-$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
+	--change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT) $< $@ || exit 0
+
+# Create extended listing file from ELF output file.
+%.lss: %.elf
+	@echo
+	@echo $(MSG_EXTENDED_LISTING) $@
+	$(OBJDUMP) -h -S -z $< > $@
+
+# Create a symbol table from ELF output file.
+%.sym: %.elf
+	@echo
+	@echo $(MSG_SYMBOL_TABLE) $@
+	$(NM) -n $< > $@
+
+
+
+# Create library from object files.
+.SECONDARY : $(BINDIR)/$(TARGET).a
+.PRECIOUS : $(OBJ)
+%.a: $(OBJ)
+	@echo
+	@echo $(MSG_CREATING_LIBRARY) $@
+	$(AR) $@ $(OBJ)
+
+
+# Link: create ELF output file from object files.
+.SECONDARY : $(BINDIR)/$(TARGET).elf
+.PRECIOUS : $(OBJ)
+%.elf: $(OBJ)
+	@echo
+	@echo $(MSG_LINKING) $@
+	$(CC) $(ALL_CFLAGS) $^ --output $@ $(LDFLAGS)
+
+
+# Compile: create object files from C source files.
+$(OBJDIR)/%.o : %.c
+	@echo
+	@echo $(MSG_COMPILING) $<
+	$(CC) -c $(ALL_CFLAGS) $< -o $@
+
+
+# Compile: create object files from C++ source files.
+$(OBJDIR)/%.o : %.cpp
+	@echo
+	@echo $(MSG_COMPILING_CPP) $<
+	$(CC) -c $(ALL_CPPFLAGS) $< -o $@
+
+
+# Compile: create assembler files from C source files.
+%.s : %.c
+	$(CC) -S $(ALL_CFLAGS) $< -o $@
+
+
+# Compile: create assembler files from C++ source files.
+%.s : %.cpp
+	$(CC) -S $(ALL_CPPFLAGS) $< -o $@
+
+
+# Assemble: create object files from assembler source files.
+$(OBJDIR)/%.o : %.S
+	@echo
+	@echo $(MSG_ASSEMBLING) $<
+	$(CC) -c $(ALL_ASFLAGS) $< -o $@
+
+
+# Create preprocessed source for use in sending a bug report.
+%.i : %.c
+	$(CC) -E -mmcu=$(MCU) -I. $(CFLAGS) $< -o $@
+
+
+# Target: clean project.
+clean: begin clean_list end
+
+clean_list :
+	@echo
+	@echo $(MSG_CLEANING)
+	$(REMOVE) $(BINDIR)/$(TARGET).hex
+	$(REMOVE) $(BINDIR)/$(TARGET).eep
+	$(REMOVE) $(BINDIR)/$(TARGET).cof
+	$(REMOVE) $(BINDIR)/$(TARGET).elf
+	$(REMOVE) $(BINDIR)/$(TARGET).map
+	$(REMOVE) $(BINDIR)/$(TARGET).sym
+	$(REMOVE) $(BINDIR)/$(TARGET).lss
+	$(REMOVE) $(SRC:%.c=$(OBJDIR)/%.o)
+	$(REMOVE) $(SRC:%.c=$(OBJDIR)/%.lst)
+	$(REMOVE) $(CPPSRC:%.c=$(OBJDIR)/%.o)
+	$(REMOVE) $(CPPSRC:%.c=$(OBJDIR)/%.lst)
+	$(REMOVE) $(ASRC:%.S=$(OBJDIR)/%.o)
+	$(REMOVE) $(ASRC:%.S=$(OBJDIR)/%.lst)
+	$(REMOVE) $(SRC:.c=.s)
+	$(REMOVE) $(SRC:.c=.d)
+	$(REMOVE) $(SRC:.c=.i)
+	$(REMOVE) $(CPPSRC:.c=.s)
+	$(REMOVE) $(CPPSRC:.c=.d)
+	$(REMOVE) $(CPPSRC:.c=.i)
+	$(REMOVEDIR) .dep
+
+
+# Create object files directory
+$(shell mkdir $(OBJDIR) 2>/dev/null)
+
+# Create bin files directory
+$(shell mkdir $(BINDIR) 2>/dev/null)
+
+# Include the dependency files.
+-include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)
+
+
+# Listing of phony targets.
+.PHONY : all begin finish end sizebefore sizeafter gccversion \
+build elf hex eep lss sym coff extcoff \
+clean clean_list program debug gdb-config

+ 30 - 11
main.c

@@ -1,6 +1,9 @@
 #include "main.h"
 
-__C_task void main(void)
+#ifdef __ICCAVR__
+__C_task
+#endif
+void main(void)
 {
   /* Disable comaparator */
   ACSR = 1<<ACD;
@@ -42,7 +45,7 @@ __C_task void main(void)
   /* I2C init */
   TWI_MasterInit(100);
 
-  __enable_interrupt();
+  sei();
 
   // Start tasks
   counterADC = PERIOD_ADC; // every 50 ms start ADC measure
@@ -195,7 +198,7 @@ __C_task void main(void)
 
     // делать нехрен -- спим, ждём прерывание
     MCUCR = 1<<SE;
-    __sleep();
+    sleep_mode();
 
   } // end of while(1)
 
@@ -485,9 +488,13 @@ static void ds18b20_ReadTemperature(void) {
 /**
  *  I n t e r r u p t   h a n d l e r s
  */
-
-#pragma vector=TIMER0_OVF_vect
-__interrupt void TIMER0_OVF_ISR(void) {
+#ifdef __ICCAVR__
+  #pragma vector=TIMER0_OVF_vect
+  __interrupt void TIMER0_OVF_ISR(void)
+#else // __GNUC__
+  ISR (TIMER0_OVF_vect)
+#endif
+{
   static uint8_t indicator = 0;
   static uint8_t blank_time = 0; // blanking timer
   uint8_t flag = 1;
@@ -546,6 +553,7 @@ __interrupt void TIMER0_OVF_ISR(void) {
   }
 }
 
+#ifdef __ICCAVR__
 #pragma vector=TIMER1_COMPA_vect
 __interrupt void TIMER1_COMPA_ISR(void) {
 }
@@ -558,9 +566,15 @@ __interrupt void TIMER1_COMPB_ISR(void) {
 __interrupt void TIMER1_OVF_ISR(void) {
 //  Flag.T1OC = 1;
 }
-
-#pragma vector=TIMER2_OVF_vect
-__interrupt void TIMER2_OVF_ISR(void) {
+#endif
+
+#ifdef __ICCAVR__
+  #pragma vector=TIMER2_OVF_vect
+  __interrupt void TIMER2_OVF_ISR(void)
+#else //  __GNUC__
+  ISR (TIMER2_OVF_vect)
+#endif
+{
   TCNT2 = TIM2_CNT; // reload timer
 
   if (counterADC > 0) {
@@ -603,8 +617,13 @@ __interrupt void TIMER2_OVF_ISR(void) {
   }
 }
 
-#pragma vector=ADC_vect
-__interrupt void ADC_ISR(void) {
+#ifdef __ICCAVR__
+  #pragma vector=ADC_vect
+  __interrupt void ADC_ISR(void)
+#else //  __GNUC__
+  ISR (ADC_vect)
+#endif
+{
   resultADC = ADCH;
   ADCSR &= ~(1<<ADIE); // disable interrupt
   Flag.newBTN = 1;

+ 51 - 12
main.h

@@ -1,13 +1,25 @@
 #ifndef __MAIN_H
 #define __MAIN_H
 
-#include <ioavr.h>
-#include <intrinsics.h>
+#ifdef __ICCAVR__
+  #include <ioavr.h>
+  #include <intrinsics.h>
+  #define sei()         __enable_interrupt()
+  #define sleep_mode()  __sleep()
+#endif
+
+#ifdef __GNUC__
+  #include <avr/io.h>
+  #include <avr/interrupt.h>
+  #include <avr/sleep.h >
+  #define ADCSR     ADCSRA
+#endif
+
 #include <stdint.h>
 #include "twim.h"
 
 #ifndef F_CPU
-   #define F_CPU  8000000UL
+  #define F_CPU  8000000UL
 #endif
 
 /* Timers */
@@ -119,7 +131,11 @@ const indctr_sym_t IndctrNums[16] = {
 #define DS18B20_HIGH            DS18B20_PORT|=(1<<DS18B20_PAD)
 #define DS18B20_VALUE           (DS18B20_PIN & (1<<DS18B20_PAD))
 
+#ifdef __ICCAVR__
 __no_init int8_t Temperature @7;
+#else
+static int8_t Temperature;
+#endif
 
 static uint8_t ds18b20_Reset(void);
 static void ds18b20_WriteBit(uint8_t bit);
@@ -171,7 +187,10 @@ typedef enum {
   show_TEMPt
 } state_t;
 
-__no_init struct {
+#ifdef __ICCAVR__
+__no_init
+#endif
+struct {
   uint8_t newTime       : 1;
   uint8_t newTemp       : 1;
   uint8_t newBTN        : 1;
@@ -180,21 +199,41 @@ __no_init struct {
   uint8_t getTime       : 1;
   uint8_t startDS18B20  : 1;
   uint8_t readDS18B20   : 1;
-} Flag @10;
+} Flag
+#ifdef __ICCAVR__
+ @10
+#endif
+;
 
-__no_init struct {
+#ifdef __ICCAVR__
+__no_init
+#endif
+struct {
   uint8_t needDot       : 1;
   uint8_t blankIndktr   : 1;
   uint8_t waitIndktr    : 1;
   uint8_t               : 5;
-} Flag2 @9;
+} Flag2
+#ifdef __ICCAVR__
+ @9
+#endif
+;
 
+#ifdef __ICCAVR__
 __no_init state_t State @8;
 __no_init indctr_sym_t Indicator1 @15;
 __no_init indctr_sym_t Indicator2 @14;
 __no_init indctr_sym_t Indicator3 @13;
 __no_init indctr_sym_t Indicator4 @12;
 __no_init uint8_t resultADC @11;
+#else
+static state_t State;
+static indctr_sym_t Indicator1;
+static indctr_sym_t Indicator2;
+static indctr_sym_t Indicator3;
+static indctr_sym_t Indicator4;
+static uint8_t resultADC;
+#endif
 
 static uint8_t twi_buf[8];
 static time_t Clock;
@@ -204,11 +243,11 @@ static time_t Clock;
 #define PERIOD_SHT      5000
 #define PERIOD_DS18B20s 10000
 #define PERIOD_DS18B20r 750
-volatile static uint8_t counterADC;
-volatile static uint16_t counterTWI;
-volatile static uint16_t counterShowTemp;
-volatile static uint16_t counterDS18B20s;
-volatile static uint16_t counterDS18B20r;
+static volatile uint8_t counterADC;
+static volatile uint16_t counterTWI;
+static volatile uint16_t counterShowTemp;
+static volatile uint16_t counterDS18B20s;
+static volatile uint16_t counterDS18B20r;
 
 
 /* Functions prototypes */

+ 14 - 12
twim.c

@@ -16,12 +16,12 @@
 
 #define TWSR_MASK     0xfc  
 
-volatile static uint8_t twiBuf[TWI_BUFFER_SIZE];
-volatile static uint8_t twiState = TWI_NO_STATE;      
-volatile static uint8_t twiMsgSize;       
+static volatile uint8_t twiBuf[TWI_BUFFER_SIZE];
+static volatile uint8_t twiState = TWI_NO_STATE;      
+static volatile uint8_t twiMsgSize;       
 
 /*предделители для установки скорости обмена twi модуля*/
-uint8_t pre[4] = {2, 8, 32, 128};
+static const uint8_t pre[4] = {2, 8, 32, 128};
 
 /****************************************************************************
  Инициализация и установка частоты SCL сигнала
@@ -104,8 +104,12 @@ uint8_t TWI_GetData(uint8_t *msg, uint8_t msgSize)
 /****************************************************************************
  Обработчик прерывания TWI модуля
 ****************************************************************************/
-#pragma vector=TWI_vect
-__interrupt void TWI_ISR(void)
+#ifdef __ICCAVR__
+  #pragma vector=TWI_vect
+  __interrupt void TWI_ISR(void)
+#else // __GNUC__
+  ISR (TWI_vect)
+#endif
 {
   static uint8_t ptr;
   uint8_t stat = TWSR & TWSR_MASK;
@@ -118,12 +122,11 @@ __interrupt void TWI_ISR(void)
 
     case TWI_MTX_ADR_ACK:             // был передан пакет SLA+W и получено подтверждение
     case TWI_MTX_DATA_ACK:            // был передан байт данных и получено подтверждение  
-       if (ptr < twiMsgSize){
+       if (ptr < twiMsgSize) {
           TWDR = twiBuf[ptr];                    //загружаем в регистр данных следующий байт
           TWCR = (1<<TWEN)|(1<<TWIE)|(1<<TWINT); //сбрасываем флаг TWINT    
           ptr++;
-       }
-       else{
+       } else {
           twiState = TWI_SUCCESS;  
           TWCR = (1<<TWEN)|(1<<TWINT)|(1<<TWSTO)|(0<<TWIE); //формируем состояние СТОП, сбрасываем флаг, запрещаем прерывания
        }
@@ -134,10 +137,9 @@ __interrupt void TWI_ISR(void)
        ptr++;
     
     case TWI_MRX_ADR_ACK:           //был передан пакет SLA+R и получено подтвеждение  
-      if (ptr < (twiMsgSize-1)){
+      if (ptr < (twiMsgSize-1)) {
         TWCR = (1<<TWEN)|(1<<TWIE)|(1<<TWINT)|(1<<TWEA);  //если это не предпоследний принятый байт, формируем подтверждение                             
-      }
-      else {
+      } else {
         TWCR = (1<<TWEN)|(1<<TWIE)|(1<<TWINT);            //если приняли предпоследний байт, подтверждение не формируем
       }    
       break; 

+ 5 - 0
twim.h

@@ -15,8 +15,13 @@
 #ifndef TWIM_H
 #define TWIM_H
 
+#ifdef __ICCAVR__
 #include <ioavr.h>
 #include <intrinsics.h>
+#else // __GNUC__
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#endif
 #include <stdint.h>
 
 /****************************************************************************