First commit

44 files changed, 4335 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c6fcc12
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,14 @@
+*.o
+*.hex
+*.bin
+*.elf
+*.lst
+*.lss
+*.eep
+*.map
+*.srec
+*.bat
+*.d
+*.sym
+bootloader.m8/
+bootloader/
diff --git a/Bootloader/Bootloader.aps b/Bootloader/Bootloader.aps
new file mode 100644
index 0000000..2717a37
--- /dev/null
+++ b/Bootloader/Bootloader.aps
@@ -0,0 +1 @@
+<AVRStudio><MANAGEMENT><ProjectName>Bootloader</ProjectName><Created>28-Aug-2009 01:35:54</Created><LastEdit>29-Aug-2009 21:46:36</LastEdit><ICON>241</ICON><ProjectType>0</ProjectType><Created>28-Aug-2009 01:35:54</Created><Version>4</Version><Build>4, 16, 0, 626</Build><ProjectTypeName>AVR GCC</ProjectTypeName></MANAGEMENT><CODE_CREATION><ObjectFile></ObjectFile><EntryFile></EntryFile><SaveFolder>d:\Coding\AVR\Bootloader\</SaveFolder></CODE_CREATION><DEBUG_TARGET><CURRENT_TARGET>JTAG ICE</CURRENT_TARGET><CURRENT_PART>ATmega16</CURRENT_PART><BREAKPOINTS></BREAKPOINTS><IO_EXPAND><HIDE>false</HIDE></IO_EXPAND><REGISTERNAMES><Register>R00</Register><Register>R01</Register><Register>R02</Register><Register>R03</Register><Register>R04</Register><Register>R05</Register><Register>R06</Register><Register>R07</Register><Register>R08</Register><Register>R09</Register><Register>R10</Register><Register>R11</Register><Register>R12</Register><Register>R13</Register><Register>R14</Register><Register>R15</Register><Register>R16</Register><Register>R17</Register><Register>R18</Register><Register>R19</Register><Register>R20</Register><Register>R21</Register><Register>R22</Register><Register>R23</Register><Register>R24</Register><Register>R25</Register><Register>R26</Register><Register>R27</Register><Register>R28</Register><Register>R29</Register><Register>R30</Register><Register>R31</Register></REGISTERNAMES><COM>Auto</COM><COMType>0</COMType><WATCHNUM>0</WATCHNUM><WATCHNAMES><Pane0></Pane0><Pane1></Pane1><Pane2></Pane2><Pane3></Pane3></WATCHNAMES><BreakOnTrcaeFull>0</BreakOnTrcaeFull></DEBUG_TARGET><Debugger><Triggers></Triggers></Debugger><AVRGCCPLUGIN><FILES><SOURCEFILE>main.c</SOURCEFILE><OTHERFILE>D:\Coding\AVR\Bootloader\makefile</OTHERFILE></FILES><CONFIGS><CONFIG><NAME>default</NAME><USESEXTERNALMAKEFILE>YES</USESEXTERNALMAKEFILE><EXTERNALMAKEFILE>D:\Coding\AVR\Bootloader\makefile</EXTERNALMAKEFILE><PART>atmega16</PART><HEX>1</HEX><LIST>1</LIST><MAP>1</MAP><OUTPUTFILENAME>Bootloader.elf</OUTPUTFILENAME><OUTPUTDIR>default\</OUTPUTDIR><ISDIRTY>1</ISDIRTY><OPTIONS/><INCDIRS/><LIBDIRS/><LIBS/><LINKOBJECTS/><OPTIONSFORALL>-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums</OPTIONSFORALL><LINKEROPTIONS></LINKEROPTIONS><SEGMENTS/></CONFIG></CONFIGS><LASTCONFIG>default</LASTCONFIG><USES_WINAVR>1</USES_WINAVR><GCC_LOC>C:\WinAVR\bin\avr-gcc.exe</GCC_LOC><MAKE_LOC>C:\WinAVR\utils\bin\make.exe</MAKE_LOC></AVRGCCPLUGIN><ProjectFiles><Files><Name>d:\Coding\AVR\Bootloader\main.c</Name></Files></ProjectFiles><IOView><usergroups/><sort sorted="0" column="0" ordername="1" orderaddress="1" ordergroup="1"/></IOView><Files><File00000><FileId>00000</FileId><FileName>main.c</FileName><Status>1</Status></File00000><File00001><FileId>00001</FileId><FileName>makefile</FileName><Status>1</Status></File00001></Files><Events><Bookmarks></Bookmarks></Events><Trace><Filters></Filters></Trace></AVRStudio>
diff --git a/Bootloader/avrprog_boot.pnproj b/Bootloader/avrprog_boot.pnproj
new file mode 100644
index 0000000..1777f3c
--- /dev/null
+++ b/Bootloader/avrprog_boot.pnproj
@@ -0,0 +1 @@
+<Project name="avrprog_boot"><File path="chipdef.h"></File><File path="main.c"></File><File path="makefile"></File><File path="mega128.h"></File><File path="mega128can.h"></File><File path="mega16.h"></File><File path="mega169.h"></File><File path="mega32.h"></File><File path="mega8.h"></File><File path="readme.txt"></File><File path="ldscripts_no_vector\avr5.x"></File><File path="main.lss"></File><File path="main.map"></File><File path="ldscripts_no_vector\avr4.x"></File><File path="mega162.h"></File><File path="mega644.h"></File><File path="mega644p.h"></File><File path="megaxx4p.h"></File><File path="mega324p.h"></File></Project>
\ No newline at end of file
diff --git a/Bootloader/avrprog_boot.pnps b/Bootloader/avrprog_boot.pnps
new file mode 100644
index 0000000..10c6d31
--- /dev/null
+++ b/Bootloader/avrprog_boot.pnps
@@ -0,0 +1 @@
+<pd><ViewState><e p="avrprog_boot" x="true"></e></ViewState></pd>
\ No newline at end of file
diff --git a/Bootloader/bootloader.aws b/Bootloader/bootloader.aws
new file mode 100644
index 0000000..ee4c940
--- /dev/null
+++ b/Bootloader/bootloader.aws
@@ -0,0 +1 @@
+<AVRWorkspace><IOSettings><CurrentRegisters/></IOSettings><part name="ATMEGA16"/><Files><File00000 Name="d:\Coding\AVR\Bootloader\main.c" Position="262 72 979 756" LineCol="76 0" State="Maximized"/><File00001 Name="d:\Coding\AVR\Bootloader\makefile" Position="332 161 839 616" LineCol="440 0" State="Maximized"/></Files></AVRWorkspace>
diff --git a/Bootloader/chipdef.h b/Bootloader/chipdef.h
new file mode 100644
index 0000000..63f67e7
--- /dev/null
+++ b/Bootloader/chipdef.h
@@ -0,0 +1,59 @@
+#ifndef CHIPDEF_H
+#define CHIPDEF_H
+
+#include <avr/io.h>
+
+#if defined (SPMCSR)
+#define SPM_REG SPMCSR
+#elif defined (SPMCR)
+#define SPM_REG SPMCR
+#else
+#error "AVR processor does not provide bootloader support!"
+#endif
+
+#define APP_END (FLASHEND - (BOOTSIZE * 2))
+
+#if (SPM_PAGESIZE > UINT8_MAX)
+typedef uint16_t pagebuf_t;
+#else
+typedef uint8_t pagebuf_t;
+#endif
+
+#if defined(__AVR_ATmega169__)
+#include "mega169.h"
+
+#elif defined(__AVR_ATmega16__)
+#include "mega16.h"
+
+#elif defined(__AVR_ATmega162__)
+#include "mega162.h"
+
+#elif defined(__AVR_ATmega8__)
+#include "mega8.h"
+
+#elif defined(__AVR_ATmega32__)
+#include "mega32.h"
+
+#elif defined(__AVR_ATmega324P__)
+#include "mega324p.h"
+
+#elif defined(__AVR_ATmega64__)
+#include "mega64.h"
+
+#elif defined(__AVR_ATmega644__)
+#include "mega644.h"
+
+#elif defined(__AVR_ATmega644P__)
+#include "mega644p.h"
+
+#elif defined(__AVR_ATmega128__)
+#include "mega128.h"
+
+#elif defined(__AVR_AT90CAN128__)
+#include "mega128can.h"
+
+#else
+#error "no definition for MCU available in chipdef.h"
+#endif
+
+#endif
diff --git a/Bootloader/ldscripts_no_vector/avr1.x b/Bootloader/ldscripts_no_vector/avr1.x
new file mode 100644
index 0000000..77ff9c7
--- /dev/null
+++ b/Bootloader/ldscripts_no_vector/avr1.x
@@ -0,0 +1,169 @@
+/* Default linker script, for normal executables */
+OUTPUT_FORMAT("elf32-avr","elf32-avr","elf32-avr")
+OUTPUT_ARCH(avr:1)
+MEMORY
+{
+  text   (rx)   : ORIGIN = 0, LENGTH = 8K
+  data   (rw!x) : ORIGIN = 0x800060, LENGTH = 0
+  eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 64K
+}
+SECTIONS
+{
+  /* Read-only sections, merged into text segment: */
+  .hash          : { *(.hash)		}
+  .dynsym        : { *(.dynsym)		}
+  .dynstr        : { *(.dynstr)		}
+  .gnu.version   : { *(.gnu.version)	}
+  .gnu.version_d   : { *(.gnu.version_d)	}
+  .gnu.version_r   : { *(.gnu.version_r)	}
+  .rel.init      : { *(.rel.init)		}
+  .rela.init     : { *(.rela.init)	}
+  .rel.text      :
+    {
+      *(.rel.text)
+      *(.rel.text.*)
+      *(.rel.gnu.linkonce.t*)
+    }
+  .rela.text     :
+    {
+      *(.rela.text)
+      *(.rela.text.*)
+      *(.rela.gnu.linkonce.t*)
+    }
+  .rel.fini      : { *(.rel.fini)		}
+  .rela.fini     : { *(.rela.fini)	}
+  .rel.rodata    :
+    {
+      *(.rel.rodata)
+      *(.rel.rodata.*)
+      *(.rel.gnu.linkonce.r*)
+    }
+  .rela.rodata   :
+    {
+      *(.rela.rodata)
+      *(.rela.rodata.*)
+      *(.rela.gnu.linkonce.r*)
+    }
+  .rel.data      :
+    {
+      *(.rel.data)
+      *(.rel.data.*)
+      *(.rel.gnu.linkonce.d*)
+    }
+  .rela.data     :
+    {
+      *(.rela.data)
+      *(.rela.data.*)
+      *(.rela.gnu.linkonce.d*)
+    }
+  .rel.ctors     : { *(.rel.ctors)	}
+  .rela.ctors    : { *(.rela.ctors)	}
+  .rel.dtors     : { *(.rel.dtors)	}
+  .rela.dtors    : { *(.rela.dtors)	}
+  .rel.got       : { *(.rel.got)		}
+  .rela.got      : { *(.rela.got)		}
+  .rel.bss       : { *(.rel.bss)		}
+  .rela.bss      : { *(.rela.bss)		}
+  .rel.plt       : { *(.rel.plt)		}
+  .rela.plt      : { *(.rela.plt)		}
+  /* Internal text space or external memory */
+/DISCARD/ : { *(.vectors); }
+  .text :
+  {
+/*   *(.vectors) */
+     __ctors_start = . ;
+     *(.ctors)
+     __ctors_end = . ;
+     __dtors_start = . ;
+     *(.dtors)
+     __dtors_end = . ;
+    *(.progmem.gcc*)
+    *(.progmem*)
+    . = ALIGN(2);
+    *(.init0)  /* Start here after reset.  */
+    *(.init1)
+    *(.init2)  /* Clear __zero_reg__, set up stack pointer.  */
+    *(.init3)
+    *(.init4)  /* Initialize data and BSS.  */
+    *(.init5)
+    *(.init6)  /* C++ constructors.  */
+    *(.init7)
+    *(.init8)
+    *(.init9)  /* Call main().  */
+    *(.text)
+    . = ALIGN(2);
+    *(.text.*)
+    . = ALIGN(2);
+    *(.fini9)  /* _exit() starts here.  */
+    *(.fini8)
+    *(.fini7)
+    *(.fini6)  /* C++ destructors.  */
+    *(.fini5)
+    *(.fini4)
+    *(.fini3)
+    *(.fini2)
+    *(.fini1)
+    *(.fini0)  /* Infinite loop after program termination.  */
+     _etext = . ;
+  }  > text
+  .data	  : AT (ADDR (.text) + SIZEOF (.text))
+  {
+     PROVIDE (__data_start = .) ;
+    *(.data)
+    *(.gnu.linkonce.d*)
+    . = ALIGN(2);
+     _edata = . ;
+     PROVIDE (__data_end = .) ;
+  }  > data
+  .bss  SIZEOF(.data) + ADDR(.data) :
+  {
+     PROVIDE (__bss_start = .) ;
+    *(.bss)
+    *(COMMON)
+     PROVIDE (__bss_end = .) ;
+  }  > data
+   __data_load_start = LOADADDR(.data);
+   __data_load_end = __data_load_start + SIZEOF(.data);
+  /* Global data not cleared after reset.  */
+  .noinit  SIZEOF(.bss) + ADDR(.bss) :
+  {
+     PROVIDE (__noinit_start = .) ;
+    *(.noinit*)
+     PROVIDE (__noinit_end = .) ;
+     _end = . ;
+     PROVIDE (__heap_start = .) ;
+  }  > data
+  .eeprom  :
+  {
+    *(.eeprom*)
+     __eeprom_end = . ;
+  }  > eeprom
+  /* Stabs debugging sections.  */
+  .stab 0 : { *(.stab) }
+  .stabstr 0 : { *(.stabstr) }
+  .stab.excl 0 : { *(.stab.excl) }
+  .stab.exclstr 0 : { *(.stab.exclstr) }
+  .stab.index 0 : { *(.stab.index) }
+  .stab.indexstr 0 : { *(.stab.indexstr) }
+  .comment 0 : { *(.comment) }
+  /* DWARF debug sections.
+     Symbols in the DWARF debugging sections are relative to the beginning
+     of the section so we begin them at 0.  */
+  /* DWARF 1 */
+  .debug          0 : { *(.debug) }
+  .line           0 : { *(.line) }
+  /* GNU DWARF 1 extensions */
+  .debug_srcinfo  0 : { *(.debug_srcinfo) }
+  .debug_sfnames  0 : { *(.debug_sfnames) }
+  /* DWARF 1.1 and DWARF 2 */
+  .debug_aranges  0 : { *(.debug_aranges) }
+  .debug_pubnames 0 : { *(.debug_pubnames) }
+  /* DWARF 2 */
+  .debug_info     0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
+  .debug_abbrev   0 : { *(.debug_abbrev) }
+  .debug_line     0 : { *(.debug_line) }
+  .debug_frame    0 : { *(.debug_frame) }
+  .debug_str      0 : { *(.debug_str) }
+  .debug_loc      0 : { *(.debug_loc) }
+  .debug_macinfo  0 : { *(.debug_macinfo) }
+}
diff --git a/Bootloader/ldscripts_no_vector/avr2.x b/Bootloader/ldscripts_no_vector/avr2.x
new file mode 100644
index 0000000..86a9ed6
--- /dev/null
+++ b/Bootloader/ldscripts_no_vector/avr2.x
@@ -0,0 +1,169 @@
+/* Default linker script, for normal executables */
+OUTPUT_FORMAT("elf32-avr","elf32-avr","elf32-avr")
+OUTPUT_ARCH(avr:2)
+MEMORY
+{
+  text   (rx)   : ORIGIN = 0, LENGTH = 8K
+  data   (rw!x) : ORIGIN = 0x800060, LENGTH = 0xffa0
+  eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 64K
+}
+SECTIONS
+{
+  /* Read-only sections, merged into text segment: */
+  .hash          : { *(.hash)		}
+  .dynsym        : { *(.dynsym)		}
+  .dynstr        : { *(.dynstr)		}
+  .gnu.version   : { *(.gnu.version)	}
+  .gnu.version_d   : { *(.gnu.version_d)	}
+  .gnu.version_r   : { *(.gnu.version_r)	}
+  .rel.init      : { *(.rel.init)		}
+  .rela.init     : { *(.rela.init)	}
+  .rel.text      :
+    {
+      *(.rel.text)
+      *(.rel.text.*)
+      *(.rel.gnu.linkonce.t*)
+    }
+  .rela.text     :
+    {
+      *(.rela.text)
+      *(.rela.text.*)
+      *(.rela.gnu.linkonce.t*)
+    }
+  .rel.fini      : { *(.rel.fini)		}
+  .rela.fini     : { *(.rela.fini)	}
+  .rel.rodata    :
+    {
+      *(.rel.rodata)
+      *(.rel.rodata.*)
+      *(.rel.gnu.linkonce.r*)
+    }
+  .rela.rodata   :
+    {
+      *(.rela.rodata)
+      *(.rela.rodata.*)
+      *(.rela.gnu.linkonce.r*)
+    }
+  .rel.data      :
+    {
+      *(.rel.data)
+      *(.rel.data.*)
+      *(.rel.gnu.linkonce.d*)
+    }
+  .rela.data     :
+    {
+      *(.rela.data)
+      *(.rela.data.*)
+      *(.rela.gnu.linkonce.d*)
+    }
+  .rel.ctors     : { *(.rel.ctors)	}
+  .rela.ctors    : { *(.rela.ctors)	}
+  .rel.dtors     : { *(.rel.dtors)	}
+  .rela.dtors    : { *(.rela.dtors)	}
+  .rel.got       : { *(.rel.got)		}
+  .rela.got      : { *(.rela.got)		}
+  .rel.bss       : { *(.rel.bss)		}
+  .rela.bss      : { *(.rela.bss)		}
+  .rel.plt       : { *(.rel.plt)		}
+  .rela.plt      : { *(.rela.plt)		}
+  /* Internal text space or external memory */
+/DISCARD/ : { *(.vectors); }
+  .text :
+  {
+/*    *(.vectors) */
+     __ctors_start = . ;
+     *(.ctors)
+     __ctors_end = . ;
+     __dtors_start = . ;
+     *(.dtors)
+     __dtors_end = . ;
+    *(.progmem.gcc*)
+    *(.progmem*)
+    . = ALIGN(2);
+    *(.init0)  /* Start here after reset.  */
+    *(.init1)
+    *(.init2)  /* Clear __zero_reg__, set up stack pointer.  */
+    *(.init3)
+    *(.init4)  /* Initialize data and BSS.  */
+    *(.init5)
+    *(.init6)  /* C++ constructors.  */
+    *(.init7)
+    *(.init8)
+    *(.init9)  /* Call main().  */
+    *(.text)
+    . = ALIGN(2);
+    *(.text.*)
+    . = ALIGN(2);
+    *(.fini9)  /* _exit() starts here.  */
+    *(.fini8)
+    *(.fini7)
+    *(.fini6)  /* C++ destructors.  */
+    *(.fini5)
+    *(.fini4)
+    *(.fini3)
+    *(.fini2)
+    *(.fini1)
+    *(.fini0)  /* Infinite loop after program termination.  */
+     _etext = . ;
+  }  > text
+  .data	  : AT (ADDR (.text) + SIZEOF (.text))
+  {
+     PROVIDE (__data_start = .) ;
+    *(.data)
+    *(.gnu.linkonce.d*)
+    . = ALIGN(2);
+     _edata = . ;
+     PROVIDE (__data_end = .) ;
+  }  > data
+  .bss  SIZEOF(.data) + ADDR(.data) :
+  {
+     PROVIDE (__bss_start = .) ;
+    *(.bss)
+    *(COMMON)
+     PROVIDE (__bss_end = .) ;
+  }  > data
+   __data_load_start = LOADADDR(.data);
+   __data_load_end = __data_load_start + SIZEOF(.data);
+  /* Global data not cleared after reset.  */
+  .noinit  SIZEOF(.bss) + ADDR(.bss) :
+  {
+     PROVIDE (__noinit_start = .) ;
+    *(.noinit*)
+     PROVIDE (__noinit_end = .) ;
+     _end = . ;
+     PROVIDE (__heap_start = .) ;
+  }  > data
+  .eeprom  :
+  {
+    *(.eeprom*)
+     __eeprom_end = . ;
+  }  > eeprom
+  /* Stabs debugging sections.  */
+  .stab 0 : { *(.stab) }
+  .stabstr 0 : { *(.stabstr) }
+  .stab.excl 0 : { *(.stab.excl) }
+  .stab.exclstr 0 : { *(.stab.exclstr) }
+  .stab.index 0 : { *(.stab.index) }
+  .stab.indexstr 0 : { *(.stab.indexstr) }
+  .comment 0 : { *(.comment) }
+  /* DWARF debug sections.
+     Symbols in the DWARF debugging sections are relative to the beginning
+     of the section so we begin them at 0.  */
+  /* DWARF 1 */
+  .debug          0 : { *(.debug) }
+  .line           0 : { *(.line) }
+  /* GNU DWARF 1 extensions */
+  .debug_srcinfo  0 : { *(.debug_srcinfo) }
+  .debug_sfnames  0 : { *(.debug_sfnames) }
+  /* DWARF 1.1 and DWARF 2 */
+  .debug_aranges  0 : { *(.debug_aranges) }
+  .debug_pubnames 0 : { *(.debug_pubnames) }
+  /* DWARF 2 */
+  .debug_info     0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
+  .debug_abbrev   0 : { *(.debug_abbrev) }
+  .debug_line     0 : { *(.debug_line) }
+  .debug_frame    0 : { *(.debug_frame) }
+  .debug_str      0 : { *(.debug_str) }
+  .debug_loc      0 : { *(.debug_loc) }
+  .debug_macinfo  0 : { *(.debug_macinfo) }
+}
diff --git a/Bootloader/ldscripts_no_vector/avr3.x b/Bootloader/ldscripts_no_vector/avr3.x
new file mode 100644
index 0000000..12d34ae
--- /dev/null
+++ b/Bootloader/ldscripts_no_vector/avr3.x
@@ -0,0 +1,169 @@
+/* Default linker script, for normal executables */
+OUTPUT_FORMAT("elf32-avr","elf32-avr","elf32-avr")
+OUTPUT_ARCH(avr:3)
+MEMORY
+{
+  text   (rx)   : ORIGIN = 0, LENGTH = 128K
+  data   (rw!x) : ORIGIN = 0x800060, LENGTH = 0xffa0
+  eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 64K
+}
+SECTIONS
+{
+  /* Read-only sections, merged into text segment: */
+  .hash          : { *(.hash)		}
+  .dynsym        : { *(.dynsym)		}
+  .dynstr        : { *(.dynstr)		}
+  .gnu.version   : { *(.gnu.version)	}
+  .gnu.version_d   : { *(.gnu.version_d)	}
+  .gnu.version_r   : { *(.gnu.version_r)	}
+  .rel.init      : { *(.rel.init)		}
+  .rela.init     : { *(.rela.init)	}
+  .rel.text      :
+    {
+      *(.rel.text)
+      *(.rel.text.*)
+      *(.rel.gnu.linkonce.t*)
+    }
+  .rela.text     :
+    {
+      *(.rela.text)
+      *(.rela.text.*)
+      *(.rela.gnu.linkonce.t*)
+    }
+  .rel.fini      : { *(.rel.fini)		}
+  .rela.fini     : { *(.rela.fini)	}
+  .rel.rodata    :
+    {
+      *(.rel.rodata)
+      *(.rel.rodata.*)
+      *(.rel.gnu.linkonce.r*)
+    }
+  .rela.rodata   :
+    {
+      *(.rela.rodata)
+      *(.rela.rodata.*)
+      *(.rela.gnu.linkonce.r*)
+    }
+  .rel.data      :
+    {
+      *(.rel.data)
+      *(.rel.data.*)
+      *(.rel.gnu.linkonce.d*)
+    }
+  .rela.data     :
+    {
+      *(.rela.data)
+      *(.rela.data.*)
+      *(.rela.gnu.linkonce.d*)
+    }
+  .rel.ctors     : { *(.rel.ctors)	}
+  .rela.ctors    : { *(.rela.ctors)	}
+  .rel.dtors     : { *(.rel.dtors)	}
+  .rela.dtors    : { *(.rela.dtors)	}
+  .rel.got       : { *(.rel.got)		}
+  .rela.got      : { *(.rela.got)		}
+  .rel.bss       : { *(.rel.bss)		}
+  .rela.bss      : { *(.rela.bss)		}
+  .rel.plt       : { *(.rel.plt)		}
+  .rela.plt      : { *(.rela.plt)		}
+  /* Internal text space or external memory */
+/DISCARD/ : { *(.vectors); }
+  .text :
+  {
+/*    *(.vectors) */
+     __ctors_start = . ;
+     *(.ctors)
+     __ctors_end = . ;
+     __dtors_start = . ;
+     *(.dtors)
+     __dtors_end = . ;
+    *(.progmem.gcc*)
+    *(.progmem*)
+    . = ALIGN(2);
+    *(.init0)  /* Start here after reset.  */
+    *(.init1)
+    *(.init2)  /* Clear __zero_reg__, set up stack pointer.  */
+    *(.init3)
+    *(.init4)  /* Initialize data and BSS.  */
+    *(.init5)
+    *(.init6)  /* C++ constructors.  */
+    *(.init7)
+    *(.init8)
+    *(.init9)  /* Call main().  */
+    *(.text)
+    . = ALIGN(2);
+    *(.text.*)
+    . = ALIGN(2);
+    *(.fini9)  /* _exit() starts here.  */
+    *(.fini8)
+    *(.fini7)
+    *(.fini6)  /* C++ destructors.  */
+    *(.fini5)
+    *(.fini4)
+    *(.fini3)
+    *(.fini2)
+    *(.fini1)
+    *(.fini0)  /* Infinite loop after program termination.  */
+     _etext = . ;
+  }  > text
+  .data	  : AT (ADDR (.text) + SIZEOF (.text))
+  {
+     PROVIDE (__data_start = .) ;
+    *(.data)
+    *(.gnu.linkonce.d*)
+    . = ALIGN(2);
+     _edata = . ;
+     PROVIDE (__data_end = .) ;
+  }  > data
+  .bss  SIZEOF(.data) + ADDR(.data) :
+  {
+     PROVIDE (__bss_start = .) ;
+    *(.bss)
+    *(COMMON)
+     PROVIDE (__bss_end = .) ;
+  }  > data
+   __data_load_start = LOADADDR(.data);
+   __data_load_end = __data_load_start + SIZEOF(.data);
+  /* Global data not cleared after reset.  */
+  .noinit  SIZEOF(.bss) + ADDR(.bss) :
+  {
+     PROVIDE (__noinit_start = .) ;
+    *(.noinit*)
+     PROVIDE (__noinit_end = .) ;
+     _end = . ;
+     PROVIDE (__heap_start = .) ;
+  }  > data
+  .eeprom  :
+  {
+    *(.eeprom*)
+     __eeprom_end = . ;
+  }  > eeprom
+  /* Stabs debugging sections.  */
+  .stab 0 : { *(.stab) }
+  .stabstr 0 : { *(.stabstr) }
+  .stab.excl 0 : { *(.stab.excl) }
+  .stab.exclstr 0 : { *(.stab.exclstr) }
+  .stab.index 0 : { *(.stab.index) }
+  .stab.indexstr 0 : { *(.stab.indexstr) }
+  .comment 0 : { *(.comment) }
+  /* DWARF debug sections.
+     Symbols in the DWARF debugging sections are relative to the beginning
+     of the section so we begin them at 0.  */
+  /* DWARF 1 */
+  .debug          0 : { *(.debug) }
+  .line           0 : { *(.line) }
+  /* GNU DWARF 1 extensions */
+  .debug_srcinfo  0 : { *(.debug_srcinfo) }
+  .debug_sfnames  0 : { *(.debug_sfnames) }
+  /* DWARF 1.1 and DWARF 2 */
+  .debug_aranges  0 : { *(.debug_aranges) }
+  .debug_pubnames 0 : { *(.debug_pubnames) }
+  /* DWARF 2 */
+  .debug_info     0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
+  .debug_abbrev   0 : { *(.debug_abbrev) }
+  .debug_line     0 : { *(.debug_line) }
+  .debug_frame    0 : { *(.debug_frame) }
+  .debug_str      0 : { *(.debug_str) }
+  .debug_loc      0 : { *(.debug_loc) }
+  .debug_macinfo  0 : { *(.debug_macinfo) }
+}
diff --git a/Bootloader/ldscripts_no_vector/avr4.x b/Bootloader/ldscripts_no_vector/avr4.x
new file mode 100644
index 0000000..6b371f4
--- /dev/null
+++ b/Bootloader/ldscripts_no_vector/avr4.x
@@ -0,0 +1,169 @@
+/* MODIFIED LINKER SCRIPT - BOOTLOADER: without .vectors */
+OUTPUT_FORMAT("elf32-avr","elf32-avr","elf32-avr")
+OUTPUT_ARCH(avr:4)
+MEMORY
+{
+  text   (rx)   : ORIGIN = 0, LENGTH = 8K
+  data   (rw!x) : ORIGIN = 0x800060, LENGTH = 0xffa0
+  eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 64K
+}
+SECTIONS
+{
+  /* Read-only sections, merged into text segment: */
+  .hash          : { *(.hash)		}
+  .dynsym        : { *(.dynsym)		}
+  .dynstr        : { *(.dynstr)		}
+  .gnu.version   : { *(.gnu.version)	}
+  .gnu.version_d   : { *(.gnu.version_d)	}
+  .gnu.version_r   : { *(.gnu.version_r)	}
+  .rel.init      : { *(.rel.init)		}
+  .rela.init     : { *(.rela.init)	}
+  .rel.text      :
+    {
+      *(.rel.text)
+      *(.rel.text.*)
+      *(.rel.gnu.linkonce.t*)
+    }
+  .rela.text     :
+    {
+      *(.rela.text)
+      *(.rela.text.*)
+      *(.rela.gnu.linkonce.t*)
+    }
+  .rel.fini      : { *(.rel.fini)		}
+  .rela.fini     : { *(.rela.fini)	}
+  .rel.rodata    :
+    {
+      *(.rel.rodata)
+      *(.rel.rodata.*)
+      *(.rel.gnu.linkonce.r*)
+    }
+  .rela.rodata   :
+    {
+      *(.rela.rodata)
+      *(.rela.rodata.*)
+      *(.rela.gnu.linkonce.r*)
+    }
+  .rel.data      :
+    {
+      *(.rel.data)
+      *(.rel.data.*)
+      *(.rel.gnu.linkonce.d*)
+    }
+  .rela.data     :
+    {
+      *(.rela.data)
+      *(.rela.data.*)
+      *(.rela.gnu.linkonce.d*)
+    }
+  .rel.ctors     : { *(.rel.ctors)	}
+  .rela.ctors    : { *(.rela.ctors)	}
+  .rel.dtors     : { *(.rel.dtors)	}
+  .rela.dtors    : { *(.rela.dtors)	}
+  .rel.got       : { *(.rel.got)		}
+  .rela.got      : { *(.rela.got)		}
+  .rel.bss       : { *(.rel.bss)		}
+  .rela.bss      : { *(.rela.bss)		}
+  .rel.plt       : { *(.rel.plt)		}
+  .rela.plt      : { *(.rela.plt)		}
+  /* Internal text space or external memory */
+/DISCARD/ : { *(.vectors); }
+  .text :
+  {
+/*    *(.vectors) */
+     __ctors_start = . ;
+     *(.ctors)
+     __ctors_end = . ;
+     __dtors_start = . ;
+     *(.dtors)
+     __dtors_end = . ;
+    *(.progmem.gcc*)
+    *(.progmem*)
+    . = ALIGN(2);
+    *(.init0)  /* Start here after reset.  */
+    *(.init1)
+    *(.init2)  /* Clear __zero_reg__, set up stack pointer.  */
+    *(.init3)
+    *(.init4)  /* Initialize data and BSS.  */
+    *(.init5)
+    *(.init6)  /* C++ constructors.  */
+    *(.init7)
+    *(.init8)
+    *(.init9)  /* Call main().  */
+    *(.text)
+    . = ALIGN(2);
+    *(.text.*)
+    . = ALIGN(2);
+    *(.fini9)  /* _exit() starts here.  */
+    *(.fini8)
+    *(.fini7)
+    *(.fini6)  /* C++ destructors.  */
+    *(.fini5)
+    *(.fini4)
+    *(.fini3)
+    *(.fini2)
+    *(.fini1)
+    *(.fini0)  /* Infinite loop after program termination.  */
+     _etext = . ;
+  }  > text
+  .data	  : AT (ADDR (.text) + SIZEOF (.text))
+  {
+     PROVIDE (__data_start = .) ;
+    *(.data)
+    *(.gnu.linkonce.d*)
+    . = ALIGN(2);
+     _edata = . ;
+     PROVIDE (__data_end = .) ;
+  }  > data
+  .bss  SIZEOF(.data) + ADDR(.data) :
+  {
+     PROVIDE (__bss_start = .) ;
+    *(.bss)
+    *(COMMON)
+     PROVIDE (__bss_end = .) ;
+  }  > data
+   __data_load_start = LOADADDR(.data);
+   __data_load_end = __data_load_start + SIZEOF(.data);
+  /* Global data not cleared after reset.  */
+  .noinit  SIZEOF(.bss) + ADDR(.bss) :
+  {
+     PROVIDE (__noinit_start = .) ;
+    *(.noinit*)
+     PROVIDE (__noinit_end = .) ;
+     _end = . ;
+     PROVIDE (__heap_start = .) ;
+  }  > data
+  .eeprom  :
+  {
+    *(.eeprom*)
+     __eeprom_end = . ;
+  }  > eeprom
+  /* Stabs debugging sections.  */
+  .stab 0 : { *(.stab) }
+  .stabstr 0 : { *(.stabstr) }
+  .stab.excl 0 : { *(.stab.excl) }
+  .stab.exclstr 0 : { *(.stab.exclstr) }
+  .stab.index 0 : { *(.stab.index) }
+  .stab.indexstr 0 : { *(.stab.indexstr) }
+  .comment 0 : { *(.comment) }
+  /* DWARF debug sections.
+     Symbols in the DWARF debugging sections are relative to the beginning
+     of the section so we begin them at 0.  */
+  /* DWARF 1 */
+  .debug          0 : { *(.debug) }
+  .line           0 : { *(.line) }
+  /* GNU DWARF 1 extensions */
+  .debug_srcinfo  0 : { *(.debug_srcinfo) }
+  .debug_sfnames  0 : { *(.debug_sfnames) }
+  /* DWARF 1.1 and DWARF 2 */
+  .debug_aranges  0 : { *(.debug_aranges) }
+  .debug_pubnames 0 : { *(.debug_pubnames) }
+  /* DWARF 2 */
+  .debug_info     0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
+  .debug_abbrev   0 : { *(.debug_abbrev) }
+  .debug_line     0 : { *(.debug_line) }
+  .debug_frame    0 : { *(.debug_frame) }
+  .debug_str      0 : { *(.debug_str) }
+  .debug_loc      0 : { *(.debug_loc) }
+  .debug_macinfo  0 : { *(.debug_macinfo) }
+}
diff --git a/Bootloader/ldscripts_no_vector/avr5.x b/Bootloader/ldscripts_no_vector/avr5.x
new file mode 100644
index 0000000..a1a1fa2
--- /dev/null
+++ b/Bootloader/ldscripts_no_vector/avr5.x
@@ -0,0 +1,172 @@
+/* MODIFIED LINKER SCRIPT - BOOTLOADER: without .vectors */
+OUTPUT_FORMAT("elf32-avr","elf32-avr","elf32-avr")
+OUTPUT_ARCH(avr:5)
+MEMORY
+{
+  text   (rx)   : ORIGIN = 0, LENGTH = 128K
+  data   (rw!x) : ORIGIN = 0x800060, LENGTH = 0xffa0
+  eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 64K
+}
+SECTIONS
+{
+  /* Read-only sections, merged into text segment: */
+  .hash          : { *(.hash)		}
+  .dynsym        : { *(.dynsym)		}
+  .dynstr        : { *(.dynstr)		}
+  .gnu.version   : { *(.gnu.version)	}
+  .gnu.version_d   : { *(.gnu.version_d)	}
+  .gnu.version_r   : { *(.gnu.version_r)	}
+  .rel.init      : { *(.rel.init)		}
+  .rela.init     : { *(.rela.init)	}
+  .rel.text      :
+    {
+      *(.rel.text)
+      *(.rel.text.*)
+      *(.rel.gnu.linkonce.t*)
+    }
+  .rela.text     :
+    {
+      *(.rela.text)
+      *(.rela.text.*)
+      *(.rela.gnu.linkonce.t*)
+    }
+  .rel.fini      : { *(.rel.fini)		}
+  .rela.fini     : { *(.rela.fini)	}
+  .rel.rodata    :
+    {
+      *(.rel.rodata)
+      *(.rel.rodata.*)
+      *(.rel.gnu.linkonce.r*)
+    }
+  .rela.rodata   :
+    {
+      *(.rela.rodata)
+      *(.rela.rodata.*)
+      *(.rela.gnu.linkonce.r*)
+    }
+  .rel.data      :
+    {
+      *(.rel.data)
+      *(.rel.data.*)
+      *(.rel.gnu.linkonce.d*)
+    }
+  .rela.data     :
+    {
+      *(.rela.data)
+      *(.rela.data.*)
+      *(.rela.gnu.linkonce.d*)
+    }
+  .rel.ctors     : { *(.rel.ctors)	}
+  .rela.ctors    : { *(.rela.ctors)	}
+  .rel.dtors     : { *(.rel.dtors)	}
+  .rela.dtors    : { *(.rela.dtors)	}
+  .rel.got       : { *(.rel.got)		}
+  .rela.got      : { *(.rela.got)		}
+  .rel.bss       : { *(.rel.bss)		}
+  .rela.bss      : { *(.rela.bss)		}
+  .rel.plt       : { *(.rel.plt)		}
+  .rela.plt      : { *(.rela.plt)		}
+
+  /* Internal text space or external memory */
+  
+/* BOOTLOADER-MODIFICATION - not interrupt-vectors */
+   /DISCARD/ : { *(.vectors) }
+  .text :
+  {
+/*    *(.vectors) */ /* BOOTLOADER-MODIFICATION ! */
+     __ctors_start = . ;
+     *(.ctors)
+     __ctors_end = . ;
+     __dtors_start = . ;
+     *(.dtors)
+     __dtors_end = . ;
+    *(.progmem.gcc*)
+    *(.progmem*)
+    . = ALIGN(2);
+    *(.init0)  /* Start here after reset.  */
+    *(.init1)
+    *(.init2)  /* Clear __zero_reg__, set up stack pointer.  */
+    *(.init3)
+    *(.init4)  /* Initialize data and BSS.  */
+    *(.init5)
+    *(.init6)  /* C++ constructors.  */
+    *(.init7)
+    *(.init8)
+    *(.init9)  /* Call main().  */
+    *(.text)
+    . = ALIGN(2);
+    *(.text.*)
+    . = ALIGN(2);
+    *(.fini9)  /* _exit() starts here.  */
+    *(.fini8)
+    *(.fini7)
+    *(.fini6)  /* C++ destructors.  */
+    *(.fini5)
+    *(.fini4)
+    *(.fini3)
+    *(.fini2)
+    *(.fini1)
+    *(.fini0)  /* Infinite loop after program termination.  */
+     _etext = . ;
+  }  > text
+  .data	  : AT (ADDR (.text) + SIZEOF (.text))
+  {
+     PROVIDE (__data_start = .) ;
+    *(.data)
+    *(.gnu.linkonce.d*)
+    . = ALIGN(2);
+     _edata = . ;
+     PROVIDE (__data_end = .) ;
+  }  > data
+  .bss  SIZEOF(.data) + ADDR(.data) :
+  {
+     PROVIDE (__bss_start = .) ;
+    *(.bss)
+    *(COMMON)
+     PROVIDE (__bss_end = .) ;
+  }  > data
+   __data_load_start = LOADADDR(.data);
+   __data_load_end = __data_load_start + SIZEOF(.data);
+  /* Global data not cleared after reset.  */
+  .noinit  SIZEOF(.bss) + ADDR(.bss) :
+  {
+     PROVIDE (__noinit_start = .) ;
+    *(.noinit*)
+     PROVIDE (__noinit_end = .) ;
+     _end = . ;
+     PROVIDE (__heap_start = .) ;
+  }  > data
+  .eeprom  :
+  {
+    *(.eeprom*)
+     __eeprom_end = . ;
+  }  > eeprom
+  /* Stabs debugging sections.  */
+  .stab 0 : { *(.stab) }
+  .stabstr 0 : { *(.stabstr) }
+  .stab.excl 0 : { *(.stab.excl) }
+  .stab.exclstr 0 : { *(.stab.exclstr) }
+  .stab.index 0 : { *(.stab.index) }
+  .stab.indexstr 0 : { *(.stab.indexstr) }
+  .comment 0 : { *(.comment) }
+  /* DWARF debug sections.
+     Symbols in the DWARF debugging sections are relative to the beginning
+     of the section so we begin them at 0.  */
+  /* DWARF 1 */
+  .debug          0 : { *(.debug) }
+  .line           0 : { *(.line) }
+  /* GNU DWARF 1 extensions */
+  .debug_srcinfo  0 : { *(.debug_srcinfo) }
+  .debug_sfnames  0 : { *(.debug_sfnames) }
+  /* DWARF 1.1 and DWARF 2 */
+  .debug_aranges  0 : { *(.debug_aranges) }
+  .debug_pubnames 0 : { *(.debug_pubnames) }
+  /* DWARF 2 */
+  .debug_info     0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
+  .debug_abbrev   0 : { *(.debug_abbrev) }
+  .debug_line     0 : { *(.debug_line) }
+  .debug_frame    0 : { *(.debug_frame) }
+  .debug_str      0 : { *(.debug_str) }
+  .debug_loc      0 : { *(.debug_loc) }
+  .debug_macinfo  0 : { *(.debug_macinfo) }
+}
diff --git a/Bootloader/main b/Bootloader/main
new file mode 100644
index 0000000..c4b93b7
--- /dev/null
+++ b/Bootloader/main
diff --git a/Bootloader/main.c b/Bootloader/main.c
new file mode 100644
index 0000000..87ac22d
--- /dev/null
+++ b/Bootloader/main.c
@@ -0,0 +1,690 @@
+/*****************************************************************************
+*
+* AVRPROG compatible boot-loader
+* Version  : 0.85 (Dec. 2008)
+* Compiler : avr-gcc 4.1.2 / avr-libc 1.4.6
+* size     : depends on features and startup ( minmal features < 512 words)
+* by       : Martin Thomas, Kaiserslautern, Germany
+*            eversmith@heizung-thomas.de
+*            Additional code and improvements contributed by:
+*           - Uwe Bonnes
+*           - Bjoern Riemer
+*           - Olaf Rempel
+*
+* License  : Copyright (c) 2006-2008 M. Thomas, U. Bonnes, O. Rempel
+*            Free to use. You have to mention the copyright
+*            owners in source-code and documentation of derived
+*            work. No warranty! (Yes, you can insert the BSD
+*            license here)
+*
+* Tested with ATmega8, ATmega16, ATmega162, ATmega32, ATmega324P,
+*             ATmega644, ATmega644P, ATmega128, AT90CAN128
+*
+* - Initial versions have been based on the Butterfly bootloader-code
+*   by Atmel Corporation (Authors: BBrandal, PKastnes, ARodland, LHM)
+*
+****************************************************************************
+*
+*  See the makefile and readme.txt for information on how to adapt 
+*  the linker-settings to the selected Boot Size (BOOTSIZE=xxxx) and 
+*  the MCU-type. Other configurations futher down in this file.
+*
+*  With BOOT_SIMPLE, minimal features and discarded int-vectors
+*  this bootloader has should fit into a a 512 word (1024, 0x400 bytes) 
+*  bootloader-section. 
+*
+****************************************************************************/
+
+/* ×àñòîòà êîíòðîëëåðà (êâàðöà) */
+#ifndef F_CPU
+// #define F_CPU 7372800
+//#define F_CPU (7372800/2)
+//#define F_CPU 11059200UL
+#define F_CPU 8000000UL
+#endif
+
+/* UART Ñêîðîñòü UART îïòèìàëüíî 19200 */
+#define BAUDRATE 19200
+//#define BAUDRATE 19200
+//#define BAUDRATE 115200
+
+/* Ðåæèì äâîéíîé ñêîðîñòè UART (áèò U2C)*/
+//#define UART_DOUBLESPEED
+
+/* Èñïîëüçóåòñÿ âòîðîé UART íà mega128 / can128 / mega162 / mega324p / mega644p */
+//#define UART_USE_SECOND
+
+/* Òèï óñòðîéñòâà:
+   Äëÿ AVRProg âûáèðàòü BOOT 
+   Ýòî êîððåêòíîå çíà÷åíèå äëÿ bootloader.
+   avrdude ìîæåò îïðåäåëèòü òîëüêî part-code äëÿ ISP */
+#define DEVTYPE     DEVTYPE_BOOT
+//#define DEVTYPE     DEVTYPE_ISP
+
+/*
+ * Âûáîð ïîðòà äëÿ êíîïêè âõîäà â çàãðóç÷èê
+ * ×òîáû âîéòè â çàãðóç÷èê íàäî ÷òîáû ïðè çàïóñêå ýòà êíîïêà çàìûêàëà ïèí íà çåìëþ
+ */
+#define BLPORT		PORTD
+#define BLDDR		DDRD
+#define BLPIN		PIND
+#define BLPNUM		PIND3
+
+/*
+ * Âûáîð ïîðòà äëÿ èíäèêàòîðà ðàáîòû çàãðóç÷èêà
+ * Ñâåòîäèîä ãîðèò - ìû â çàãðóç÷èêå
+ */
+
+#define ENABLE_BOOT_LED
+#define BIPORT		PORTB
+#define BIDDR		DDRB
+#define BIPIN		PINB
+#define BIPNUM		PINB4
+
+
+/*
+ * Âûêëþ÷èòü Ñîáà÷èé òàéìåð íà âðåìÿ çàãðóç÷èêà
+ */
+#define DISABLE_WDT_AT_STARTUP
+
+/*
+ * Watchdog-reset is issued at exit 
+ * define the timeout-value here (see avr-libc manual)
+ */
+#define EXIT_WDT_TIME   WDTO_250MS
+
+/*
+ * Âûáîð ðåæèìà çàãðóç÷èêà
+ * SIMPLE-Mode - Çàãðóç÷èê ñòàðòóåò êîãäà íàæàòà åãî êíîïêà
+ *   ïåðåõîä ê îñíîâíîé ïðîãðàììå îñóùåñòâëÿåòñÿ ïîñëå ñáðîñà 
+ *   (êíîïêà äîëæíà áûòü îòæàòà) ëèáî ïî êîìàíäå îò ïðîãðàììàòîðà
+ *   Ïðè ýòîì ðåæèìå âûâîä íà êíîïêó êîíôèãóðèðóåòñÿ êàê âõîä-ñ ïîäòÿãîì,
+ *   íî ïðè âûõîäå èç çàãðóç÷èêà âñå âûñòàâëÿåòñÿ ïî óìîë÷àíèþ
+ * POWERSAVE-Mode - Startup is separated in two loops
+ *   which makes power-saving a little easier if no firmware
+ *   is on the chip. Needs more memory
+ * BOOTICE-Mode - äëÿ çàøèâêè  JTAGICE ôàéëà upgrade.ebn â Ìåãó16.
+ *   ÷òî ïðåâðàùàåò åå â JTAG îòëàä÷èê. Ðàçóìååòñÿ íóæíî äîáàâèòü âåñü íåîáõîäèìûé
+ *   îáâÿç íà êðèñòàëë äëÿ ýòîãî. È ÷àñòîòà äîëæíà áûòü âåçäå ïðîïèñàíà êàê 7372800
+ *   â F_CPU Äëÿ ñîâìåñòèìîñòè ñ ðîäíîé ïðîøèâêîé JTAG ICE
+ * WAIT-mode Bootloader îæèäàåò êîìàíäû íà âõîä, åñëè åå íå áûëî â òå÷åíèè ïðîìåæóòêà âðåìåíè
+ *   (êîòîðûé íàñòðàèâàåòñÿ) òî ïðîèõñîäèò ïåðåõîä ê îñíîâíîé ïðîãðàììå.
+ */
+#define START_SIMPLE
+//#define START_WAIT
+//#define START_POWERSAVE
+//#define START_BOOTICE
+
+/* Êîìàíäà äëÿ âõîäà â çàãðóç÷èê â START_WAIT */
+#define START_WAIT_UARTCHAR 'S'
+
+/* Âûäåðæêà äëÿ START_WAIT mode ( t = WAIT_TIME * 10ms ) */
+#define WAIT_VALUE 1000 /* ñåé÷àñ: 300*10ms = 3000ms = 3sec */
+
+/*
+ * enable/disable readout of fuse and lock-bits
+ * (AVRPROG has to detect the AVR correctly by device-code
+ * to show the correct information).
+ */
+//#define ENABLEREADFUSELOCK
+
+/* enable/disable write of lock-bits
+ * WARNING: lock-bits can not be reseted by bootloader (as far as I know)
+ * Only protection no unprotection, "chip erase" from bootloader only
+ * clears the flash but does no real "chip erase" (this is not possible
+ * with a bootloader as far as I know)
+ * Keep this undefined!
+ */
+//#define WRITELOCKBITS
+
+/*
+ * define the following if the bootloader should not output
+ * itself at flash read (will fake an empty boot-section)
+ */
+//#define READ_PROTECT_BOOTLOADER 
+
+#define VERSION_HIGH '0'
+#define VERSION_LOW  '8'
+
+#define GET_LOCK_BITS           0x0001
+#define GET_LOW_FUSE_BITS       0x0000
+#define GET_HIGH_FUSE_BITS      0x0003
+#define GET_EXTENDED_FUSE_BITS  0x0002
+
+/* Ðàñ÷åò äåëèòåëÿ ÷àñòîòû äëÿ USART*/
+#ifdef UART_DOUBLESPEED
+
+	#define UART_CALC_BAUDRATE(baudRate) ((uint32_t)((F_CPU) + ((uint32_t)baudRate * 4UL)) / ((uint32_t)(baudRate) * 8UL) - 1)
+
+#else
+
+	#define UART_CALC_BAUDRATE(baudRate) ((uint32_t)((F_CPU) + ((uint32_t)baudRate * 8UL)) / ((uint32_t)(baudRate) * 16UL) - 1)
+
+#endif
+
+
+#include <stdint.h>
+#include <avr/io.h>
+#include <avr/wdt.h>
+#include <avr/boot.h>
+#include <avr/pgmspace.h>
+#include <avr/eeprom.h>
+#include <avr/interrupt.h>
+#include <util/delay.h>
+
+#include "chipdef.h"
+
+uint8_t gBuffer[SPM_PAGESIZE];
+
+#if defined(BOOTLOADERHASNOVECTORS)
+	#warning "This Bootloader does not link interrupt vectors - see makefile"
+	/* make the linker happy - it wants to see __vector_default */
+	// void __vector_default(void) { ; }
+	void __vector_default(void) { ; }
+#endif
+
+static void sendchar(uint8_t data)
+{
+	while (!(UART_STATUS & (1<<UART_TXREADY)));
+	UART_DATA = data;
+}
+
+static uint8_t recvchar(void)
+{
+	while (!(UART_STATUS & (1<<UART_RXREADY)));
+	return UART_DATA;
+}
+
+static inline void eraseFlash(void)
+{
+	// erase only main section (bootloader protection)
+	uint32_t addr = 0;
+	while (APP_END > addr) 
+		{
+		boot_page_erase(addr);		// Perform page erase
+		boot_spm_busy_wait();		// Wait until the memory is erased.
+		addr += SPM_PAGESIZE;
+		}
+	boot_rww_enable();
+}
+
+static inline void recvBuffer(pagebuf_t size)
+{
+	pagebuf_t cnt;
+	uint8_t *tmp = gBuffer;
+
+	for (cnt = 0; cnt < sizeof(gBuffer); cnt++) 
+		{
+		*tmp++ = (cnt < size) ? recvchar() : 0xFF;
+		}
+}
+
+static inline uint16_t writeFlashPage(uint16_t waddr, pagebuf_t size)
+{
+	uint32_t pagestart = (uint32_t)waddr<<1;
+	uint32_t baddr = pagestart;
+	uint16_t data;
+	uint8_t *tmp = gBuffer;
+
+	do 
+		{
+		data = *tmp++;
+		data |= *tmp++ << 8;
+		boot_page_fill(baddr, data);	// call asm routine.
+
+		baddr += 2;			// Select next word in memory
+		size -= 2;			// Reduce number of bytes to write by two
+		} 
+	while (size);				// Loop until all bytes written
+
+	boot_page_write(pagestart);
+	boot_spm_busy_wait();
+	boot_rww_enable();		// Re-enable the RWW section
+
+	return baddr>>1;
+}
+
+static inline uint16_t writeEEpromPage(uint16_t address, pagebuf_t size)
+{
+/*
+	uint8_t *tmp = gBuffer;
+
+	do 
+		{
+		eeprom_write_byte( (uint8_t*)address, *tmp++ );
+		address++;			// Select next byte
+		size--;				// Decreas number of bytes to write
+		}
+	while (size);				// Loop until all bytes written
+
+	// eeprom_busy_wait();
+*/
+	return address+size;
+}
+
+static inline uint16_t readFlashPage(uint16_t waddr, pagebuf_t size)
+{
+	uint32_t baddr = (uint32_t)waddr<<1;
+	uint16_t data;
+
+	do 
+	{
+
+#ifndef READ_PROTECT_BOOTLOADER
+#warning "Bootloader not read-protected"
+
+	#if defined(RAMPZ)
+		data = pgm_read_word_far(baddr);
+	#else
+		data = pgm_read_word_near(baddr);
+	#endif
+
+#else
+		// don't read bootloader
+		if ( baddr < APP_END ) 
+		{
+		#if defined(RAMPZ)
+			data = pgm_read_word_far(baddr);
+		#else
+			data = pgm_read_word_near(baddr);
+		#endif
+		}
+		else 
+		{
+		data = 0xFFFF; // fake empty
+		}
+#endif
+		sendchar(data);			// send LSB
+		sendchar((data >> 8));		// send MSB
+		baddr += 2;			// Select next word in memory
+		size -= 2;			// Subtract two bytes from number of bytes to read
+	} 
+	while (size);				// Repeat until block has been read
+	return baddr>>1;
+}
+
+static inline uint16_t readEEpromPage(uint16_t address, pagebuf_t size)
+{
+	do 
+	{
+	sendchar( eeprom_read_byte( (uint8_t*)address ) );
+	address++;
+	size--;				// Decrease number of bytes to read
+	} 
+	while (size);				// Repeat until block has been read
+
+	return address;
+}
+
+#if defined(ENABLEREADFUSELOCK)
+static uint8_t read_fuse_lock(uint16_t addr)
+{
+	uint8_t mode = (1<<BLBSET) | (1<<SPMEN);
+	uint8_t retval;
+
+	asm volatile
+	(
+		"movw r30, %3\n\t"		/* Z to addr */ \
+		"sts %0, %2\n\t"		/* set mode in SPM_REG */ \
+		"lpm\n\t"			/* load fuse/lock value into r0 */ \
+		"mov %1,r0\n\t"			/* save return value */ \
+		: "=m" (SPM_REG),
+		  "=r" (retval)
+		: "r" (mode),
+		  "r" (addr)
+		: "r30", "r31", "r0"
+	);
+	return retval;
+}
+#endif
+
+static void send_boot(void)
+{
+	sendchar('A');
+	sendchar('V');
+	sendchar('R');
+	sendchar('B');
+	sendchar('O');
+	sendchar('O');
+	sendchar('T');
+}
+
+static void (*jump_to_app)(void) = 0x0000;
+
+int main(void)
+{
+	uint16_t address = 0;
+	uint8_t device = 0, val;
+
+
+
+#ifdef ENABLE_BOOT_LED	// LED ON
+	BIPORT |= (1<<BIPNUM);	
+	BIDDR  |= (1<<BIPNUM);
+#endif
+
+
+#ifdef DISABLE_WDT_AT_STARTUP
+	#ifdef WDT_OFF_SPECIAL
+		#warning "using target specific watchdog_off"
+		bootloader_wdt_off();
+	#else
+		cli();
+		wdt_reset();
+		wdt_disable();
+	#endif
+#endif
+	
+#ifdef START_POWERSAVE
+	uint8_t OK = 1;
+#endif
+
+	BLDDR  &= ~(1<<BLPNUM);		// set as Input
+	BLPORT |= (1<<BLPNUM);		// Enable pullup
+
+	// Set baud rate
+	UART_BAUD_HIGH = (UART_CALC_BAUDRATE(BAUDRATE)>>8) & 0xFF;
+	UART_BAUD_LOW = (UART_CALC_BAUDRATE(BAUDRATE) & 0xFF);
+
+#ifdef UART_DOUBLESPEED
+	UART_STATUS = ( 1<<UART_DOUBLE );
+#endif
+
+	UART_CTRL = UART_CTRL_DATA;
+	UART_CTRL2 = UART_CTRL2_DATA;
+	
+#if defined(START_POWERSAVE)
+	/*
+		This is an adoption of the Butterfly Bootloader startup-sequence.
+		It may look a little strange but separating the login-loop from
+		the main parser-loop gives a lot a possibilities (timeout, sleep-modes
+	    etc.).
+	*/
+	for(;OK;) 
+	{
+		if ((BLPIN & (1<<BLPNUM))) 
+		{
+		// jump to main app if pin is not grounded
+		BLPORT &= ~(1<<BLPNUM);	// set to default
+
+		#ifdef UART_DOUBLESPEED
+			UART_STATUS &= ~( 1<<UART_DOUBLE );
+		#endif
+
+
+		#ifdef ENABLE_BOOT_LED	// LED OFF
+		BIPORT &= ~(1<<BIPNUM);	
+		BIDDR  &= ~(1<<BIPNUM);
+		#endif
+
+		jump_to_app();		// Jump to application sector
+
+		} 
+		else 
+		{
+		val = recvchar();
+		/* ESC */
+			if (val == 0x1B) 
+			{
+				// AVRPROG connection
+				// Wait for signon
+				while (val != 'S')
+				val = recvchar();
+				
+				send_boot();			// Report signon
+				OK = 0;
+			} 
+			else 
+			{
+			sendchar('?');
+			}
+	    }
+		// Power-Save code here
+	}
+
+#elif defined(START_SIMPLE)
+
+	if ((BLPIN & (1<<BLPNUM))) {
+/*
+		// jump to main app if pin is not grounded
+		BLPORT &= ~(1<<BLPNUM);		// set to default	
+			
+	#ifdef UART_DOUBLESPEED
+		UART_STATUS &= ~( 1<<UART_DOUBLE );
+	#endif
+
+*/
+		#ifdef ENABLE_BOOT_LED	// LED OFF
+		BIPORT &= ~(1<<BIPNUM);	
+		BIDDR  &= ~(1<<BIPNUM);
+		#endif
+
+		jump_to_app();			// Jump to application sector
+	}
+
+#elif defined(START_WAIT)
+
+	uint16_t cnt = 0;
+
+	while (1) {
+		if (UART_STATUS & (1<<UART_RXREADY))
+			if (UART_DATA == START_WAIT_UARTCHAR)
+				break;
+
+		if (cnt++ >= WAIT_VALUE) {
+			BLPORT &= ~(1<<BLPNUM);		// set to default
+
+
+			#ifdef ENABLE_BOOT_LED	// LED OFF
+			BIPORT &= ~(1<<BIPNUM);	
+			BIDDR  &= ~(1<<BIPNUM);
+			#endif
+			jump_to_app();			// Jump to application sector
+		}
+
+		_delay_ms(10);
+	}
+	send_boot();
+
+#elif defined(START_BOOTICE)
+#warning "BOOTICE mode - no startup-condition"
+
+#else
+#error "Select START_ condition for bootloader in main.c"
+#endif
+
+
+	for(;;) 
+	{
+		val = recvchar();
+		// Autoincrement?
+		if (val == 'a') 
+		{
+			sendchar('Y');			// Autoincrement is quicker
+
+		//write address
+		} 
+		else if (val == 'A') 
+		{
+			address = recvchar();		//read address 8 MSB
+			address = (address<<8) | recvchar();
+			sendchar('\r');
+
+		// Buffer load support
+		} 
+		else if (val == 'b') 
+		{
+			sendchar('Y');					// Report buffer load supported
+			sendchar((sizeof(gBuffer) >> 8) & 0xFF);	// Report buffer size in bytes
+			sendchar(sizeof(gBuffer) & 0xFF);
+
+		// Start buffer load
+		} 
+		else if (val == 'B') 
+		{
+			pagebuf_t size;
+			size = recvchar() << 8;				// Load high byte of buffersize
+			size |= recvchar();				// Load low byte of buffersize
+			val = recvchar();				// Load memory type ('E' or 'F')
+			recvBuffer(size);
+
+			if (device == DEVTYPE) 
+			{
+				if (val == 'F') 
+				{
+				address = writeFlashPage(address, size);
+				} 
+				else if (val == 'E') 
+				{
+				address = writeEEpromPage(address, size);
+				}
+				sendchar('\r');
+			} 
+			else 
+			{
+			sendchar(0);
+			}
+
+		// Block read
+		} 
+		else if (val == 'g') 
+		{
+			pagebuf_t size;
+			size = recvchar() << 8;				// Load high byte of buffersize
+			size |= recvchar();				// Load low byte of buffersize
+			val = recvchar();				// Get memtype
+
+			if (val == 'F') 
+			{
+			address = readFlashPage(address, size);
+			} 
+			else if (val == 'E') 
+			{
+			address = readEEpromPage(address, size);
+			}
+
+		// Chip erase
+ 		} 
+		else if (val == 'e') 
+		{
+		if (device == DEVTYPE) 
+			{
+			eraseFlash();
+			}
+		sendchar('\r');
+
+		// Exit upgrade
+		} 
+		else if (val == 'E') 
+		{
+		wdt_enable(EXIT_WDT_TIME); // Enable Watchdog Timer to give reset
+		sendchar('\r');
+
+		#ifdef WRITELOCKBITS
+			#warning "Extension 'WriteLockBits' enabled"
+			// TODO: does not work reliably
+			// write lockbits
+			} 
+			else if (val == 'l') 
+			{
+			if (device == DEVTYPE) 
+				{
+				// write_lock_bits(recvchar());
+				boot_lock_bits_set(recvchar());	// boot.h takes care of mask
+				boot_spm_busy_wait();
+				}
+			sendchar('\r');
+		#endif
+		// Enter programming mode
+		} 
+		else if (val == 'P') 
+		{
+		sendchar('\r');
+
+		// Leave programming mode
+		} 
+		else if (val == 'L') 
+		{
+		sendchar('\r');
+		// return programmer type
+		} 
+		else if (val == 'p') 
+		{
+		sendchar('S');		// always serial programmer
+
+		#ifdef ENABLEREADFUSELOCK
+			#warning "Extension 'ReadFuseLock' enabled"
+			// read "low" fuse bits
+			} 
+			else if (val == 'F') 
+			{
+			sendchar(read_fuse_lock(GET_LOW_FUSE_BITS));
+
+			// read lock bits
+			} 
+			else if (val == 'r') 
+			{
+			sendchar(read_fuse_lock(GET_LOCK_BITS));
+
+			// read high fuse bits
+			} 
+			else if (val == 'N') 
+			{
+			sendchar(read_fuse_lock(GET_HIGH_FUSE_BITS));
+			// read extended fuse bits
+			} 
+			else if (val == 'Q') 
+			{
+			sendchar(read_fuse_lock(GET_EXTENDED_FUSE_BITS));
+			#endif
+
+		// Return device type
+		} 
+		else if (val == 't') 
+		{
+		sendchar(DEVTYPE);
+		sendchar(0);
+		// clear and set LED ignored
+		} 
+		else if ((val == 'x') || (val == 'y')) 
+		{
+		recvchar();
+		sendchar('\r');
+
+		// set device
+		} 
+		else if (val == 'T') 
+		{
+		device = recvchar();
+		sendchar('\r');
+		// Return software identifier
+		} 
+		else if (val == 'S') 
+		{
+		send_boot();
+
+		// Return Software Version
+		} 
+		else if (val == 'V') {
+		sendchar(VERSION_HIGH);
+		sendchar(VERSION_LOW);
+
+		// Return Signature Bytes (it seems that 
+		// AVRProg expects the "Atmel-byte" 0x1E last
+		// but shows it first in the dialog-window)
+		} 
+		else if (val == 's') 
+		{
+		sendchar(SIG_BYTE3);
+		sendchar(SIG_BYTE2);
+		sendchar(SIG_BYTE1);
+
+		/* ESC */
+		} 
+		else if(val != 0x1b) 
+		{
+		sendchar('?');
+		}
+	} 
+	return 0;
+}
diff --git a/Bootloader/makefile b/Bootloader/makefile
new file mode 100644
index 0000000..390043c
--- /dev/null
+++ b/Bootloader/makefile
@@ -0,0 +1,671 @@
+# Hey Emacs, this is a -*- makefile -*-
+#
+# Makefile for the AVRProg-compatible Bootloader
+#
+# based on the 
+# WinAVR Sample makefile written by Eric B. Weddington, Jörg Wunsch, et al.
+# Released to the Public Domain
+# Please read the make user manual!
+#
+# Additional material for this makefile was submitted by:
+#  Tim Henigan
+#  Peter Fleury
+#  Reiner Patommel
+#  Sander Pool
+#  Frederik Rouleau
+#  Markus Pfaff
+#
+# On command line:
+#
+# make all = Make software.
+#
+# make clean = Clean out built project files.
+#
+# make coff = Convert ELF to AVR COFF (for use with AVR Studio 3.x or VMLAB).
+#
+# make extcoff = Convert ELF to AVR Extended COFF (for use with AVR Studio
+#                4.07 or greater).
+#
+# make program = Download the hex file to the device, using avrdude.  Please
+#                customize the avrdude settings below first!
+#
+# make filename.s = Just compile filename.c into the assembler code only
+#
+# To rebuild project do "make clean" then "make all".
+#
+
+# user defined values
+
+# MCU name
+## MCU = atmega8
+#F_CPU = 11059200UL
+#F_CPU = 8000000UL
+#BAUDRATE = 9600
+MCU = atmega8
+LFUSE          = E4
+HFUSE          = DA
+MCU_PROGRAMMER = m8
+## MCU = atmega162
+## MCU = atmega169
+## MCU = atmega32
+## MCU = atmega324p
+## MCU = atmega64
+## MCU = atmega644
+## MCU = atmega644p
+## MCU = atmega128
+## MCU = at90can128
+
+################## BOOTLOADER ######################
+#  mt: Boot loader support. So far not done with a separate section
+#  to get the interrupt vector into the bootloader area (for BOOTINTVEC=yes).
+#  Bootloader address in datasheet and stk500 is given as
+#  "word", gcc toolchain needs "byte"-address
+#  (see LDFLAGS further down)
+
+#/* Select Boot Size in Words (select one, comment out the others) */
+## NO! BOOTSIZE=128
+## NO! BOOTSIZE=256
+BOOTSIZE=512
+#BOOTSIZE=1024
+## BOOTSIZE=2048
+
+# /* Select if bootloader should include the inverrupt-vectors 
+# when selecting 'no' here, the bootloader must not use
+# any interrupts and the modified linker-scripts are used. */
+##BOOTINTVEC=yes
+BOOTINTVEC=no
+
+##
+ifeq ($(MCU), atmega8)
+BFD_MACH=avr4
+ifeq ($(BOOTSIZE), 128)
+	MT_BOOTLOADER_ADDRESS = 0x1F00
+endif
+ifeq ($(BOOTSIZE), 256)
+	MT_BOOTLOADER_ADDRESS = 0x1E00
+endif
+ifeq ($(BOOTSIZE), 512)
+	MT_BOOTLOADER_ADDRESS = 0x1C00
+endif
+ifeq ($(BOOTSIZE), 1024)
+	MT_BOOTLOADER_ADDRESS = 0x1800
+endif
+endif
+
+##
+ifeq ($(MCU), atmega16)
+BFD_MACH=avr5
+ifeq ($(BOOTSIZE), 128)
+	MT_BOOTLOADER_ADDRESS = 0x3F00
+endif
+ifeq ($(BOOTSIZE), 256)
+	MT_BOOTLOADER_ADDRESS = 0x3E00
+endif
+ifeq ($(BOOTSIZE), 512)
+	MT_BOOTLOADER_ADDRESS = 0x3C00
+endif
+ifeq ($(BOOTSIZE), 1024)
+	MT_BOOTLOADER_ADDRESS = 0x3800
+endif
+endif
+
+##
+ifeq ($(MCU), atmega162)
+BFD_MACH=avr5
+ifeq ($(BOOTSIZE), 128)
+	MT_BOOTLOADER_ADDRESS = 0x3F00
+endif
+ifeq ($(BOOTSIZE), 256)
+	MT_BOOTLOADER_ADDRESS = 0x3E00
+endif
+ifeq ($(BOOTSIZE), 512)
+	MT_BOOTLOADER_ADDRESS = 0x3C00
+endif
+ifeq ($(BOOTSIZE), 1024)
+	MT_BOOTLOADER_ADDRESS = 0x3800
+endif
+endif
+
+##
+ifeq ($(MCU), atmega169)
+BFD_MACH=avr5
+ifeq ($(BOOTSIZE), 128)
+	MT_BOOTLOADER_ADDRESS = 0x3F00
+endif
+ifeq ($(BOOTSIZE), 256)
+	MT_BOOTLOADER_ADDRESS = 0x3E00
+endif
+ifeq ($(BOOTSIZE), 512)
+	MT_BOOTLOADER_ADDRESS = 0x3C00
+endif
+ifeq ($(BOOTSIZE), 1024)
+	MT_BOOTLOADER_ADDRESS = 0x3800
+endif
+endif
+
+##
+ifeq ($(MCU), atmega32)
+BFD_MACH=avr5
+ifeq ($(BOOTSIZE), 256)
+	MT_BOOTLOADER_ADDRESS = 0x7E00
+endif
+ifeq ($(BOOTSIZE), 512)
+	MT_BOOTLOADER_ADDRESS = 0x7C00
+endif
+ifeq ($(BOOTSIZE), 1024)
+	MT_BOOTLOADER_ADDRESS = 0x7800
+endif
+ifeq ($(BOOTSIZE), 2048)
+	MT_BOOTLOADER_ADDRESS = 0x7000
+endif
+endif
+
+##
+ifeq ($(MCU), atmega324p)
+BFD_MACH=avr5
+ifeq ($(BOOTSIZE), 256)
+	MT_BOOTLOADER_ADDRESS = 0x7E00
+endif
+ifeq ($(BOOTSIZE), 512)
+	MT_BOOTLOADER_ADDRESS = 0x7C00
+endif
+ifeq ($(BOOTSIZE), 1024)
+	MT_BOOTLOADER_ADDRESS = 0x7800
+endif
+ifeq ($(BOOTSIZE), 2048)
+	MT_BOOTLOADER_ADDRESS = 0x7000
+endif
+endif
+
+##
+ifeq ($(MCU), atmega64)
+BFD_MACH=avr5
+ifeq ($(BOOTSIZE), 512)
+	MT_BOOTLOADER_ADDRESS = 0xFC00
+endif
+ifeq ($(BOOTSIZE), 1024)
+	MT_BOOTLOADER_ADDRESS = 0xF800
+endif
+ifeq ($(BOOTSIZE), 2048)
+	MT_BOOTLOADER_ADDRESS = 0xF000
+endif
+ifeq ($(BOOTSIZE), 4096)
+	MT_BOOTLOADER_ADDRESS = 0xE000
+endif
+endif
+
+##
+ifeq ($(MCU), atmega644)
+BFD_MACH=avr5
+ifeq ($(BOOTSIZE), 512)
+	MT_BOOTLOADER_ADDRESS = 0xFC00
+endif
+ifeq ($(BOOTSIZE), 1024)
+	MT_BOOTLOADER_ADDRESS = 0xF800
+endif
+ifeq ($(BOOTSIZE), 2048)
+	MT_BOOTLOADER_ADDRESS = 0xF000
+endif
+ifeq ($(BOOTSIZE), 4096)
+	MT_BOOTLOADER_ADDRESS = 0xE000
+endif
+endif
+
+##
+ifeq ($(MCU), atmega644p)
+BFD_MACH=avr5
+ifeq ($(BOOTSIZE), 512)
+	MT_BOOTLOADER_ADDRESS = 0xFC00
+endif
+ifeq ($(BOOTSIZE), 1024)
+	MT_BOOTLOADER_ADDRESS = 0xF800
+endif
+ifeq ($(BOOTSIZE), 2048)
+	MT_BOOTLOADER_ADDRESS = 0xF000
+endif
+ifeq ($(BOOTSIZE), 4096)
+	MT_BOOTLOADER_ADDRESS = 0xE000
+endif
+endif
+
+##
+ifeq ($(MCU), atmega128)
+BFD_MACH=avr5
+ifeq ($(BOOTSIZE), 512)
+	MT_BOOTLOADER_ADDRESS = 0x1FC00
+endif
+ifeq ($(BOOTSIZE), 1024)
+	MT_BOOTLOADER_ADDRESS = 0x1F800
+endif
+ifeq ($(BOOTSIZE), 2048)
+	MT_BOOTLOADER_ADDRESS = 0x1F000
+endif
+ifeq ($(BOOTSIZE), 4096)
+	MT_BOOTLOADER_ADDRESS = 0x1E000
+endif
+endif
+
+##
+ifeq ($(MCU), at90can128)
+BFD_MACH=avr5
+ifeq ($(BOOTSIZE), 512)
+	MT_BOOTLOADER_ADDRESS = 0x1FC00
+endif
+ifeq ($(BOOTSIZE), 1024)
+	MT_BOOTLOADER_ADDRESS = 0x1F800
+endif
+ifeq ($(BOOTSIZE), 2048)
+	MT_BOOTLOADER_ADDRESS = 0x1F000
+endif
+ifeq ($(BOOTSIZE), 4096)
+	MT_BOOTLOADER_ADDRESS = 0x1E000
+endif
+endif
+
+
+# Output format. (can be srec, ihex, binary)
+FORMAT = ihex
+#FORMAT = srec
+
+# Target file name (without extension).
+TARGET = main
+
+
+# List C source files here. (C dependencies are automatically generated.)
+SRC = $(TARGET).c
+
+
+# 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 stabs [default], or dwarf-2.
+# AVR (extended) COFF requires stabs, plus an avr-objcopy run.
+DEBUG = stabs
+
+# List any extra directories to look for include files here.
+#     Each directory must be seperated by a space.
+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
+CDEFS = -DBOOTSIZE=$(BOOTSIZE)
+
+# Place -I options here
+CINCS =
+
+
+# Compiler flags.
+#  -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) $(CINCS)
+CFLAGS += -O$(OPT)
+CFLAGS += -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums
+CFLAGS += -Wall -Wstrict-prototypes
+CFLAGS += -Wa,-adhlns=$(<:.c=.lst)
+CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
+CFLAGS += $(CSTANDARD)
+
+
+
+# Assembler flags.
+#  -Wa,...:   tell GCC to pass this to the assembler.
+#  -ahlms:    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]
+ASFLAGS = -Wa,-adhlns=$(<:.S=.lst),-gstabs
+
+
+
+#Additional libraries.
+
+# 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
+
+PRINTF_LIB =
+
+# 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
+
+SCANF_LIB =
+
+MATH_LIB = -lm
+
+# 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,--defsym=__heap_start=0x801100,--defsym=__heap_end=0x80ffff
+
+EXTMEMOPTS =
+
+# Linker flags.
+#  -Wl,...:     tell GCC to pass this to linker.
+#    -Map:      create map file
+#    --cref:    add cross reference to  map file
+LDFLAGS = -Wl,-Map=$(TARGET).map,--cref
+LDFLAGS += $(EXTMEMOPTS)
+LDFLAGS += $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB)
+
+################## BOOTLOADER ######################
+# MT_BOOTLOADER_ADDRESS (=Start of Boot Loader section
+# in bytes - not words) as defined above.
+LDFLAGS += -Wl,--section-start=.text=$(MT_BOOTLOADER_ADDRESS)
+
+# check if linker-scripts without interrupt-vectors should
+# be used and set linker-option, announce to C-code by define
+ifeq ($(BOOTINTVEC), no)
+LDFLAGS += -T./ldscripts_no_vector/$(BFD_MACH).x
+CFLAGS  += -DBOOTLOADERHASNOVECTORS
+endif
+
+
+# Programming support using avrdude. Settings and variables.
+
+# Programming hardware: alf avr910 avrisp bascom bsd
+# dt006 pavr picoweb pony-stk200 sp12 stk200 stk500
+#
+# Type: avrdude -c ?
+# to get a full listing.
+#
+AVRDUDE_PROGRAMMER = stk500v2
+
+# com1 = serial port. Use lpt1 to connect to parallel port.
+AVRDUDE_PORT = com1    # programmer connected to serial device
+#AVRDUDE_PORT = /dev/ttyS0    # programmer connected to serial device
+
+AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex
+#AVRDUDE_WRITE_EEPROM = -U eeprom:w:$(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
+
+# 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 $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER)
+AVRDUDE_FLAGS += $(AVRDUDE_NO_VERIFY)
+AVRDUDE_FLAGS += $(AVRDUDE_VERBOSE)
+AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER)
+
+
+
+# ---------------------------------------------------------------------------
+
+# Define directories, if needed.
+#DIRAVR = c:/winavr
+#DIRAVRBIN = $(DIRAVR)/bin
+#DIRAVRUTILS = $(DIRAVR)/utils/bin
+#DIRINC = .
+#DIRLIB = $(DIRAVR)/avr/lib
+
+
+# Define programs and commands.
+#SHELL = $(DIRAVRUTILS)/sh
+#NM = $(DIRAVRBIN)/avr-nm
+#CC = $(DIRAVRBIN)/avr-gcc
+#OBJCOPY = $(DIRAVRBIN)/avr-objcopy
+#OBJDUMP= $(DIRAVRBIN)/avr-objdump
+#SIZE = $(DIRAVRBIN)/avr-size
+#AVRDUDE = $(DIRAVRBIN)/avrdude.sh
+#REMOVE = rm -f
+#COPY = cp
+
+# Define programs and commands.
+SHELL = sh
+CC = avr-gcc
+OBJCOPY = avr-objcopy
+OBJDUMP = avr-objdump
+SIZE = avr-size
+NM = avr-nm
+AVRDUDE = avrdude
+REMOVE = rm -f
+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:
+MSG_ASSEMBLING = Assembling:
+MSG_CLEANING = Cleaning project:
+
+
+
+
+# Define all object files.
+OBJ = $(SRC:.c=.o) $(ASRC:.S=.o)
+
+# Define all listing files.
+LST = $(ASRC:.S=.lst) $(SRC:.c=.lst)
+
+
+# Compiler flags to generate dependency files.
+### GENDEPFLAGS = -Wp,-M,-MP,-MT,$(*F).o,-MF,.dep/$(@F).d
+GENDEPFLAGS = -MD -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_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
+
+
+
+
+
+# Default target.
+all: begin gccversion sizebefore build sizeafter finished end
+
+build: elf hex eep lss sym
+
+elf: $(TARGET).elf
+hex: $(TARGET).hex
+eep: $(TARGET).eep
+lss: $(TARGET).lss
+sym: $(TARGET).sym
+
+
+
+# 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)
+
+finished:
+	@echo $(MSG_ERRORS_NONE)
+
+end:
+	@echo $(MSG_END)
+	@echo
+
+
+# Display size of file.
+HEXSIZE = $(SIZE) --target=$(FORMAT) $(TARGET).hex
+ELFSIZE = $(SIZE) -x -A $(TARGET).elf
+sizebefore:
+	@if [ -f $(TARGET).elf ]; then echo; echo $(MSG_SIZE_BEFORE); $(ELFSIZE); echo; fi
+
+sizeafter:
+	@if [ -f $(TARGET).elf ]; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); echo; fi
+
+
+
+# Display compiler version information.
+gccversion :
+	@$(CC) --version
+
+
+
+# Convert ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB.
+COFFCONVERT=$(OBJCOPY) --debugging \
+--change-section-address .data-0x800000 \
+--change-section-address .bss-0x800000 \
+--change-section-address .noinit-0x800000 \
+--change-section-address .eeprom-0x810000
+
+
+coff: $(TARGET).elf
+	@echo
+	@echo $(MSG_COFF) $(TARGET).cof
+	$(COFFCONVERT) -O coff-avr $< $(TARGET).cof
+
+
+extcoff: $(TARGET).elf
+	@echo
+	@echo $(MSG_EXTENDED_COFF) $(TARGET).cof
+	$(COFFCONVERT) -O coff-ext-avr $< $(TARGET).cof
+
+
+
+# Create final output files (.hex, .eep) from ELF output file.
+%.hex: %.elf
+	@echo
+	@echo $(MSG_FLASH) $@
+	$(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@
+
+%.eep: %.elf
+	@echo
+	@echo $(MSG_EEPROM) $@
+	-$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
+	--change-section-lma .eeprom=0 -O $(FORMAT) $< $@
+
+# Create extended listing file from ELF output file.
+%.lss: %.elf
+	@echo
+	@echo $(MSG_EXTENDED_LISTING) $@
+	$(OBJDUMP) -h -S $< > $@
+
+# Create a symbol table from ELF output file.
+%.sym: %.elf
+	@echo
+	@echo $(MSG_SYMBOL_TABLE) $@
+	$(NM) -n $< > $@
+
+
+
+# Link: create ELF output file from object files.
+.SECONDARY : $(TARGET).elf
+.PRECIOUS : $(OBJ)
+%.elf: $(OBJ)
+	@echo
+	@echo $(MSG_LINKING) $@
+	$(CC) $(ALL_CFLAGS) $(OBJ) --output $@ $(LDFLAGS)
+
+
+# Compile: create object files from C source files.
+%.o : %.c
+	@echo
+	@echo $(MSG_COMPILING) $<
+	$(CC) -c $(ALL_CFLAGS) $< -o $@
+
+
+# Compile: create assembler files from C source files.
+%.s : %.c
+	$(CC) -S $(ALL_CFLAGS) $< -o $@
+
+
+# Assemble: create object files from assembler source files.
+%.o : %.S
+	@echo
+	@echo $(MSG_ASSEMBLING) $<
+	$(CC) -c $(ALL_ASFLAGS) $< -o $@
+
+
+
+# Target: clean project.
+clean: begin clean_list finished end
+
+clean_list :
+	@echo
+	@echo $(MSG_CLEANING)
+	$(REMOVE) $(TARGET).hex
+	$(REMOVE) $(TARGET).eep
+	$(REMOVE) $(TARGET).obj
+	$(REMOVE) $(TARGET).cof
+	$(REMOVE) $(TARGET).elf
+	$(REMOVE) $(TARGET).map
+	$(REMOVE) $(TARGET).obj
+	$(REMOVE) $(TARGET).a90
+	$(REMOVE) $(TARGET).sym
+	$(REMOVE) $(TARGET).lnk
+	$(REMOVE) $(TARGET).lss
+	$(REMOVE) $(OBJ)
+	$(REMOVE) $(LST)
+	$(REMOVE) $(SRC:.c=.s)
+	$(REMOVE) $(SRC:.c=.d)
+	$(REMOVE) .dep/*
+
+
+
+# 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
+
+program: hex
+	avrdude -p $(MCU_PROGRAMMER) -c avrisp2 -P usb -U flash:w:main.hex -U lfuse:w:0x$(LFUSE):m -U hfuse:w:0x$(HFUSE):m -v -e
+#	avrdude -V -p $(MCU_PROGRAMMER) -c ftbb -P ft0 -U flash:w:main.hex -U lfuse:w:0x$(LFUSE):m -U hfuse:w:0x$(HFUSE):m -D
diff --git a/Bootloader/mega128.h b/Bootloader/mega128.h
new file mode 100644
index 0000000..a8f148c
--- /dev/null
+++ b/Bootloader/mega128.h
@@ -0,0 +1,39 @@
+#ifndef _MEGA128_H_
+#define _MEGA128_H_
+
+/* Part-Code ISP */
+#define DEVTYPE_ISP     0x43
+/* Part-Code Boot */
+#define DEVTYPE_BOOT    0x44
+
+#define SIG_BYTE1	0x1E
+#define SIG_BYTE2	0x97
+#define SIG_BYTE3	0x02
+
+#ifndef UART_USE_SECOND
+#define UART_BAUD_HIGH	UBRR0H
+#define UART_BAUD_LOW	UBRR0L
+#define UART_STATUS	UCSR0A
+#define UART_TXREADY	UDRE0
+#define UART_RXREADY	RXC0
+#define UART_DOUBLE	U2X0
+#define UART_CTRL	UCSR0B
+#define UART_CTRL_DATA	((1<<TXEN0) | (1<<RXEN0))
+#define UART_CTRL2	UCSR0C
+#define UART_CTRL2_DATA	((1<<UCSZ01) | (1<<UCSZ00))
+#define UART_DATA	UDR0
+#else
+#define UART_BAUD_HIGH	UBRR1H
+#define UART_BAUD_LOW	UBRR1L
+#define UART_STATUS	UCSR1A
+#define UART_TXREADY	UDRE1
+#define UART_RXREADY	RXC1
+#define UART_DOUBLE	U2X1
+#define UART_CTRL	UCSR1B
+#define UART_CTRL_DATA	((1<<TXEN1) | (1<<RXEN1))
+#define UART_CTRL2	UCSR1C
+#define UART_CTRL2_DATA	((1<<UCSZ11) | (1<<UCSZ10))
+#define UART_DATA	UDR1
+#endif
+
+#endif // #ifndef _MEGA128_H_
diff --git a/Bootloader/mega128can.h b/Bootloader/mega128can.h
new file mode 100644
index 0000000..08f6a0d
--- /dev/null
+++ b/Bootloader/mega128can.h
@@ -0,0 +1,42 @@
+#ifndef _MEGA128CAN_H_
+#define _MEGA128CAN_H_
+
+/* Dummy: use ATmega128 device-code for now, 
+   must be same as used in avrdude.conf */
+/* Part-Code ISP */
+#define DEVTYPE_ISP     0x43
+/* Part-Code Boot */
+#define DEVTYPE_BOOT    0x44
+
+#define SIG_BYTE1	0x1E
+#define SIG_BYTE2	0x97
+#define SIG_BYTE3	0x81
+
+
+#ifndef UART_USE_SECOND
+#define UART_BAUD_HIGH	UBRR0H
+#define UART_BAUD_LOW	UBRR0L
+#define UART_STATUS	UCSR0A
+#define UART_TXREADY	UDRE0
+#define UART_RXREADY	RXC0
+#define UART_DOUBLE	U2X0
+#define UART_CTRL	UCSR0B
+#define UART_CTRL_DATA	((1<<TXEN0) | (1<<RXEN0))
+#define UART_CTRL2	UCSR0C
+#define UART_CTRL2_DATA	((1<<UCSZ01) | (1<<UCSZ00))
+#define UART_DATA	UDR0
+#else
+#define UART_BAUD_HIGH	UBRR1H
+#define UART_BAUD_LOW	UBRR1L
+#define UART_STATUS	UCSR1A
+#define UART_TXREADY	UDRE1
+#define UART_RXREADY	RXC1
+#define UART_DOUBLE	U2X1
+#define UART_CTRL	UCSR1B
+#define UART_CTRL_DATA	((1<<TXEN1) | (1<<RXEN1))
+#define UART_CTRL2	UCSR1C
+#define UART_CTRL2_DATA	((1<<UCSZ11) | (1<<UCSZ10))
+#define UART_DATA	UDR1
+#endif
+
+#endif // #ifndef _MEGA128CAN_H_
diff --git a/Bootloader/mega16.h b/Bootloader/mega16.h
new file mode 100644
index 0000000..0c0bbe1
--- /dev/null
+++ b/Bootloader/mega16.h
@@ -0,0 +1,25 @@
+#ifndef _MEGA16_H_
+#define _MEGA16_H_
+
+/* Part-Code ISP */
+#define DEVTYPE_ISP     0x74
+/* Part-Code Boot */
+#define DEVTYPE_BOOT    0x75
+
+#define SIG_BYTE1	0x1E
+#define SIG_BYTE2	0x94
+#define SIG_BYTE3	0x03
+
+#define UART_BAUD_HIGH	UBRRH
+#define UART_BAUD_LOW	UBRRL
+#define UART_STATUS	UCSRA
+#define UART_TXREADY	UDRE
+#define UART_RXREADY	RXC
+#define UART_DOUBLE	U2X
+#define UART_CTRL	UCSRB
+#define UART_CTRL_DATA	((1<<TXEN) | (1<<RXEN))
+#define UART_CTRL2	UCSRC
+#define UART_CTRL2_DATA	((1<<URSEL) | (1<<UCSZ1) | (1<<UCSZ0))
+#define UART_DATA	UDR
+
+#endif // #ifndef _MEGA16_H_
diff --git a/Bootloader/mega162.h b/Bootloader/mega162.h
new file mode 100644
index 0000000..c2e30bb
--- /dev/null
+++ b/Bootloader/mega162.h
@@ -0,0 +1,45 @@
+#ifndef _MEGA162_H_
+#define _MEGA162_H_
+
+/* Part-Code ISP */
+// documented code (AVR109 AppNote) but not supported by AVRProg 1.40
+// #define DEVTYPE_ISP     0x62 
+// fake ATmega16 instead:
+#define DEVTYPE_ISP     0x74
+/* Part-Code Boot */
+// documented code but not supported by AVRProg 1.40
+// #define DEVTYPE_BOOT    0x63 
+// fake ATmega16:
+#define DEVTYPE_BOOT    0x75
+
+#define SIG_BYTE1	0x1E
+#define SIG_BYTE2	0x94
+#define SIG_BYTE3	0x04
+
+#ifndef UART_USE_SECOND
+#define UART_BAUD_HIGH     UBRR0H
+#define UART_BAUD_LOW      UBRR0L
+#define UART_STATUS        UCSR0A
+#define UART_TXREADY       UDRE0
+#define UART_RXREADY       RXC0
+#define UART_DOUBLE        U2X0
+#define UART_CTRL          UCSR0B
+#define UART_CTRL_DATA     ((1<<TXEN0) | (1<<RXEN0))
+#define UART_CTRL2         UCSR0C
+#define UART_CTRL2_DATA    ((1<<URSEL0) | (1<<UCSZ01) | (1<<UCSZ00))
+#define UART_DATA          UDR0
+#else
+#define UART_BAUD_HIGH	UBRR1H
+#define UART_BAUD_LOW	UBRR1L
+#define UART_STATUS	UCSR1A
+#define UART_TXREADY	UDRE1
+#define UART_RXREADY	RXC1
+#define UART_DOUBLE	U2X1
+#define UART_CTRL	UCSR1B
+#define UART_CTRL_DATA	((1<<TXEN1) | (1<<RXEN1))
+#define UART_CTRL2	UCSR1C
+#define UART_CTRL2_DATA	( (1<<URSEL1) | (1<<UCSZ11) | (1<<UCSZ10))
+#define UART_DATA	UDR1
+#endif
+
+#endif // #ifndef _MEGA162_H_
diff --git a/Bootloader/mega169.h b/Bootloader/mega169.h
new file mode 100644
index 0000000..27918e1
--- /dev/null
+++ b/Bootloader/mega169.h
@@ -0,0 +1,23 @@
+#ifndef _MEGA169_H_
+#define _MEGA169_H_
+
+#define DEVTYPE_ISP  0x78
+#define DEVTYPE_BOOT 0x79
+
+#define SIG_BYTE3	0x1E
+#define SIG_BYTE2	0x94
+#define SIG_BYTE1	0x05
+
+#define UART_BAUD_HIGH	UBRRH
+#define UART_BAUD_LOW	UBRRL
+#define UART_STATUS	UCSRA
+#define UART_TXREADY	UDRE
+#define UART_RXREADY	RXC
+#define UART_DOUBLE	U2X
+#define UART_CTRL	UCSRB
+#define UART_CTRL_DATA	((1<<TXEN) | (1<<RXEN))
+#define UART_CTRL2	UCSRC
+#define UART_CTRL2_DATA	((1<<UCSZ1) | (1<<UCSZ0))
+#define UART_DATA	UDR
+
+#endif // #ifndef _MEGA169_H_
diff --git a/Bootloader/mega32.h b/Bootloader/mega32.h
new file mode 100644
index 0000000..b09db16
--- /dev/null
+++ b/Bootloader/mega32.h
@@ -0,0 +1,25 @@
+#ifndef _MEGA32_H_
+#define _MEGA32_H_
+
+/* Part-Code ISP */
+#define DEVTYPE_ISP     0x72
+/* Part-Code Boot */
+#define DEVTYPE_BOOT    0x73
+
+#define SIG_BYTE1	0x1E
+#define SIG_BYTE2	0x95
+#define SIG_BYTE3	0x02
+
+#define UART_BAUD_HIGH	UBRRH
+#define UART_BAUD_LOW	UBRRL
+#define UART_STATUS	UCSRA
+#define UART_TXREADY	UDRE
+#define UART_RXREADY	RXC
+#define UART_DOUBLE	U2X
+#define UART_CTRL	UCSRB
+#define UART_CTRL_DATA	((1<<TXEN) | (1<<RXEN))
+#define UART_CTRL2	UCSRC
+#define UART_CTRL2_DATA	((1<<URSEL) | (1<<UCSZ1) | (1<<UCSZ0))
+#define UART_DATA	UDR
+
+#endif // #ifndef _MEGA32_H_
diff --git a/Bootloader/mega324p.h b/Bootloader/mega324p.h
new file mode 100644
index 0000000..c29f0e8
--- /dev/null
+++ b/Bootloader/mega324p.h
@@ -0,0 +1,17 @@
+#ifndef _MEGA324P_H_
+#define _MEGA324P_H_
+
+/* I (M. Thomas) could not find an official Boot-ID 
+   for the ATmega324P so pretend it's an ATmega32 */
+/* Part-Code ISP */
+#define DEVTYPE_ISP     0x72
+/* Part-Code Boot */
+#define DEVTYPE_BOOT    0x73
+
+#define SIG_BYTE1	0x1E
+#define SIG_BYTE2	0x95
+#define SIG_BYTE3	0x08
+
+#include "megaxx4p.h"
+
+#endif // #ifndef _MEGA324P_H_
diff --git a/Bootloader/mega64.h b/Bootloader/mega64.h
new file mode 100644
index 0000000..22009c8
--- /dev/null
+++ b/Bootloader/mega64.h
@@ -0,0 +1,39 @@
+#ifndef _MEGA64_H_
+#define _MEGA64_H_
+
+/* Part-Code ISP */
+#define DEVTYPE_ISP     0x45
+/* Part-Code Boot */
+#define DEVTYPE_BOOT    0x46
+
+#define SIG_BYTE1	0x1E
+#define SIG_BYTE2	0x96
+#define SIG_BYTE3	0x02
+
+#ifndef UART_USE_SECOND
+#define UART_BAUD_HIGH	UBRR0H
+#define UART_BAUD_LOW	UBRR0L
+#define UART_STATUS	UCSR0A
+#define UART_TXREADY	UDRE0
+#define UART_RXREADY	RXC0
+#define UART_DOUBLE	U2X0
+#define UART_CTRL	UCSR0B
+#define UART_CTRL_DATA	((1<<TXEN0) | (1<<RXEN0))
+#define UART_CTRL2	UCSR0C
+#define UART_CTRL2_DATA	((1<<UCSZ01) | (1<<UCSZ00))
+#define UART_DATA	UDR0
+#else
+#define UART_BAUD_HIGH	UBRR1H
+#define UART_BAUD_LOW	UBRR1L
+#define UART_STATUS	UCSR1A
+#define UART_TXREADY	UDRE1
+#define UART_RXREADY	RXC1
+#define UART_DOUBLE	U2X1
+#define UART_CTRL	UCSR1B
+#define UART_CTRL_DATA	((1<<TXEN1) | (1<<RXEN1))
+#define UART_CTRL2	UCSR1C
+#define UART_CTRL2_DATA	((1<<UCSZ11) | (1<<UCSZ10))
+#define UART_DATA	UDR1
+#endif
+
+#endif // #ifndef _MEGA64_H_
diff --git a/Bootloader/mega644.h b/Bootloader/mega644.h
new file mode 100644
index 0000000..0926944
--- /dev/null
+++ b/Bootloader/mega644.h
@@ -0,0 +1,42 @@
+#ifndef _MEGA644_H_
+#define _MEGA644_H_
+
+/* I (M. Thomas) could not find an official Boot-ID 
+   for the ATmega644 so pretend it's an ATmega64 */
+/* Part-Code ISP */
+#define DEVTYPE_ISP     0x45
+/* Part-Code Boot */
+#define DEVTYPE_BOOT    0x46
+
+#define SIG_BYTE1	0x1E
+#define SIG_BYTE2	0x96
+#define SIG_BYTE3	0x09
+
+#define UART_BAUD_HIGH	UBRR0H
+#define UART_BAUD_LOW	UBRR0L
+#define UART_STATUS	    UCSR0A
+#define UART_TXREADY	UDRE0
+#define UART_RXREADY	RXC0
+#define UART_DOUBLE	    U2X0
+#define UART_CTRL	    UCSR0B
+#define UART_CTRL_DATA	((1<<TXEN0) | (1<<RXEN0))
+#define UART_CTRL2	    UCSR0C
+#define UART_CTRL2_DATA	( (1<<UCSZ01) | (1<<UCSZ00))
+#define UART_DATA	    UDR0
+
+#define WDT_OFF_SPECIAL
+static inline void bootloader_wdt_off(void)
+{
+	cli();
+	wdt_reset();
+	/* Clear WDRF in MCUSR */
+	MCUSR &= ~(1<<WDRF);
+	/* Write logical one to WDCE and WDE */
+	/* Keep old prescaler setting to prevent unintentional time-out */
+	WDTCSR |= (1<<WDCE) | (1<<WDE);
+	/* Turn off WDT */
+	WDTCSR = 0x00;
+}
+
+
+#endif // #ifndef _MEGA644_H_
diff --git a/Bootloader/mega644p.h b/Bootloader/mega644p.h
new file mode 100644
index 0000000..4170480
--- /dev/null
+++ b/Bootloader/mega644p.h
@@ -0,0 +1,17 @@
+#ifndef _MEGA644P_H_
+#define _MEGA644P_H_
+
+/* I (M. Thomas) could not find an official Boot-ID 
+   for the ATmega644P so pretend it's an ATmega64 */
+/* Part-Code ISP */
+#define DEVTYPE_ISP     0x45
+/* Part-Code Boot */
+#define DEVTYPE_BOOT    0x46
+
+#define SIG_BYTE1	0x1E
+#define SIG_BYTE2	0x96
+#define SIG_BYTE3	0x0A
+
+#include "megaxx4p.h"
+
+#endif // #ifndef _MEGA644P_H_
diff --git a/Bootloader/mega8.h b/Bootloader/mega8.h
new file mode 100644
index 0000000..d101c97
--- /dev/null
+++ b/Bootloader/mega8.h
@@ -0,0 +1,25 @@
+#ifndef _MEGA8_H_
+#define _MEGA8_H_
+
+/* Part-Code ISP */
+#define DEVTYPE_ISP     0x76
+/* Part-Code BOOT */
+#define DEVTYPE_BOOT    0x77
+
+#define SIG_BYTE1	0x1E
+#define SIG_BYTE2	0x93
+#define SIG_BYTE3	0x07
+
+#define UART_BAUD_HIGH	UBRRH
+#define UART_BAUD_LOW	UBRRL
+#define UART_STATUS	UCSRA
+#define UART_TXREADY	UDRE
+#define UART_RXREADY	RXC
+#define UART_DOUBLE	U2X
+#define UART_CTRL	UCSRB
+#define UART_CTRL_DATA	((1<<TXEN) | (1<<RXEN))
+#define UART_CTRL2	UCSRC
+#define UART_CTRL2_DATA	((1<<URSEL) | (1<<UCSZ1) | (1<<UCSZ0))
+#define UART_DATA	UDR
+
+#endif // #ifndef _MEGA8_H_
diff --git a/Bootloader/megaxx4p.h b/Bootloader/megaxx4p.h
new file mode 100644
index 0000000..635eaf7
--- /dev/null
+++ b/Bootloader/megaxx4p.h
@@ -0,0 +1,47 @@
+#ifndef _MEGAxx4_H_
+#define _MEGAxx4_H_
+
+#ifndef UART_USE_SECOND
+/* UART 0 */
+#define UART_BAUD_HIGH	UBRR0H
+#define UART_BAUD_LOW	UBRR0L
+#define UART_STATUS	    UCSR0A
+#define UART_TXREADY	UDRE0
+#define UART_RXREADY	RXC0
+#define UART_DOUBLE	    U2X0
+#define UART_CTRL	    UCSR0B
+#define UART_CTRL_DATA	((1<<TXEN0) | (1<<RXEN0))
+#define UART_CTRL2	    UCSR0C
+#define UART_CTRL2_DATA	( (1<<UCSZ01) | (1<<UCSZ00))
+#define UART_DATA	    UDR0
+#else
+/* UART 1 */
+#define UART_BAUD_HIGH	UBRR1H
+#define UART_BAUD_LOW	UBRR1L
+#define UART_STATUS	    UCSR1A
+#define UART_TXREADY	UDRE1
+#define UART_RXREADY	RXC1
+#define UART_DOUBLE	    U2X1
+#define UART_CTRL	    UCSR1B
+#define UART_CTRL_DATA	((1<<TXEN1) | (1<<RXEN1))
+#define UART_CTRL2	    UCSR1C
+#define UART_CTRL2_DATA	( (1<<UCSZ11) | (1<<UCSZ10))
+#define UART_DATA	    UDR1
+#endif
+
+#define WDT_OFF_SPECIAL
+
+static inline void bootloader_wdt_off(void)
+{
+	cli();
+	wdt_reset();
+	/* Clear WDRF in MCUSR */
+	MCUSR &= ~(1<<WDRF);
+	/* Write logical one to WDCE and WDE */
+	/* Keep old prescaler setting to prevent unintentional time-out */
+	WDTCSR |= (1<<WDCE) | (1<<WDE);
+	/* Turn off WDT */
+	WDTCSR = 0x00;
+}
+
+#endif // #ifndef _MEGA644_H_
diff --git a/Bootloader/readme.txt b/Bootloader/readme.txt
new file mode 100644
index 0000000..b4c3486
--- /dev/null
+++ b/Bootloader/readme.txt
@@ -0,0 +1,267 @@
+
+======================================================
+
+  ATMEL AVR UART Bootloader for AVR-GCC/avr-libc
+
+  by Martin Thomas, Kaiserslautern, Germany
+  mthomas@rhrk.uni-kl.de
+  eversmith@heizung-thomas.de
+  http://www.siwawi.arubi.uni-kl.de/avr_projects
+
+  **  Addtional code and improvements contributed   **
+  **  by Uwe Bonnes, Bjoern Riemer and Olaf Rempel. **
+  
+  Eearly versions of this bootloader-code have been
+  based on the AVR Butterfly bootloader-source REV02
+  which has been available from atmel.com.
+
+======================================================
+
+
+Programming-Software (on the "PC-Side"):
+
+* AVRProg (included in AVRStudio) available at www.atmel.com.
+  MS-Windows only. AVRProg can be used as stand-alone application.
+  (avrprog.exe)
+
+* avrdude available at http://savannah.nongnu.org/projects/avrdude/
+  "Multiplattform"
+
+* Installation instructions at the end of this file.
+
+
+3. Dec. 2008 - Version 0.85
+
+* disable U2X before jump to app as suggested be Alexander Döller
+* moved UBRR-macros to main.c and changed them. Inspired by code from avr-libc setbaud.
+  (macros which are commented out (//) are from Pavel Fertser)
+
+6. Nov. 2008 - Version 0.84
+
+* Added definitions for ATmega64 provided by Pavel Fertser - Thanks.
+
+12. Apr. 2008 - Version 0.83
+
+* Added definitions for ATmega644P and ATmega324P
+* Tested with ATmega324P, gcc 4.2.2, avr-libc 1.4.6
+* Added testapp to verify "exit bootloader" with
+  watchdog (n.b.: watchdog-disable called early in testapp)
+
+27. Jan. 2007 - Version 0.82
+
+* Added definitions for ATmega644.
+* Using avr-lib's eeprom-functions (old "direct-access"-code
+  has not been compatible with ATmega644).
+* Watchdog-disable at startup (configurable): avoids problems with
+  repeated login to bootloader. Not needed if the bootloader is
+  never re-entered again between an "exit programming" and
+  a system-reset/power-toogle.
+* Additional watchdog disable-function for ATmega644.
+* Made watchdog-enable time at exit-programming a configuration-value 
+  (define).
+* Bootloader read-protection: if enabled the bootloader fakes
+  an empty boot-section (configurable by define)
+Since more of the avr-libc functions's are used this version
+should be more portable for other AVRs but the size of the 
+binary increases a little bit.
+Make sure to disable the watchdog early in the user-application
+esp. when using a "modern" AVR (i.e. ATmega48/88/168/644/324P/644P).
+
+3. Dec. 2006 - Version 0.81
+
+* Added definitions for ATmega162.
+* Fixed init for double-speed (bitmask). Thanks to Bernhard Roth
+
+28. May 2006 - Version 0.8beta3
+
+* Supports discarding of interrupt-vectors which saves some space
+  if no interrupts are needed in the bootloader. Added option 
+  in makefile to enable this feature, modified LDFLAGS, 
+  additional code in main.c for a pseudo default_interrupt ISR.
+  The modified linker-scripts have been contributed by 
+  Olaf Rempel (basicly just the .vector-section is not linked).
+* Reverted the order of signatur-byte-numbers in part-
+  configurations to the usual order in the datasheet, 
+  also reverted in main.c for sending the signature.
+* Definitions for lock/fuse-readout.
+* Updated installation-instruction at the end of this file.
+* Added DEVTYPE_ISP/DEVTYPE_BOOT to part-configurations,
+  added configuration-option for this in main.c.
+* A remark about the DEVTYPE: Usualy there are two
+  Part-Codes/Device-Codes. One is for ISP: AVRProg shows 
+  the type of the AVR. The other code is for bootloading:
+  AVRprog shows the type plus "BOOT". When a boot-device-code 
+  gets detected by AVRprog it "knows" how do handle the 
+  limited functionality of bootloaders. (When receiving the
+  ISP-code AVRProg expects an AVR910-type programmer.)
+  The offset between the codes is usualy 0x01 where the 
+  ISP-code is the smaller value, i.e. ATmega32 ISP-code 
+  is 0x72->"ATmega32" and boot-code is 0x73->"ATmega32 BOOT".
+  When using avrdude the bootloader's device-code must match
+  the device-code in the avrdude.conf. Check the avrdude-
+  code to see if both codes (AVR910 and AVR109) are supported.
+  -- I have got some e-mails from users which have been 
+  confused by this. Hopefully this explanation is good enough.
+* This bootloader lets the watchdog do a reset when the
+  user selects "Exit programmer" (i.e. in AVRProg) after an
+  update. Make sure to disable or reset the watchdog early in 
+  your application.
+
+27. May 2006 - Version 0.8beta2
+
+* More very well done improvements contributed by Olaf Rempel.
+* Olaf Rempel also modified the STARTUP_WAIT method.
+
+21. May 2006 - Version 0.8beta
+
+* Version contributed by Olaf Rempel. He has done a lot of modifications.
+  -> "cleaner code", smaller binaries.
+
+09. Feb. 2006 - Version 0.75
+
+* additional STARTUP_WAIT support contributed by Bjoern Riemer
+
+18. Aug. 2005 - Version 0.74
+
+* AT90CAN128 support contributed by Uwe Bonnes
+* Makefile modifications contributed by Uwe Bonnes
+
+23. Feb. 2005 - Version 0.7
+
+* (Version 0.6 has never been available on the web-page)
+* ATmega128 support
+* code cleanup
+* This version has been tested with ATmega8, ATmega32 and 
+  ATmega128
+
+7. Apr. 2004 - Version 0.5
+
+* added different startup-methods
+* compatible with ATmega8 now
+* included makefile adapted to ATmega8 now
+  (ATmega16 options still available)
+* fixed jump to application which did not work
+  reliably before
+* tested with ATmega8
+* minimal options and startup-code result in
+  bootloader-size < 512 words
+
+6. Apr. 2004 - Version 0.4
+
+* Buffered read of chars from UART during programming
+since eeprom-write is too slow for unbuffered
+operation. So EEPROM-upload does work now.
+* Added BOOTICE-mode to flash JTAGICE-compatible
+hardware (ATmega16@7,3Mhz) (if you know about BOOTICE,
+you may unterstand why this has been added, if not
+just keep the option disabled)
+* small changes in (my)boot.h (lock-bit-mask) found
+out during the development of the STK-500-compatible
+bootloader. But setting lock-bits still does not
+work with this bootloader.
+* read of the low-fuse byte works (high byte still TODO)
+* read of the lock-byte works (write still TODO)
+
+27. Mar 2004 - Version 0.3
+
+Felt that as much functions from avr-libc's boot.h
+as possible should be used without modifications.
+Latest CVS-version of boot.h is included.
+Only the read-routine is still "self-made" based
+on ATMELs assembler-code.
+EEPROM write on Mega16 does not work (and did not
+work with V0.2 too). May be caused by my old Mega16
+chip. Needs testing. Flash read/write and EEPROM
+read works. Still only tested with ATmega16.
+This version may not work with the ATmega169 any
+more.
+
+24. Mar 2004 - Version 0.2
+
+During the development of a data-logger application
+with the AVR-Butterfly there was a need to make
+some changes in the bootloader. The same problem
+again: no IAR compiler. The same way to solve the
+problem: a port of the code to avr-gcc/avr-libc.
+So this code is based on the ATMEL Butterfly
+bootloader source code Rev 0.2 for IAR.
+
+The bootloader-port for the Butterfly which mimics
+the complete functionality of the original
+BF-bootloader is availabe at:
+www.siwawi.arubi.uni-kl.de/avr_projects
+
+Atmel used a separate "lib" written in "pure"
+assembly to access the low-level functions
+for flash read/write. Well, so far I
+don't know how to use "mixed language sources"
+with the avr-gcc toolchain, so the low-level
+routines have been implemented as inline assembler.
+The avr-libc boot.h module written by Eric
+Weddington served as a template  Three of the four
+low-level routines found in lowlevel.c come from
+boot.h with minimal changes. The read routine has
+been developed based on the ATMEL assembler code.
+
+Ignore the fuse and lock-bit readout. Read and Set is
+not enabled (TODO).
+
+
+--------------- Installation -----------------
+
+- Change the MCU type in the makefile.
+
+- Change the boot(loader)-size in Makefile. The needed
+  space depends on the features selected in main.c
+
+- Set baudrate in main.c, a doublespeed configuration-option
+  is available too.
+
+- Change the F_CPU in main.c to the clock-frequency
+  of your board. See the datasheet for frequencies 
+  with minimum error at the selected baudrate.
+
+- Select the start-condition in main.c. 
+
+- Please use at least avr-gcc 3.3.1/avr-libc 1.0
+  or WINAVR Sept. 2003 or later to compile and link
+  this bootloader.
+
+- Upload the hex-File to the AVR (STK500, STK200, SP12
+  evertool, AVR910 etc.)
+
+- Program the "Boot Flash section size" (BOOTSZ fuses)
+  according to the boot-size selected in the makefile
+  i.e. BOOTSZ=00 for boot-size 1024 words (2048 bytes)
+  on ATmega16
+
+- enable the BOOT Reset Vector fuse (BOOTRST=0)
+
+- Set the lock bits to protect the bootloader from
+  SPM-writes (Boot Loader Protection Mode 2 in STK500-
+  plugin) so that it can not overwrite itself.
+
+- Connect the AVR UART Pins via level-shifter/inverter
+  (i.e. MAX232) to your PCs COM-Port.
+
+- Reset the AVR while fullfilling the bootloader start-
+  condition. (Default: selected pin connected to GND). 
+  The condition must be "true" until you see the 
+  AVRPROG dialog or avrdude connects.
+
+- Start AVRPROG (AVRStudio/Tools or stand-alone avrprog.exe)
+  AVRDUDE is supported too, check it's manual 
+  for command-line options. Read the text above for
+  information about Device-Types and AVRDUDE
+
+- AVRPROG or AVRDUDE should detect the bootloader.
+
+- see AVRStudio's online-help for more information how
+  to use AVRPROG
+
+- make sure to EXIT from AVRPROG (button) to start
+  your main-application or toogle power/reset.
+
+
+Feedback welcome, Good luck.
+Martin
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..1ab7ea0
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,153 @@
+MCU_PROGRAMMER = m8
+PROGRAMMER_TYPE = avr109 
+PROGRAMMER_PORT = com4
+
+PRG            = ibutton
+OBJ            = ibutton.o usart.o onewire.o cyfral.o usb.o metacom.o
+#MCU_TARGET     = at90s2313
+#MCU_TARGET     = at90s2333
+#MCU_TARGET     = at90s4414
+#MCU_TARGET     = at90s4433
+#MCU_TARGET     = at90s4434
+#MCU_TARGET     = at90s8515
+#MCU_TARGET     = at90s8535
+#MCU_TARGET     = atmega128
+#MCU_TARGET     = atmega1280
+#MCU_TARGET     = atmega1281
+#MCU_TARGET     = atmega16
+#MCU_TARGET     = atmega163
+#MCU_TARGET     = atmega164p
+#MCU_TARGET     = atmega165
+#MCU_TARGET     = atmega165p
+#MCU_TARGET     = atmega168
+#MCU_TARGET     = atmega169
+#MCU_TARGET     = atmega169p
+#MCU_TARGET     = atmega32
+#MCU_TARGET     = atmega324p
+#MCU_TARGET     = atmega325
+#MCU_TARGET     = atmega3250
+#MCU_TARGET     = atmega329
+#MCU_TARGET     = atmega3290
+#MCU_TARGET     = atmega48
+#MCU_TARGET     = atmega64
+#MCU_TARGET     = atmega640
+#MCU_TARGET     = atmega644
+#MCU_TARGET     = atmega644p
+#MCU_TARGET     = atmega645
+#MCU_TARGET     = atmega6450
+#MCU_TARGET     = atmega649
+#MCU_TARGET     = atmega6490
+MCU_TARGET     = atmega8
+#MCU_TARGET     = atmega8515
+#MCU_TARGET     = atmega8535
+#MCU_TARGET     = atmega88
+#MCU_TARGET     = attiny2313
+#MCU_TARGET     = attiny24
+#MCU_TARGET     = attiny25
+#MCU_TARGET     = attiny26
+#MCU_TARGET     = attiny261
+#MCU_TARGET     = attiny44
+#MCU_TARGET     = attiny45
+#MCU_TARGET     = attiny461
+#MCU_TARGET     = attiny84
+#MCU_TARGET     = attiny85
+#MCU_TARGET     = attiny861
+OPTIMIZE       = -O2
+
+DEFS           =
+LIBS           =
+
+# You should not have to change anything below here.
+
+CC             = avr-gcc
+
+# Override is only needed by avr-lib build system.
+
+override CFLAGS        = -g -Wall $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
+override LDFLAGS       = -Wl,-Map,$(PRG).map
+
+OBJCOPY        = avr-objcopy
+OBJDUMP        = avr-objdump
+
+all: $(PRG).elf lst text eeprom
+
+$(PRG).elf: $(OBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+# dependency:
+demo.o: demo.c
+
+clean:
+	rm -rf *.o $(PRG).elf *.eps *.png *.pdf *.bak 
+	rm -rf *.lst *.map $(EXTRA_CLEAN_FILES)
+
+lst:  $(PRG).lst
+
+%.lst: %.elf
+	$(OBJDUMP) -h -S $< > $@
+
+# Rules for building the .text rom images
+
+text: hex bin srec
+
+hex:  $(PRG).hex
+bin:  $(PRG).bin
+srec: $(PRG).srec
+
+%.hex: %.elf
+	$(OBJCOPY) -j .text -j .data -O ihex $< $@
+
+%.srec: %.elf
+	$(OBJCOPY) -j .text -j .data -O srec $< $@
+
+%.bin: %.elf
+	$(OBJCOPY) -j .text -j .data -O binary $< $@
+
+# Rules for building the .eeprom rom images
+
+eeprom: ehex ebin esrec
+
+ehex:  $(PRG)_eeprom.hex
+ebin:  $(PRG)_eeprom.bin
+esrec: $(PRG)_eeprom.srec
+
+%_eeprom.hex: %.elf
+	$(OBJCOPY) -j .eeprom --change-section-lma .eeprom=0 -O ihex $< $@ \
+	|| { echo empty $@ not generated; exit 0; }
+
+%_eeprom.srec: %.elf
+	$(OBJCOPY) -j .eeprom --change-section-lma .eeprom=0 -O srec $< $@ \
+	|| { echo empty $@ not generated; exit 0; }
+
+%_eeprom.bin: %.elf
+	$(OBJCOPY) -j .eeprom --change-section-lma .eeprom=0 -O binary $< $@ \
+	|| { echo empty $@ not generated; exit 0; }
+
+# Every thing below here is used by avr-libc's build system and can be ignored
+# by the casual user.
+
+FIG2DEV                 = fig2dev
+EXTRA_CLEAN_FILES       = *.hex *.bin *.srec
+
+dox: eps png pdf
+
+eps: $(PRG).eps
+png: $(PRG).png
+pdf: $(PRG).pdf
+
+%.eps: %.fig
+	$(FIG2DEV) -L eps $< $@
+
+%.pdf: %.fig
+	$(FIG2DEV) -L pdf $< $@
+
+%.png: %.fig
+	$(FIG2DEV) -L png $< $@
+
+program: hex
+	avrdude -V -p $(MCU_PROGRAMMER) -c $(PROGRAMMER_TYPE) -P $(PROGRAMMER_PORT) -U flash:w:$(PRG).hex
+#	avrdude -V -p $(MCU_PROGRAMMER) -c avrisp2 -P usb -U flash:w:$(PRG).hex
+
+read: 
+	avrdude -V -p $(MCU_PROGRAMMER) -c $(PROGRAMMER_TYPE) -P $(PROGRAMMER_PORT) -U eeprom:r:data.bin:r
+
diff --git a/bits.h b/bits.h
new file mode 100644
index 0000000..737199f
--- /dev/null
+++ b/bits.h
@@ -0,0 +1,12 @@
+#define set(reg,value) reg |= (value)
+#define unset(reg,value) reg &= ~(value)
+#define set_bit(reg,value) reg |= (_BV(value))
+#define set_bit2(reg,value1,value2) reg |= (_BV(value1) | _BV(value2))
+#define set_bit3(reg,value1,value2,value3) reg |= (_BV(value1) | _BV(value2) | _BV(value3))
+#define set_bit4(reg,value1,value2,value3,value4) reg |= (_BV(value1) | _BV(value2) | _BV(value3) | _BV(value4))
+#define set_bit5(reg,value1,value2,value3,value4,value5) reg |= (_BV(value1) | _BV(value2) | _BV(value3) | _BV(value4) | _BV(value5))
+#define unset_bit(reg,value) reg &= ~(_BV(value))
+#define unset_bit2(reg,value1,value2) reg &= ~(_BV(value1) | _BV(value2))
+#define unset_bit3(reg,value1,value2,value3) reg &= ~(_BV(value1) | _BV(value2) | _BV(value3))
+#define unset_bit4(reg,value1,value2,value3,value4) reg &= ~(_BV(value1) | _BV(value2) | _BV(value3) | _BV(value4))
+#define unset_bit5(reg,value1,value2,value3,value4,value5) reg &= ~(_BV(value1) | _BV(value2) | _BV(value3) | _BV(value4) | _BV(value5))
diff --git a/cyfral.c b/cyfral.c
new file mode 100644
index 0000000..9faec5d
--- /dev/null
+++ b/cyfral.c
@@ -0,0 +1,100 @@
+#include <avr/io.h>
+#include "defines.h"
+#include "ibutton.h"
+#include "bits.h"
+#include "cyfral.h"
+#include "onewire.h"
+
+inline void cyfral_send_nibble(uint8_t data)
+{
+	uint8_t b;
+	for (b = 0; b < 4; b++)
+	{
+		if (data & (1UL<<b))
+		{
+			ONEWIRE_MASTER_TX(105);			
+			ONEWIRE_WAIT(36);
+		} else {
+			ONEWIRE_MASTER_TX(53);			
+			ONEWIRE_WAIT(80);
+		}
+	}
+}
+
+void cyfral_send(uint16_t key)
+{
+	cyfral_send_nibble(0b0111);
+	uint8_t b;
+	for (b = 0; b < 8; b++)
+	{
+		speedup_leds();
+		update_leds();
+		cyfral_send_nibble(1UL << ((key >> (b*2)) & 0b11));
+	}
+}
+
+long int read_cyfral()
+{
+	uint16_t buffer[100];
+	int pos = 0;
+	do 
+	{
+		TCNT1 = 0;
+		while (!CYFRAL_SIGNAL && TCNT1 < 0x400);
+		if (TCNT1 >= 0x400) return -1;
+		//buffer[pos++] = TCNT1;
+		TCNT1 = 0;
+		while (CYFRAL_SIGNAL && TCNT1 < 0x400);
+		if (TCNT1 >= 0x400) return -1;
+		buffer[pos++] = TCNT1;
+		
+	} while (pos < sizeof(buffer)/2);
+	int i, j;
+	int startpos = -1;
+	for (i = 0; i < pos-9*4; i++)
+	{
+		if ((buffer[i] > 70) && (buffer[i+1] > 70)  && (buffer[i+2] > 70) && (buffer[i+3] < 70))
+		{
+			startpos = i;
+			break;
+		}
+	}
+	uint16_t code = 0;
+	int b = 0;
+	if (startpos >= 0)
+	{
+		for (i = startpos+4; i < startpos+9*4; i+=4)
+		{
+			for (j = 0; j < 4; j++)
+			{
+				//send_num(buffer[i+j]);
+				if (buffer[i+j] > 70)
+					code |= j << (b*2);
+			}
+			b++;
+		}
+	} else return -1;
+	return code;	
+}
+
+long int read_cyfral_with_check()	
+{
+	long int code = 0, tries = 0, i;
+	for (i = 0; i < 10; i++)
+	{
+		long int code2 = read_cyfral();
+		if ((code2 >= 0) && (code == code2))
+		{
+			tries++;
+		} else {
+			tries = 0;
+			code = code2;
+		}
+		if (tries >= 3) 
+		{
+			return code2;
+		}
+	}	
+	return -1;
+}
+
diff --git a/cyfral.h b/cyfral.h
new file mode 100644
index 0000000..763ece8
--- /dev/null
+++ b/cyfral.h
@@ -0,0 +1,5 @@
+#define CYFRAL_SIGNAL !(ACSR & (1<<ACO))
+
+void cyfral_send(uint16_t key);
+long int read_cyfral(void);
+long int read_cyfral_with_check(void);
diff --git a/defines.h b/defines.h
new file mode 100644
index 0000000..ad715df
--- /dev/null
+++ b/defines.h
@@ -0,0 +1,34 @@
+#define F_CPU 8000000UL
+#define UART_BAUD 19200
+
+
+#define LED_TOP_PORT C
+#define LED_TOP_PIN 0
+#define LED_TOP_RIGHT_PORT C
+#define LED_TOP_RIGHT_PIN 1
+#define LED_BOTTOM_RIGHT_PORT B
+#define LED_BOTTOM_RIGHT_PIN 1
+#define LED_BOTTOM_PORT B
+#define LED_BOTTOM_PIN 2
+#define LED_BOTTOM_LEFT_PORT B
+#define LED_BOTTOM_LEFT_PIN 3
+#define LED_TOP_LEFT_PORT B
+#define LED_TOP_LEFT_PIN 5
+#define LED_CENTER_PORT B
+#define LED_CENTER_PIN 4
+
+#define BUTTON_PORT D
+#define BUTTON_PIN 3
+
+#define USB_DETECT_PORT D
+#define USB_DETECT_PIN 2
+
+#define LINE_ENABLE_PORT B
+#define LINE_ENABLE_PIN 6
+
+#define CYFRAL_PULLUP_PORT B
+#define CYFRAL_PULLUP_PIN 7
+
+#define CYFRAL_REFERENCE_PORT B
+#define CYFRAL_REFERENCE_PIN 0
+
diff --git a/drago_log.log b/drago_log.log
new file mode 100644
index 0000000..4338262
--- /dev/null
+++ b/drago_log.log
diff --git a/ibutton.c b/ibutton.c
new file mode 100644
index 0000000..4df3076
--- /dev/null
+++ b/ibutton.c
@@ -0,0 +1,529 @@
+#include "defines.h"
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#include <avr/sleep.h>
+#include <avr/eeprom.h>
+#include <util/delay.h>
+#include <avr/pgmspace.h>
+#include <avr/wdt.h>
+#include "ibutton.h"
+#include "bits.h"
+#include "onewire.h"
+#include "cyfral.h"
+#include "metacom.h"
+#include "usb.h"
+
+unsigned char VEZDEHOD_KEY1[] PROGMEM = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D};
+unsigned char VEZDEHOD_KEY2[] PROGMEM = {0x01, 0xBE, 0x40, 0x11, 0x5A, 0x36, 0x00, 0xE1};
+unsigned char VEZDEHOD_KEY3[] PROGMEM = {0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x2F};
+unsigned char VEZDEHOD_KEY4[] PROGMEM = {0xFE, 0xFF, 0xFF, 0xFF, 0xFF};
+unsigned char VEZDEHOD_KEY5[] PROGMEM = {0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x9B};
+unsigned char VEZDEHOD_KEY6[] PROGMEM = {0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x1A};
+unsigned char VEZDEHOD_KEY7[] PROGMEM = {0xFF, 0xFF, 0xFF};
+unsigned char VEZDEHOD_KEY8[] PROGMEM = {0xFF, 0x00, 0x00};
+unsigned char VEZDEHOD_KEY9[] PROGMEM = {0x01, 0xBE, 0x40, 0x11, 0x0A, 0x00, 0x00, 0x1D};
+unsigned char VEZDEHOD_KEY10[] PROGMEM = {0x01, 0x05, 0xE7, 0x56, 0x0B, 0x00, 0x00, 0x4D};
+unsigned char VEZDEHOD_KEY11[] PROGMEM = {0x01, 0x48, 0x7A, 0x44, 0x0D, 0x00, 0x00, 0xC7};
+unsigned char VEZDEHOD_KEY12[] PROGMEM = {0x01, 0x87, 0x26, 0x87, 0x0B, 0x00, 0x00, 0xA8};
+unsigned char VEZDEHOD_KEY13[] PROGMEM = {0x01, 0x46, 0x81, 0x57, 0x0B, 0x00, 0x00, 0x63};
+unsigned char VEZDEHOD_KEY14[] PROGMEM = {0x01, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x2D};
+unsigned char VEZDEHOD_KEY15[] PROGMEM = {0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x14};
+unsigned char VEZDEHOD_KEY16[] PROGMEM = {0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xB2};
+unsigned char VEZDEHOD_KEY17[] PROGMEM = {0x01, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x74};
+unsigned char VEZDEHOD_KEY18[] PROGMEM = {0x01, 0x4C, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x71};
+unsigned char VEZDEHOD_KEY19[] PROGMEM = {0x01, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x49};
+unsigned char VEZDEHOD_KEY20[] PROGMEM = {0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4C, 0xFF};
+unsigned char VEZDEHOD_KEY21[] PROGMEM = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x37, 0x00};
+unsigned char VEZDEHOD_KEY22[] PROGMEM = {0x01, 0xF0, 0xD6, 0xBC, 0x0B, 0x00, 0x00, 0xCF};
+unsigned char VEZDEHOD_KEY23[] PROGMEM = {0x01, 0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x5D};
+unsigned char VEZDEHOD_KEY24[] PROGMEM = {0x01, 0x38, 0x3A, 0x65, 0x0E, 0x00, 0x00, 0xAD};
+unsigned char* VEZDEHOD_KEYS[] = {VEZDEHOD_KEY1, VEZDEHOD_KEY2, VEZDEHOD_KEY3, VEZDEHOD_KEY4, VEZDEHOD_KEY5, VEZDEHOD_KEY6, VEZDEHOD_KEY7, VEZDEHOD_KEY8, VEZDEHOD_KEY9, VEZDEHOD_KEY10, VEZDEHOD_KEY11, VEZDEHOD_KEY12, VEZDEHOD_KEY13, VEZDEHOD_KEY14, VEZDEHOD_KEY15, VEZDEHOD_KEY16, VEZDEHOD_KEY17, VEZDEHOD_KEY18, VEZDEHOD_KEY19, VEZDEHOD_KEY20, VEZDEHOD_KEY21, VEZDEHOD_KEY22, VEZDEHOD_KEY23, VEZDEHOD_KEY24};
+
+volatile unsigned char key_count = 0;
+unsigned char current_key = 0;
+unsigned char leds_mask = 0;
+unsigned char vezdehod_mode = 0;
+uint16_t leds_time = 0;
+
+uint16_t debug_log[128];
+uint8_t debug_log_size = 0;
+#define WRITE_LOG(t) if (debug_log_size < 128) debug_log[debug_log_size++] = t
+
+ISR(INT0_vect)
+{
+	unset_bit(GICR, INT0);
+}
+
+ISR(INT1_vect)
+{
+	unset_bit(GICR, INT1);
+}
+
+
+void set_leds(unsigned char leds_mask)
+{
+	if (leds_mask & (1<<0)) set_bit(LED1_PORT, LED1_PIN); else unset_bit(LED1_PORT, LED1_PIN); // top led
+	if (leds_mask & (1<<1)) set_bit(LED2_PORT, LED2_PIN); else unset_bit(LED2_PORT, LED2_PIN); // top-right led
+	if (leds_mask & (1<<2)) set_bit(LED3_PORT, LED3_PIN); else unset_bit(LED3_PORT, LED3_PIN); // bottom-right led
+	if (leds_mask & (1<<3)) set_bit(LED4_PORT, LED4_PIN); else unset_bit(LED4_PORT, LED4_PIN); // bottom led
+	if (leds_mask & (1<<4)) set_bit(LED5_PORT, LED5_PIN); else unset_bit(LED5_PORT, LED5_PIN); // bottom-left led	
+	if (leds_mask & (1<<5)) set_bit(LED6_PORT, LED6_PIN); else unset_bit(LED6_PORT, LED6_PIN); // top-left led	
+	if (leds_mask & (1<<6)) set_bit(LED7_PORT, LED7_PIN); else unset_bit(LED7_PORT, LED7_PIN); // center led	
+}
+
+void speedup_leds(void)
+{
+	leds_time+=32;
+}
+
+void update_leds(void)
+{
+	leds_time++;
+	//if (leds_time >= 16) leds_time = 0;
+	if ((leds_mask & (1<<7)) && ((leds_time >> 13) % 2 == 1))
+		set_leds(0);
+	else set_leds(leds_mask & (1UL << (leds_time % 16)));
+}
+
+void update_leds_bright(void)
+{
+	leds_time++;
+	//if (leds_time > 6) leds_time = 0;
+	if ((leds_mask & (1<<7)) && ((leds_time >> 13) % 2 == 1))
+		set_leds(0);
+	else set_leds(leds_mask & (1UL << (leds_time % 8)));
+}
+
+void show_digit(unsigned char digit)
+{
+	unsigned char mask = 0;
+	switch (digit&0x0F)
+	{
+		case 0: mask = 0b00111111; break;
+		case 1: mask = 0b00000110; break;
+		case 2: mask = 0b01011011; break;
+		case 3: mask = 0b01001111; break;
+		case 4: mask = 0b01100110; break;
+		case 5: mask = 0b01101101; break;
+		case 6: mask = 0b01111101; break;
+		case 7: mask = 0b00000111; break;
+		case 8: mask = 0b01111111; break;
+		case 9: mask = 0b01101111; break;
+		case 0xA: mask = 0b01110111; break;
+		case 0xB: mask = 0b01111100; break;
+		case 0xC: mask = 0b00111001; break;
+		case 0xD: mask = 0b01011110; break;
+		case 0xE: mask = 0b01111001; break;
+		case 0xF: mask = 0b01110001; break;
+		default: mask = 0; break;
+	}
+	if (digit >> 4) mask |= (1<<7);
+	leds_mask = mask;
+	set_leds(mask);
+}
+
+int key_exists(unsigned char* new_key)
+{
+	unsigned char i, i2, bingo;
+	unsigned char old_key[8];
+	for (i = 0; i < key_count; i++)
+	{
+		bingo = 1;
+		eeprom_read_block(old_key, (void*)((i+1)*8), 8);
+		for (i2 = 0; i2 < 8; i2++) if (new_key[i2] != old_key[i2]) bingo = 0;
+		if (bingo) return i+1;
+	}
+	return 0;
+}
+
+int read_mode()
+{
+	onewire_init();
+/*
+	USART_init();
+	set_bit(UCSRB, TXEN); // Âêëþ÷àåì TX
+	*/
+
+	int t = 0;
+	unsigned char serial[8];
+	char read_ok = 0;
+
+	leds_mask = 1<<6;
+	while (BUTTON_PRESSED)
+	{
+		wdt_reset();
+		update_leds();
+		_delay_ms(1);
+	}
+
+	while (1)
+	{
+		wdt_reset();
+		update_leds();
+		char res = onewire_write_reset();
+		if (res)
+		{
+			onewire_write_byte(ONEWIRE_COMMAND_READ_ROM);
+			int b;
+			for (b = 0; b < 8; b++)
+				serial[b] = onewire_read_byte();						
+			if ((onewire_check_crc(serial, 8) == 0) && !onewire_all_zeros(serial, 8))
+			{
+				read_ok = 1;
+			}
+		}
+		CYFRAL_PULLUP_ENABLE;  // ïîäòÿæêà 750 Îì
+		CYFRAL_REFERENCE_ENABLE; // äåëèòåëü íàïðÿæåííèÿ
+		long int code = read_cyfral_with_check();		
+		CYFRAL_PULLUP_DISABLE;
+		CYFRAL_REFERENCE_DISABLE;
+		if (code >= 0)
+		{
+			serial[0] = 0xFF;
+			serial[1] = code & 0xFF;
+			serial[2] = (code>>8) & 0xFF;
+			serial[3] = serial[4] = serial[5] = serial[6] = serial[7] = 0;
+			read_ok = 1;
+		}
+		t++;
+		if (t > 2000)
+		{
+			return 0;
+		}
+		if (BUTTON_PRESSED || USB_POWERED)
+		{
+			return 1; // âîçâðàò â îñíîâíîé ðåæèè
+		}
+		
+		if (read_ok)
+		{
+			read_ok = 0;
+			t = 0;
+
+			int exists = key_exists(serial);
+			int num;
+			if (!exists)
+			{
+				current_key = key_count;
+				key_count++;
+				eeprom_write_block(serial, (void*)(key_count*8), 8);		
+				eeprom_write_byte((void*)0, key_count);
+				num = key_count;
+			} else 
+			{
+				num = exists;
+			}
+			for (t = 0; t < 3; t++)
+			{
+				show_digit(num);
+				int i;
+				for (i = 0;i < 300; i++)
+				{
+					wdt_reset();
+					update_leds();
+					_delay_ms(1);					
+				}
+				set_leds(0);
+				for (i = 0;i < 300; i++)
+				{
+					wdt_reset();
+					_delay_ms(1);					
+				}
+			}			
+			leds_mask = 1<<6;
+		}
+	}
+}
+
+int ibutton_read_byte_from_master(unsigned char* value) // ×èòàåò áàéò îò ìàñòåðà. Òàéìàóò - âîçâðàùàåò 0, ðåñåò - 1, óäà÷íî - 2
+{
+	int i;
+	*value = 0;
+	for (i = 0; i < 8; i++) // Æäåì êîìàíäó
+	{
+		TCNT1 = 0; while (!ONEWIRE_MASTER_RX && (TCNT1 < 30000)); if (TCNT1 >= 30000) return 0;
+		TCNT1 = 0; while (ONEWIRE_MASTER_RX && (TCNT1 < 30000));
+		WRITE_LOG(TCNT1);
+		if (TCNT1 >= 300) return 1;
+		if (TCNT1 < 45) *value |= (1 << i);
+	}
+	return 2;
+}
+
+int ibutton_wait_for_master3(unsigned char* key)
+{
+	WRITE_LOG(0);
+	wdt_reset(); 
+	set_leds(0);	// ãàñèì ñâåòîäèîäû, ò.ê. íåò âðåìåíè èìè ìèãàòü
+	ONEWIRE_WAIT(20); // delay 20us
+	ONEWIRE_MASTER_TX(140);
+	TCNT1 = 0; while (ONEWIRE_MASTER_RX && (TCNT1 < 30000));
+	if (TCNT1 >= 300) return 1;
+	int i, bit;
+	unsigned char command = 0;
+	i = ibutton_read_byte_from_master(&command); // Ïîëó÷àåì êîììàíäó
+	if (i != 2) return i;
+
+	if (command == ONEWIRE_COMMAND_SKIP_ROM) // åñëè íàì ñíà÷àëà ïðèñëàëè SKIP_ROM êîìàíäó. Íà ïðàêòèêå òàêîãî íå áûâàëî.
+	{
+		i = ibutton_read_byte_from_master(&command);
+		if (i != 2) return i;
+	}
+
+	if ((command == 0x33) || (command == 0x0F)) // Ïîëó÷èëè çàïðîñ, øë¸ì êëþ÷
+	{
+		for (i = 0; i < 8; i++)
+		{
+			for (bit = 0; bit < 8; bit++)
+			{
+				TCNT1 = 0; while ((!ONEWIRE_MASTER_RX) && (TCNT1 < 30000)); if (TCNT1 >= 30000) return 0;
+				if (((key[i] >> bit) & 1) == 0) 
+				{
+					ONEWIRE_MASTER_TX(35);
+				}
+				TCNT1 = 0; while (ONEWIRE_MASTER_RX && (TCNT1 < 30000));
+				WRITE_LOG(TCNT1+1);
+				if (TCNT1 >= 350) return 1;
+			}
+		}
+	} 
+	return 0;
+}
+
+void ibutton_wait_for_master2(unsigned char* key)
+{
+	int reset;
+	do
+	{
+		reset = ibutton_wait_for_master3(key);	
+	} while (reset); // Åñëè â ðåçóëüòàòå îáùåíèÿ ïîëó÷èëè ðåñåò, òî íà÷èíàåì îáùåíèå çàíîâî
+}
+
+void ibutton_wait_for_master(unsigned char* key)
+{
+	int waittime;
+	for (waittime = 0; waittime < 100; waittime++)
+	{		
+		wdt_reset();
+		TCNT1 = 0;
+		while (!ONEWIRE_MASTER_RX && (TCNT1 < 30000)) // Ïîêà íåò ñèãíàëà
+		{
+			wdt_reset();
+			update_leds();
+			if (BUTTON_PRESSED || USB_POWERED) return;
+		}; 
+		TCNT1 = 0;	
+		while (ONEWIRE_MASTER_RX) if (TCNT1 > 30000) TCNT1 = 30000; // Ïîêà åñòü ñèãíàë
+		if (TCNT1 > 300) // Íå ñëèøêîì êîðîòêèé
+		{
+			WRITE_LOG(TCNT1);
+			ibutton_wait_for_master2(key); // Äâåðü çàãîâîðèëà, îòâå÷àåì
+			waittime = 0;
+		}		
+	}
+	ibutton_wait_for_master2(key); // Íå äîæäàëèñü, íà÷èíàåì ñàìè
+}
+
+
+int send_mode()
+{	
+	if (!key_count) return 1;
+	int t;
+	while (1)
+	{
+		if (current_key >= key_count) current_key = 0;
+		show_digit(current_key+1);
+		while (BUTTON_PRESSED)
+		{
+			wdt_reset();
+			update_leds_bright();
+			_delay_ms(1);
+		}
+		unsigned char key[8];
+		if (!vezdehod_mode)
+			eeprom_read_block(key, (void*)((current_key+1)*8), 8);
+		else
+		{ // Åñëè ðåæèì âåçäåõîäà, òî ÷èòàåì êëþ÷ èç PGM ïàìÿòè
+			int i;
+			for (i = 0; i < 8; i++)
+				key[i] = pgm_read_byte(&VEZDEHOD_KEYS[current_key][i]);
+		}
+		onewire_init();
+		t = 0;
+		while (1)
+		{
+			if (key[0] == 0xFF) // Öèôðàë
+			{
+				if (t > 1000) return 0;
+				wdt_reset();
+				speedup_leds();
+				update_leds();
+				uint16_t cyfral_key = key[1] + key[2]*0x100;
+				cyfral_send(cyfral_key);
+			}
+			else if (key[0] == 0xFE) // Ìåòàêîì
+			{
+				if (t > 1000) return 0;
+				wdt_reset();
+				update_leds();
+				metacom_send(key+1);
+			} else {
+				if (t >= 2) return 0;
+				ibutton_wait_for_master(key);
+			}					
+			
+			if (BUTTON_PRESSED)
+			{
+				t = 0;
+				current_key++;				
+				if (current_key >= key_count) current_key = 0;
+				show_digit(current_key+1);
+				while (BUTTON_PRESSED)
+				{
+					wdt_reset();
+					update_leds_bright();
+					_delay_ms(1);
+					t++;
+					if (t >= 1000 && !vezdehod_mode) return 1; // ñìåíà ðåæèìà
+				}
+				break;
+			}
+			if (USB_POWERED) return 1;
+			t++;
+		}
+	}	
+}
+
+void sleep()
+{
+	onewire_init();
+	set_leds(0);
+	UCSRB = 0; // disable USART
+	unset_bit(PORTD, 0); unset_bit(PORTD, 1); // Ïðèæèìàåì USART ê çåìëå
+	set_bit(DDRD, 0); set_bit(DDRD, 1);
+
+	LINE_DISABLE;
+	CYFRAL_PULLUP_DISABLE;
+	CYFRAL_REFERENCE_DISABLE;
+	
+	set_bit(MCUCR, SM1); unset_bit2(MCUCR, SM0, SM2); // Power-down ñïÿùèé ðåæèì
+	set_bit2(GICR, INT1, INT0); // Âêëþ÷àåì ïðåðûâàíèÿ
+
+	set_bit(WDTCR, WDCE), unset_bit(WDTCR, WDE); // Ñîáàêó âûêëþ÷àåì
+	
+	if (BUTTON_PRESSED || USB_POWERED) return;
+	sleep_mode();
+}
+
+int main (void)
+{
+	UCSRB = 0; // disable USART
+
+	//set_bit(TCCR1B, CS11); unset_bit2(TCCR1B, CS12, CS10); // òàéìåð ñ äåëèòåëåì íà 8
+
+	set_bit(LED1_DDR, LED1_PIN); // top led
+	set_bit(LED2_DDR, LED2_PIN); // top-right led
+	set_bit(LED3_DDR, LED3_PIN); // bottom-right led
+	set_bit(LED4_DDR, LED4_PIN); // bottom led
+	set_bit(LED5_DDR, LED5_PIN); // bottom-left led	
+	set_bit(LED6_DDR, LED6_PIN); // top-left led	
+	set_bit(LED7_DDR, LED7_PIN); // center led	
+	
+	unset_bit(BUTTON_DDR, BUTTON_PIN);	set_bit(BUTTON_OUT, BUTTON_PIN); // ïîäòÿæêà êíîïêè
+	unset_bit(USB_DETECT_DDR, USB_DETECT_PIN);	set_bit(USB_DETECT_OUT, USB_DETECT_PIN); // ïîäòÿæêà îïðåäåëåíèÿ USB	
+	unset_bit(CYFRAL_PULLUP_DDR, CYFRAL_PULLUP_PIN); unset_bit(CYFRAL_PULLUP_OUT, CYFRAL_PULLUP_PIN); // ïîäòÿæêà 750 Îì âûêëþ÷åíà
+	set_bit(CYFRAL_REFERENCE_DDR, CYFRAL_REFERENCE_PIN); unset_bit(CYFRAL_REFERENCE_OUT, CYFRAL_REFERENCE_PIN); // äåëèòåëü íàïðÿæåíèÿ âûêëþ÷åí
+	set_bit(LINE_ENABLE_DDR, LINE_ENABLE_PIN); unset_bit(LINE_ENABLE_OUT, LINE_ENABLE_PIN); // ëèíèÿ âûêëþ÷åíà
+	onewire_init();
+
+	// ëèøíèå íîãè ïðèæèìàåì ê çåìëå
+	set_bit(DDRC, 4); unset_bit(PORTC, 4);
+	set_bit(DDRC, 5); unset_bit(PORTC, 5);
+	set_bit(DDRD, 4); unset_bit(PORTD, 4);	
+		
+	sei();
+
+	int b, i;
+/*
+	LINE_ENABLE;
+	CYFRAL_REFERENCE_ENABLE;
+	while(1)
+	for(b = 0; b < 10; b++)
+	{
+		if (CYFRAL_SIGNAL)
+			show_digit(1);
+		else 
+			show_digit(0);
+	}
+	*/
+	
+	while (1)
+	{
+		set_bit(WDTCR, WDCE), set_bit(WDTCR, WDE); // Ñîáàêà
+		set_bit(WDTCR, WDCE), set_bit3(WDTCR, WDP2, WDP1, WDP0); // Íåñïåøàùàÿ ñîáàêà
+
+		int t = 0;
+		vezdehod_mode = 0;
+		do
+		{
+			// Ïðè âêëþ÷åíèè ïîêàçûâàåì áåãóùèé ïî êðóãó ñâåòîäèîä
+			for(b = 0; b < 6; b++)
+			{
+				//set_leds(1<<b);
+				leds_mask = 1<<b;
+				for (i = 0;i < 30; i++) // Æä¸ì 30ìñ, îáíóëÿÿ ñîáàêó è îáíîâëÿÿ ñâåòîäèîäû
+				{
+					wdt_reset();
+					update_leds();
+					_delay_ms(1);					
+				}
+			}
+			t++;
+			if (t == 5) // Åñëè äîëãî äåðæèì êíîïêó, òî ïèøåì ëîã äëÿ îòëàäêè
+			{
+				show_digit(0);
+				/*
+				eeprom_write_byte((void*)1, debug_log_size);				
+				eeprom_write_block((char*)debug_log, (void*)256, debug_log_size*2);		
+				*/
+				debug_log_size = 0;
+				for (i = 0;i < 500; i++)
+				{
+					wdt_reset();
+					update_leds();
+					_delay_ms(1);					
+				}
+				vezdehod_mode = 1; // Âêëþ÷àåì ðåæèì âåçäåõîä-êëþ÷åé!
+				current_key = 0;
+/*				
+				set_leds(0);
+				while(1);
+*/				
+			}
+		} while (BUTTON_PRESSED);
+
+		if (!vezdehod_mode)
+			key_count = eeprom_read_byte((void*)0);
+		else
+			key_count = sizeof(VEZDEHOD_KEYS) / 2;
+		
+		if (key_count > 63) key_count = 0;
+		
+		while (1)
+		{
+			if (USB_POWERED)
+			{
+				usb_mode();
+				break;
+			}
+			LINE_ENABLE;
+			if (send_mode() == 0) break;
+			if (read_mode() == 0) break;
+		}
+		
+		if (vezdehod_mode) current_key = 0;
+		sleep();
+	}
+
+}
+
diff --git a/ibutton.h b/ibutton.h
new file mode 100644
index 0000000..e078304
--- /dev/null
+++ b/ibutton.h
@@ -0,0 +1,61 @@
+#include "defines.h"
+
+#define GLUE(a,b) a##b
+#define DDR(p) GLUE(DDR,p)
+#define PORT(p) GLUE(PORT,p)
+#define PIN(p) GLUE(PIN,p)
+
+#define LED1_DDR DDR(LED_TOP_PORT)
+#define LED2_DDR DDR(LED_TOP_RIGHT_PORT)
+#define LED3_DDR DDR(LED_BOTTOM_RIGHT_PORT)
+#define LED4_DDR DDR(LED_BOTTOM_PORT)
+#define LED5_DDR DDR(LED_BOTTOM_LEFT_PORT)
+#define LED6_DDR DDR(LED_TOP_LEFT_PORT)
+#define LED7_DDR DDR(LED_CENTER_PORT)
+#define LED1_PORT PORT(LED_TOP_PORT)
+#define LED2_PORT PORT(LED_TOP_RIGHT_PORT)
+#define LED3_PORT PORT(LED_BOTTOM_RIGHT_PORT)
+#define LED4_PORT PORT(LED_BOTTOM_PORT)
+#define LED5_PORT PORT(LED_BOTTOM_LEFT_PORT)
+#define LED6_PORT PORT(LED_TOP_LEFT_PORT)
+#define LED7_PORT PORT(LED_CENTER_PORT)
+#define LED1_PIN LED_TOP_PIN
+#define LED2_PIN LED_TOP_RIGHT_PIN
+#define LED3_PIN LED_BOTTOM_RIGHT_PIN
+#define LED4_PIN LED_BOTTOM_PIN
+#define LED5_PIN LED_BOTTOM_LEFT_PIN
+#define LED6_PIN LED_TOP_LEFT_PIN
+#define LED7_PIN LED_CENTER_PIN
+
+#define BUTTON_DDR DDR(BUTTON_PORT)
+#define BUTTON_OUT PORT(BUTTON_PORT)
+#define BUTTON_IN PIN(BUTTON_PORT)
+#define USB_DETECT_DDR DDR(USB_DETECT_PORT)
+#define USB_DETECT_OUT PORT(USB_DETECT_PORT)
+#define USB_DETECT_IN PIN(USB_DETECT_PORT)
+
+#define LINE_ENABLE_DDR DDR(LINE_ENABLE_PORT)
+#define LINE_ENABLE_OUT PORT(LINE_ENABLE_PORT)
+#define LINE_ENABLE_IN PIN(LINE_ENABLE_PORT)
+
+#define CYFRAL_PULLUP_DDR DDR(CYFRAL_PULLUP_PORT)
+#define CYFRAL_PULLUP_OUT PORT(CYFRAL_PULLUP_PORT)
+#define CYFRAL_PULLUP_IN PIN(CYFRAL_PULLUP_PORT)
+
+#define CYFRAL_REFERENCE_DDR DDR(CYFRAL_REFERENCE_PORT)
+#define CYFRAL_REFERENCE_OUT PORT(CYFRAL_REFERENCE_PORT)
+#define CYFRAL_REFERENCE_IN PIN(CYFRAL_REFERENCE_PORT)
+
+#define LINE_ENABLE set_bit(LINE_ENABLE_OUT, LINE_ENABLE_PIN)
+#define LINE_DISABLE unset_bit(LINE_ENABLE_OUT, LINE_ENABLE_PIN)
+#define CYFRAL_PULLUP_ENABLE { set_bit(CYFRAL_PULLUP_OUT, CYFRAL_PULLUP_PIN); set_bit(CYFRAL_PULLUP_DDR, CYFRAL_PULLUP_PIN); }
+#define CYFRAL_PULLUP_DISABLE { unset_bit(CYFRAL_PULLUP_DDR, CYFRAL_PULLUP_PIN); unset_bit(CYFRAL_PULLUP_OUT, CYFRAL_PULLUP_PIN); }
+#define CYFRAL_REFERENCE_ENABLE set_bit(CYFRAL_REFERENCE_OUT, CYFRAL_REFERENCE_PIN)
+#define CYFRAL_REFERENCE_DISABLE unset_bit(CYFRAL_REFERENCE_OUT, CYFRAL_REFERENCE_PIN)
+
+#define BUTTON_PRESSED !(BUTTON_IN & (1<<BUTTON_PIN))
+#define USB_POWERED !(USB_DETECT_IN & (1<<USB_DETECT_PIN))
+
+void set_leds(unsigned char leds_mask);
+void update_leds(void);
+void speedup_leds(void);
\ No newline at end of file
diff --git a/metacom.c b/metacom.c
new file mode 100644
index 0000000..55ad24c
--- /dev/null
+++ b/metacom.c
@@ -0,0 +1,53 @@
+#include <avr/io.h>
+#include "defines.h"
+#include "ibutton.h"
+#include "bits.h"
+#include "metacom.h"
+#include "onewire.h"
+
+inline void metacom_send_byte(uint8_t data)
+{
+	uint8_t b;
+	for (b = 0; b < 8; b++)
+	{
+		if (data & (1UL<<b))
+		{
+			ONEWIRE_MASTER_TX_OFF;
+			ONEWIRE_WAIT(METACOM_T*2/3); // 1
+			ONEWIRE_MASTER_TX_ON;
+			ONEWIRE_WAIT(METACOM_T/3);
+		} else {
+			ONEWIRE_MASTER_TX_OFF;
+			ONEWIRE_WAIT(METACOM_T/3); // 0
+			ONEWIRE_MASTER_TX_ON;
+			ONEWIRE_WAIT(METACOM_T*2/3);
+			// Òóò íå íàäî îòïóñêàòü TX ïåðåä ïîñûëêîé ñëåäóþùåãî ïàêåòà
+		}
+	}
+}
+
+void metacom_send(unsigned char* key)
+{
+	ONEWIRE_MASTER_TX(METACOM_T); // Ñèíõðîíèçèðóþùèé áèò
+	
+	ONEWIRE_WAIT(METACOM_T/3); // 0
+	ONEWIRE_MASTER_TX(METACOM_T*2/3);
+
+	ONEWIRE_WAIT(METACOM_T*2/3); // 1
+	ONEWIRE_MASTER_TX(METACOM_T/3);
+
+	ONEWIRE_WAIT(METACOM_T/3); // 0
+	ONEWIRE_MASTER_TX(METACOM_T*2/3);
+	
+	int b;
+	for (b = 0; b < 4; b++)
+	{
+	/*
+		speedup_leds();
+		*/
+		update_leds();
+		metacom_send_byte(key[b]);
+	}
+}
+
+
diff --git a/metacom.h b/metacom.h
new file mode 100644
index 0000000..1c54a4e
--- /dev/null
+++ b/metacom.h
@@ -0,0 +1,3 @@
+#define METACOM_T 150
+
+void metacom_send(unsigned char* key);
diff --git a/onewire.c b/onewire.c
new file mode 100644
index 0000000..03d916a
--- /dev/null
+++ b/onewire.c
@@ -0,0 +1,186 @@
+#include "defines.h"
+#include "onewire.h"
+#include "onewire_config.h"
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#include <avr/pgmspace.h>
+
+void onewire_port_init()
+{
+	ONEWIRE_DDR &= ~((1 << ONEWIRE_MASTER_TX_PIN) | (1 << ONEWIRE_MASTER_RX_PIN));
+	ONEWIRE_PORT &= ~((1 << ONEWIRE_MASTER_TX_PIN) | (1 << ONEWIRE_MASTER_RX_PIN));
+}
+
+void onewire_init()
+{
+	ONEWIRE_TIMER_INIT; 
+	onewire_port_init();
+}
+
+// Èíèöèàëèçèðóåò ïåðåäà÷ó. Âîçâðàùàåò 1, åñëè óñòðîéñòâà îòâåòèëè.
+char onewire_write_reset()
+{
+	onewire_port_init();
+	int i;
+	ONEWIRE_DDR |= 1<<ONEWIRE_MASTER_TX_PIN;
+	for (i = 0; i < 5; i++)
+	{	
+		ONEWIRE_WAIT(100);
+	}
+	ONEWIRE_DDR &= ~(1<<ONEWIRE_MASTER_TX_PIN);
+
+	int res = 0;
+	for (i = 0; i < 500; i++)
+	{
+		if (ONEWIRE_MASTER_RX) res = 1;
+		ONEWIRE_WAIT(1);
+	}	
+	return res;
+}
+
+// ×èòàåò 1 áèò
+char onewire_read_bit()
+{	onewire_port_init();
+	ONEWIRE_MASTER_TX(5); ONEWIRE_WAIT(5);
+	char cbit = 1;
+	ONEWIRE_TIMER_REG = 0;
+	int t = 0;
+	while (t < 1)
+	{
+		if (ONEWIRE_MASTER_RX) cbit = 0;
+		if (ONEWIRE_TIMER_REG > 100 * ONEWIRE_USEC)
+		{
+			t++;
+			ONEWIRE_TIMER_REG = 0;
+		}
+	}
+	return cbit;
+}
+
+// ×èòàåò áàéò
+unsigned char onewire_read_byte()
+{
+	unsigned char res, bit, cbit;
+	res = 0;
+	for (bit = 0; bit < 8; bit++)
+	{		
+		cbit = onewire_read_bit();
+		if (cbit)
+			res |= (1 << bit);
+	}
+	return res;
+}
+
+void onewire_write_bit(unsigned char b)
+{
+	onewire_port_init();
+	if (b) { ONEWIRE_WRITE1; } else { ONEWIRE_WRITE0;}
+}
+
+void onewire_write_byte(unsigned char b)
+{
+	unsigned char bit;
+	for (bit = 0; bit < 8; bit++)
+	{
+		onewire_write_bit((b >> bit) & 1);
+	}
+}
+
+// Ñ÷èòàåò CRC
+char onewire_check_crc(unsigned char* data, unsigned char size)
+{
+    uint8_t crc=0;
+    uint8_t i,j;
+    for (i=0; i<size;i++) 
+    {
+		uint8_t inbyte = data[i];
+        for (j=0;j<8;j++) 
+		{
+			uint8_t mix = (crc ^ inbyte) & 0x01;
+			crc >>= 1;
+            if (mix) 
+            crc ^= 0x8C;                  
+			inbyte >>= 1;
+        }
+    }
+    return crc;
+}
+
+
+// Â áóôåðå òîëüêî íóëè?
+char onewire_all_zeros(unsigned char* data, unsigned char size)
+{
+    uint8_t i;
+    for (i=0; i<size;i++) 
+    {
+		if (data[i]) return 0;
+    }
+	return 1;
+}
+
+
+// Ïîèñê óñòðîéñòâ, num - áèòîâàÿ ìàñêà, ïî êîòîðîé èä¸ò âåòâëåíèå, out - óêàçàòåëü íà 8 áàéò
+// âîçâðàùàåò êîë-âî ïðîéäåííûõ âåòâåíèé
+int onewire_search(unsigned int num, unsigned char* out)
+{
+	char res = onewire_write_reset();
+	if (!res) return -1;
+	
+	onewire_write_byte(ONEWIRE_COMMAND_SEARCH);
+	int byte, bit, rbit;
+	int conflicts = 0;
+	for (byte = 0; byte < 8; byte++)
+	{
+		out[byte] = 0;
+		for (bit = 0; bit < 8; bit++)
+		{
+			char bit1 = onewire_read_bit();
+			char bit2 = onewire_read_bit();
+			rbit = 0;
+			if (bit1 && !bit2)
+			{
+				rbit = 1;
+			}
+			else if (!bit1 && !bit2)
+			{
+				rbit = (num >> conflicts) & 1;
+				conflicts++;
+			} else if (!bit1 && bit2)
+			{
+				rbit = 0;
+			}
+			if (rbit)
+				out[byte] |= 1 << bit;
+			onewire_write_bit(rbit);
+		}
+	}
+	
+	return conflicts;
+}
+
+// Èòåðàöèÿ ïîèñêà
+void onewire_search_iter(int num, int depth, void (*f)(unsigned char* out))
+{
+	unsigned char serial[8];
+	int conflicts = onewire_search(num, serial);	
+	if (conflicts < 0) return;	
+	if ((onewire_check_crc(serial, 8) == 0) && !onewire_all_zeros(serial, 8))
+		f(serial);
+		
+	int d;
+	for (d = depth+1; d < conflicts; d++)
+		onewire_search_iter(num | (1UL << d), d, f); // óãëóáëÿåìñÿ. 
+}
+
+// Èùåò âñå óñòðîéñòâà. f - óêàçàòåëü ê ôóíêöèè, êîòîðàÿ âûçûâàåòñÿ äëÿ êàæäîãî óñòðîéñòâà, out - óêàçàòåëü íà 8 áàéò àäðåñà, âêëþ÷àÿ òèï è CRC
+void onewire_search_all(void (*f)(unsigned char* out))
+{
+	onewire_search_iter(0, -1, f);
+}
+
+// Âêëþ÷àåò ìîùíóþ ïîäòÿæêó ê VCC
+void onewire_pullup()
+{
+	if (ONEWIRE_MASTER_RX) return;
+	ONEWIRE_PORT |= (1<<ONEWIRE_MASTER_TX_PIN) | (1<<ONEWIRE_MASTER_RX_PIN); ONEWIRE_DDR |= (1<<ONEWIRE_MASTER_TX_PIN) | (1<<ONEWIRE_MASTER_RX_PIN);
+}
diff --git a/onewire.h b/onewire.h
new file mode 100644
index 0000000..d538a2b
--- /dev/null
+++ b/onewire.h
@@ -0,0 +1,35 @@
+#ifndef __onewire_h_included__
+#define __onewire_h_included__
+
+#include "onewire_config.h"
+
+#define ONEWIRE_WAIT(t) {ONEWIRE_TIMER_REG=0; while(ONEWIRE_TIMER_REG < ONEWIRE_USEC * t);}
+
+#define ONEWIRE_COMMAND_READ_ROM 0x33
+#define ONEWIRE_COMMAND_MATCH_ROM 0x55
+#define ONEWIRE_COMMAND_READ_SCRATCHPAD 0xBE
+#define ONEWIRE_COMMAND_WRITE_SCRATCHPAD 0x4E
+#define ONEWIRE_COMMAND_COPY_SCRATCHPAD 0x4E
+#define ONEWIRE_COMMAND_SKIP_ROM 0xCC
+#define ONEWIRE_COMMAND_CONVERT 0x44
+#define ONEWIRE_COMMAND_SEARCH 0xF0
+
+#define ONEWIRE_MASTER_TX_ON ONEWIRE_DDR |= 1<<ONEWIRE_MASTER_TX_PIN
+#define ONEWIRE_MASTER_TX_OFF ONEWIRE_DDR &= ~(1<<ONEWIRE_MASTER_TX_PIN)
+#define ONEWIRE_MASTER_TX(t) {ONEWIRE_MASTER_TX_ON; ONEWIRE_WAIT(t); ONEWIRE_MASTER_TX_OFF;}
+#define ONEWIRE_MASTER_RX (((ONEWIRE_PIN>>ONEWIRE_MASTER_RX_PIN) & 1) == 0)
+#define ONEWIRE_WRITE1 { ONEWIRE_MASTER_TX(10); ONEWIRE_WAIT(75); }
+#define ONEWIRE_WRITE0 { ONEWIRE_MASTER_TX(75); ONEWIRE_WAIT(10); }
+
+void onewire_init();
+char onewire_write_reset();
+char onewire_read_bit();
+unsigned char onewire_read_byte();
+void onewire_write_bit(unsigned char b);
+void onewire_write_byte(unsigned char b);
+void onewire_pullup();
+void onewire_search_all(void (*f)(unsigned char* out));
+char onewire_check_crc(unsigned char* data, unsigned char size);
+char onewire_all_zeros(unsigned char* data, unsigned char size);
+
+#endif
\ No newline at end of file
diff --git a/onewire_config.h b/onewire_config.h
new file mode 100644
index 0000000..d223b24
--- /dev/null
+++ b/onewire_config.h
@@ -0,0 +1,16 @@
+#ifndef __onewire_config_h_included__
+#define __onewire_config_h_included__
+
+#include "bits.h"
+
+#define ONEWIRE_PORT PORTD
+#define ONEWIRE_DDR DDRD
+#define ONEWIRE_PIN PIND
+#define ONEWIRE_MASTER_TX_PIN 5
+#define ONEWIRE_MASTER_RX_PIN 6
+
+#define ONEWIRE_TIMER_INIT { set_bit(TCCR1B, CS11); unset_bit2(TCCR1B, CS12, CS10); } // 8x timer
+#define ONEWIRE_TIMER_REG TCNT1
+#define ONEWIRE_USEC (F_CPU / 8000000UL)
+
+#endif
diff --git a/usart.c b/usart.c
new file mode 100644
index 0000000..69a7889
--- /dev/null
+++ b/usart.c
@@ -0,0 +1,53 @@
+#include "defines.h"
+#include <avr/io.h>
+
+void USART_init(void)
+{
+  unsigned int bd = (F_CPU / (16UL * UART_BAUD)) - 1;
+  UBRRL = bd & 0xFF;
+  UBRRH = bd >> 8;
+
+  UCSRB = /*_BV(TXEN) | */_BV(RXEN) | _BV(RXCIE); /* tx/rx enable */
+//  UCSRC = 1<<URSEL|1<<UCSZ0|1<<UCSZ1;
+  UCSRC |= _BV(UMSEL);
+  //UCSRA = _BV(U2X);
+}
+
+void USART_TransmitByte( unsigned char data )
+{
+	/* Wait for empty transmit buffer */
+	while ( !( UCSRA & (1<<UDRE)) );
+	/* Put data into buffer, sends the data */
+	UDR = data;
+}
+
+void USART_TransmitHex( unsigned char data )
+{
+	unsigned char h = data>>4;
+	char ho = (h < 10) ? (h+'0') : (h+'A'-10);
+	unsigned char l = data & 0xF;
+	char lo = (l < 10) ? (l+'0') : (l+'A'-10);
+	while ( !( UCSRA & (1<<UDRE)) );
+	UDR = ho;
+	while ( !( UCSRA & (1<<UDRE)) );
+	UDR = lo;
+}
+
+void USART_TransmitText(char* data)
+{
+	while (*data != 0)
+	{
+		/* Wait for empty transmit buffer */
+		while ( !( UCSRA & (1<<UDRE)) );
+		/* Put data into buffer, sends the data */
+		UDR = *data;
+		data++;
+	}
+}
+
+void USART_Transmit(void* p, unsigned long int len)
+{
+	unsigned char* buff = (unsigned char*)p;
+	unsigned long int b;
+	for (b = 0; b < len; b++) USART_TransmitByte(buff[b]);
+}
diff --git a/usart.h b/usart.h
new file mode 100644
index 0000000..207e60f
--- /dev/null
+++ b/usart.h
@@ -0,0 +1,10 @@
+#ifndef _USART_H
+#define _USART_H
+
+void USART_init(void);
+void USART_TransmitByte( unsigned char data );
+void USART_TransmitText(char* data);
+void USART_Transmit(void* p, unsigned long int len);
+void USART_TransmitHex(unsigned char data);
+
+#endif
diff --git a/usb.c b/usb.c
new file mode 100644
index 0000000..99a64d9
--- /dev/null
+++ b/usb.c
@@ -0,0 +1,145 @@
+#include "defines.h"
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#include <avr/eeprom.h>
+#include <avr/wdt.h>
+#include <util/delay.h>
+#include <string.h>
+#include "ibutton.h"
+#include "bits.h"
+#include "usart.h"
+
+const char* COMMAND_NAME = "name";
+const char* COMMAND_REBOOT = "reboot";
+const char* COMMAND_READ = "read";
+const char* COMMAND_ERASE = "erase";
+const char* COMMAND_WRITE = "write";
+
+
+volatile char usart_command[30];
+volatile int usart_command_length = 0;
+volatile unsigned char usart_params[8];
+volatile int usart_params_length = 0;
+volatile char usart_mode_params;
+volatile char usart_execute = 0;
+
+ISR(USART_RXC_vect)
+{
+	char b;
+	unsigned char c;			
+	while (UCSRA & (1<<RXC))
+	{
+		b = UDR;
+		if (b == '\r' || b == '\n')
+		{
+			usart_command[usart_command_length] = 0;
+			usart_execute = 1;
+		}
+		else if (b == ' ')
+		{
+			if (!usart_mode_params) 
+				usart_params_length = 0;
+			usart_mode_params = 1;
+		}
+		else if (!usart_mode_params)
+		{
+			if (usart_command_length+1 < sizeof(usart_command))
+				usart_command[usart_command_length++] = b;
+		}
+		else 
+		{
+			
+			if (b >= '0' && b <= '9') c = b-'0';
+				else if (b >= 'A' && b <= 'F') c = b-'A'+10;
+				else continue;
+			if (usart_params_length < 16)
+			{
+				if (usart_params_length % 2 == 0) usart_params[usart_params_length/2] = (c<<4);
+					else usart_params[usart_params_length/2] |= (c & 0x0F);
+				usart_params_length++;
+			}
+		}
+	}
+}
+
+void usb_mode(void)
+{
+	int b;
+	usart_command_length = 0;
+	usart_mode_params = 0;
+	usart_execute = 0;
+	for (b = 0; b < 8; b++)	
+		usart_params[b] = 0;
+	unsigned char usb_key_count = eeprom_read_byte((void*)0);
+	USART_init();
+	while (USB_POWERED)
+	{	
+		for(b = 0; b < 6; b++)
+		{
+			wdt_reset();
+			set_leds(1<<b);
+			_delay_ms(50);
+			if (usart_execute)
+			{
+				if (usart_command_length > 0)
+				{
+					set_bit(UCSRB, TXEN); // Âêëþ÷àåì TX
+					_delay_ms(10);
+					if (strcmp((char*)usart_command, COMMAND_NAME) == 0)
+					{
+						USART_TransmitText("iButton Multikey by Cluster\r\n> ");
+					}
+					else if (strcmp((char*)usart_command, COMMAND_REBOOT) == 0)
+					{
+						USART_TransmitText("OK.\r\n");
+						cli();
+						set_bit(WDTCR, WDE);
+						while(1);
+					}					
+					else if (strcmp((char*)usart_command, COMMAND_READ) == 0)
+					{
+						USART_TransmitText("Count: ");
+						USART_TransmitHex(usb_key_count);
+						int k;
+						for (k = 0; k < usb_key_count; k++)
+						{
+							USART_TransmitText("\r\nKey: ");
+							USART_TransmitHex(k+1);
+							USART_TransmitText(" ");
+							unsigned char key[8];
+							eeprom_read_block(key, (void*)((k+1)*8), 8);
+							int b;
+							for (b = 0; b < 8; b++)
+							{
+								USART_TransmitHex(key[b]);
+							}
+						}
+						USART_TransmitText("\r\n> ");
+					}					
+					else if (strcmp((char*)usart_command, COMMAND_ERASE) == 0)
+					{
+						usb_key_count = 0;
+						eeprom_write_byte((void*)0, usb_key_count);
+						USART_TransmitText("Done.\r\n> ");
+					}
+					else if (strcmp((char*)usart_command, COMMAND_WRITE) == 0)
+					{
+						
+						usb_key_count++;
+						eeprom_write_block((char*)usart_params, (void*)(usb_key_count*8), 8);		
+						eeprom_write_byte((void*)0, usb_key_count);
+						USART_TransmitText("Done.\r\n> ");
+					}
+					else USART_TransmitText("Unknown command\r\n> ");
+					_delay_ms(10);
+					unset_bit(UCSRB, TXEN); // Âûêëþ÷àåì TX
+				}
+				usart_command_length = 0;
+				usart_mode_params = 0;
+				usart_execute = 0;
+				for (b = 0; b < 8; b++)	
+					usart_params[b] = 0;			
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/usb.h b/usb.h
new file mode 100644
index 0000000..1cd281d
--- /dev/null
+++ b/usb.h
@@ -0,0 +1 @@
+void usb_mode(void);