diff --git a/source-1.0L-F11/.cproject b/source-1.0L-F11/.cproject
new file mode 100644
index 0000000..eeec63d
--- /dev/null
+++ b/source-1.0L-F11/.cproject
@@ -0,0 +1,212 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/source-1.0L-F11/.gitignore b/source-1.0L-F11/.gitignore
new file mode 100644
index 0000000..9337138
--- /dev/null
+++ b/source-1.0L-F11/.gitignore
@@ -0,0 +1,3 @@
+/Debug/
+/Bootloader/
+/Flash/
diff --git a/source-1.0L-F11/.project b/source-1.0L-F11/.project
new file mode 100644
index 0000000..08b0e42
--- /dev/null
+++ b/source-1.0L-F11/.project
@@ -0,0 +1,28 @@
+
+
+ mac-floppy-emu
+
+
+
+
+
+ org.eclipse.cdt.managedbuilder.core.genmakebuilder
+ clean,full,incremental,
+
+
+
+
+ org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder
+ full,incremental,
+
+
+
+
+
+ org.eclipse.cdt.core.cnature
+ org.eclipse.cdt.core.ccnature
+ org.eclipse.cdt.managedbuilder.core.managedBuildNature
+ org.eclipse.cdt.managedbuilder.core.ScannerConfigNature
+ de.innot.avreclipse.core.avrnature
+
+
diff --git a/source-1.0L-F11/.settings/de.innot.avreclipse.core.prefs b/source-1.0L-F11/.settings/de.innot.avreclipse.core.prefs
new file mode 100644
index 0000000..ea7b76a
--- /dev/null
+++ b/source-1.0L-F11/.settings/de.innot.avreclipse.core.prefs
@@ -0,0 +1,8 @@
+avrtarget/ClockFrequency=16000000
+avrtarget/ExtRAMSize=0
+avrtarget/ExtendedRAM=false
+avrtarget/MCUType=atmega1284p
+avrtarget/UseEEPROM=false
+avrtarget/UseExtendedRAMforHeap=true
+avrtarget/perConfig=false
+eclipse.preferences.version=1
diff --git a/source-1.0L-F11/.settings/org.eclipse.cdt.codan.core.prefs b/source-1.0L-F11/.settings/org.eclipse.cdt.codan.core.prefs
new file mode 100644
index 0000000..77386c2
--- /dev/null
+++ b/source-1.0L-F11/.settings/org.eclipse.cdt.codan.core.prefs
@@ -0,0 +1,67 @@
+eclipse.preferences.version=1
+org.eclipse.cdt.codan.checkers.errnoreturn=Warning
+org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
+org.eclipse.cdt.codan.checkers.errreturnvalue=Error
+org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.checkers.noreturn=Error
+org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
+org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=Error
+org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=Error
+org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=Warning
+org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=Error
+org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=Warning
+org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},no_break_comment\=>"no break",last_case_param\=>false,empty_case_param\=>false}
+org.eclipse.cdt.codan.internal.checkers.CatchByReference=Warning
+org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},unknown\=>false,exceptions\=>()}
+org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=Error
+org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=Warning
+org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},skip\=>true}
+org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=Error
+org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=Error
+org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.InvalidArguments=Error
+org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=Error
+org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=Error
+org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=Error
+org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=Error
+org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info
+org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},pattern\=>"^[a-z]",macro\=>true,exceptions\=>()}
+org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=Warning
+org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.OverloadProblem=Error
+org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=Error
+org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=Error
+org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning
+org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning
+org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=Warning
+org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>()}
+org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=Warning
+org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},paramNot\=>false}
+org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=Warning
+org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},else\=>false,afterelse\=>false}
+org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=Error
+org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=Warning
+org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
+org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=Warning
+org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
+org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=Warning
+org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>("@(\#)","$Id")}
+org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=Error
+org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
diff --git a/source-1.0L-F11/.settings/org.eclipse.cdt.core.prefs b/source-1.0L-F11/.settings/org.eclipse.cdt.core.prefs
new file mode 100644
index 0000000..206bd4d
--- /dev/null
+++ b/source-1.0L-F11/.settings/org.eclipse.cdt.core.prefs
@@ -0,0 +1,17 @@
+eclipse.preferences.version=1
+environment/project/de.innot.avreclipse.configuration.app.debug.46313178.1895685496/LANG/delimiter=\:
+environment/project/de.innot.avreclipse.configuration.app.debug.46313178.1895685496/LANG/operation=replace
+environment/project/de.innot.avreclipse.configuration.app.debug.46313178.1895685496/LANG/value=en-US
+environment/project/de.innot.avreclipse.configuration.app.debug.46313178.1895685496/PATH/delimiter=\:
+environment/project/de.innot.avreclipse.configuration.app.debug.46313178.1895685496/PATH/operation=replace
+environment/project/de.innot.avreclipse.configuration.app.debug.46313178.1895685496/PATH/value=/opt/local/bin\:/usr/bin\:/bin\:/usr/sbin\:/sbin
+environment/project/de.innot.avreclipse.configuration.app.debug.46313178.1895685496/append=true
+environment/project/de.innot.avreclipse.configuration.app.debug.46313178.1895685496/appendContributed=true
+environment/project/de.innot.avreclipse.configuration.app.debug.46313178/LANG/delimiter=\:
+environment/project/de.innot.avreclipse.configuration.app.debug.46313178/LANG/operation=replace
+environment/project/de.innot.avreclipse.configuration.app.debug.46313178/LANG/value=en-US
+environment/project/de.innot.avreclipse.configuration.app.debug.46313178/PATH/delimiter=\:
+environment/project/de.innot.avreclipse.configuration.app.debug.46313178/PATH/operation=replace
+environment/project/de.innot.avreclipse.configuration.app.debug.46313178/PATH/value=/usr/local/arduinotool/bin\:/opt/local/bin\:/usr/bin\:/bin\:/usr/sbin\:/sbin
+environment/project/de.innot.avreclipse.configuration.app.debug.46313178/append=true
+environment/project/de.innot.avreclipse.configuration.app.debug.46313178/appendContributed=true
diff --git a/source-1.0L-F11/AVR/bootldr/bootldr.atsln b/source-1.0L-F11/bootldr/bootldr.atsln
similarity index 100%
rename from source-1.0L-F11/AVR/bootldr/bootldr.atsln
rename to source-1.0L-F11/bootldr/bootldr.atsln
diff --git a/source-1.0L-F11/AVR/bootldr/bootldr.atsuo b/source-1.0L-F11/bootldr/bootldr.atsuo
similarity index 100%
rename from source-1.0L-F11/AVR/bootldr/bootldr.atsuo
rename to source-1.0L-F11/bootldr/bootldr.atsuo
diff --git a/source-1.0L-F11/AVR/bootldr/bootldr/Release/Makefile b/source-1.0L-F11/bootldr/bootldr/Release/Makefile
similarity index 100%
rename from source-1.0L-F11/AVR/bootldr/bootldr/Release/Makefile
rename to source-1.0L-F11/bootldr/bootldr/Release/Makefile
diff --git a/source-1.0L-F11/AVR/bootldr/bootldr/Release/bootldr.hex b/source-1.0L-F11/bootldr/bootldr/Release/bootldr.hex
similarity index 100%
rename from source-1.0L-F11/AVR/bootldr/bootldr/Release/bootldr.hex
rename to source-1.0L-F11/bootldr/bootldr/Release/bootldr.hex
diff --git a/source-1.0L-F11/AVR/bootldr/bootldr/Release/makedep.mk b/source-1.0L-F11/bootldr/bootldr/Release/makedep.mk
similarity index 100%
rename from source-1.0L-F11/AVR/bootldr/bootldr/Release/makedep.mk
rename to source-1.0L-F11/bootldr/bootldr/Release/makedep.mk
diff --git a/source-1.0L-F11/AVR/bootldr/bootldr/asmfunc.S b/source-1.0L-F11/bootldr/bootldr/asmfunc.S
similarity index 93%
rename from source-1.0L-F11/AVR/bootldr/bootldr/asmfunc.S
rename to source-1.0L-F11/bootldr/bootldr/asmfunc.S
index ebe2533..9750dc6 100755
--- a/source-1.0L-F11/AVR/bootldr/bootldr/asmfunc.S
+++ b/source-1.0L-F11/bootldr/bootldr/asmfunc.S
@@ -48,7 +48,7 @@ init_spi:
.global dly_100us
.func dly_100us
dly_100us:
- ldi r24, lo8(F_CPU / 100000) /* Loop counter */
+ ldi r24, lo8(16000000 / 100000) ;(F_CPU / 100000) /* Loop counter */
1: sbiw r30, 1 /* 10 clocks per loop */
sbiw r30, 1
sbiw r30, 1
diff --git a/source-1.0L-F11/AVR/bootldr/bootldr/bootldr.c b/source-1.0L-F11/bootldr/bootldr/bootldr.c
similarity index 78%
rename from source-1.0L-F11/AVR/bootldr/bootldr/bootldr.c
rename to source-1.0L-F11/bootldr/bootldr/bootldr.c
index 4dd3b47..40fb289 100755
--- a/source-1.0L-F11/AVR/bootldr/bootldr/bootldr.c
+++ b/source-1.0L-F11/bootldr/bootldr/bootldr.c
@@ -7,10 +7,14 @@
#include
+#ifdef USE_BOOTLDR_MAIN
+
int main(void)
{
while(1)
{
//TODO:: Please write your application code
}
-}
\ No newline at end of file
+}
+
+#endif
diff --git a/source-1.0L-F11/AVR/bootldr/bootldr/bootldr.cproj b/source-1.0L-F11/bootldr/bootldr/bootldr.cproj
similarity index 100%
rename from source-1.0L-F11/AVR/bootldr/bootldr/bootldr.cproj
rename to source-1.0L-F11/bootldr/bootldr/bootldr.cproj
diff --git a/source-1.0L-F11/AVR/bootldr/bootldr/diskio.h b/source-1.0L-F11/bootldr/bootldr/diskio.h
similarity index 100%
rename from source-1.0L-F11/AVR/bootldr/bootldr/diskio.h
rename to source-1.0L-F11/bootldr/bootldr/diskio.h
diff --git a/source-1.0L-F11/AVR/bootldr/bootldr/integer.h b/source-1.0L-F11/bootldr/bootldr/integer.h
similarity index 100%
rename from source-1.0L-F11/AVR/bootldr/bootldr/integer.h
rename to source-1.0L-F11/bootldr/bootldr/integer.h
diff --git a/source-1.0L-F11/AVR/bootldr/bootldr/lcd.c b/source-1.0L-F11/bootldr/bootldr/lcd.c
similarity index 96%
rename from source-1.0L-F11/AVR/bootldr/bootldr/lcd.c
rename to source-1.0L-F11/bootldr/bootldr/lcd.c
index b73a8ea..fd19604 100755
--- a/source-1.0L-F11/AVR/bootldr/bootldr/lcd.c
+++ b/source-1.0L-F11/bootldr/bootldr/lcd.c
@@ -146,4 +146,4 @@ void LcdInit()
LcdGoto(0,0);
LcdClear();
-}
\ No newline at end of file
+}
diff --git a/source-1.0L-F11/AVR/bootldr/bootldr/lcd.h b/source-1.0L-F11/bootldr/bootldr/lcd.h
similarity index 100%
rename from source-1.0L-F11/AVR/bootldr/bootldr/lcd.h
rename to source-1.0L-F11/bootldr/bootldr/lcd.h
diff --git a/source-1.0L-F11/AVR/bootldr/bootldr/main.c b/source-1.0L-F11/bootldr/bootldr/main.c
similarity index 100%
rename from source-1.0L-F11/AVR/bootldr/bootldr/main.c
rename to source-1.0L-F11/bootldr/bootldr/main.c
diff --git a/source-1.0L-F11/AVR/bootldr/bootldr/mmc.c b/source-1.0L-F11/bootldr/bootldr/mmc.c
similarity index 100%
rename from source-1.0L-F11/AVR/bootldr/bootldr/mmc.c
rename to source-1.0L-F11/bootldr/bootldr/mmc.c
diff --git a/source-1.0L-F11/AVR/bootldr/bootldr/pff.c b/source-1.0L-F11/bootldr/bootldr/pff.c
similarity index 100%
rename from source-1.0L-F11/AVR/bootldr/bootldr/pff.c
rename to source-1.0L-F11/bootldr/bootldr/pff.c
diff --git a/source-1.0L-F11/AVR/bootldr/bootldr/pff.h b/source-1.0L-F11/bootldr/bootldr/pff.h
similarity index 100%
rename from source-1.0L-F11/AVR/bootldr/bootldr/pff.h
rename to source-1.0L-F11/bootldr/bootldr/pff.h
diff --git a/source-1.0L-F11/AVR/bootldr/how to configure bootloader.txt b/source-1.0L-F11/bootldr/how to configure bootloader.txt
similarity index 100%
rename from source-1.0L-F11/AVR/bootldr/how to configure bootloader.txt
rename to source-1.0L-F11/bootldr/how to configure bootloader.txt
diff --git a/source-1.0L-F11/floppyemu/Release/Makefile b/source-1.0L-F11/floppyemu/Release/Makefile
new file mode 100755
index 0000000..c6ce998
--- /dev/null
+++ b/source-1.0L-F11/floppyemu/Release/Makefile
@@ -0,0 +1,212 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+SHELL := /bin/csh
+RM := rm -rf
+
+USER_OBJS :=
+
+LIBS :=
+PROJ :=
+
+O_SRCS :=
+C_SRCS :=
+S_SRCS :=
+S_UPPER_SRCS :=
+OBJ_SRCS :=
+ASM_SRCS :=
+PREPROCESSING_SRCS :=
+OBJS :=
+OBJS_AS_ARGS :=
+C_DEPS :=
+C_DEPS_AS_ARGS :=
+EXECUTABLES :=
+OUTPUT_FILE_PATH :=
+OUTPUT_FILE_PATH_AS_ARGS :=
+AVR_APP_PATH :=$$$AVR_APP_PATH$$$
+QUOTE := "
+ADDITIONAL_DEPENDENCIES:=
+OUTPUT_FILE_DEP:=
+
+# Every subdirectory with source files must be described here
+SUBDIRS :=
+
+
+# Add inputs and outputs from these tool invocations to the build variables
+C_SRCS += \
+../cardtest.cpp \
+../diskmenu.cpp \
+../floppyemu.cpp \
+../millitimer.cpp \
+../noklcd.cpp \
+../SdFat/Sd2Card.cpp \
+../SdFat/SdBaseFile.cpp \
+../SdFat/SdFat.cpp \
+../SdFat/SdVolume.cpp \
+../xsvf/lenval.cpp \
+../xsvf/micro.cpp \
+../xsvf/ports.cpp
+
+
+PREPROCESSING_SRCS +=
+
+
+ASM_SRCS +=
+
+
+OBJS += \
+cardtest.o \
+diskmenu.o \
+floppyemu.o \
+millitimer.o \
+noklcd.o \
+Sd2Card.o \
+SdBaseFile.o \
+SdFat.o \
+SdVolume.o \
+lenval.o \
+micro.o \
+ports.o
+
+
+OBJS_AS_ARGS += \
+cardtest.o \
+diskmenu.o \
+floppyemu.o \
+millitimer.o \
+noklcd.o \
+Sd2Card.o \
+SdBaseFile.o \
+SdFat.o \
+SdVolume.o \
+lenval.o \
+micro.o \
+ports.o
+
+
+C_DEPS += \
+cardtest.d \
+diskmenu.d \
+floppyemu.d \
+millitimer.d \
+noklcd.d \
+Sd2Card.d \
+SdBaseFile.d \
+SdFat.d \
+SdVolume.d \
+lenval.d \
+micro.d \
+ports.d
+
+
+C_DEPS_AS_ARGS += \
+cardtest.d \
+diskmenu.d \
+floppyemu.d \
+millitimer.d \
+noklcd.d \
+Sd2Card.d \
+SdBaseFile.d \
+SdFat.d \
+SdVolume.d \
+lenval.d \
+micro.d \
+ports.d
+
+
+OUTPUT_FILE_PATH +=floppyemu.elf
+
+OUTPUT_FILE_PATH_AS_ARGS +=floppyemu.elf
+
+ADDITIONAL_DEPENDENCIES:=
+
+OUTPUT_FILE_DEP:= ./makedep.mk
+
+# AVR32/GNU C Compiler
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+./%.o: .././%.cpp
+ @echo Building file: $<
+ @echo Invoking: AVR8/GNU C++ Compiler
+ $(QUOTE)C:\Program Files (x86)\Atmel\AVR Studio 5.1\extensions\Atmel\AVRGCC\3.3.1.27\AVRToolchain\bin\avr-g++.exe$(QUOTE) -funsigned-char -funsigned-bitfields -DF_CPU=20000000 -I"../SdFat" -I"../xsvf" -O2 -ffunction-sections -fpack-struct -fshort-enums -Wall -c -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -mmcu=atmega1284p -o"$@" "$<"
+ @echo Finished building: $<
+
+./%.o: ../SdFat/%.cpp
+ @echo Building file: $<
+ @echo Invoking: AVR8/GNU C++ Compiler
+ $(QUOTE)C:\Program Files (x86)\Atmel\AVR Studio 5.1\extensions\Atmel\AVRGCC\3.3.1.27\AVRToolchain\bin\avr-g++.exe$(QUOTE) -funsigned-char -funsigned-bitfields -DF_CPU=20000000 -I"../SdFat" -I"../xsvf" -O2 -ffunction-sections -fpack-struct -fshort-enums -Wall -c -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -mmcu=atmega1284p -o"$@" "$<"
+ @echo Finished building: $<
+
+./%.o: ../xsvf/%.cpp
+ @echo Building file: $<
+ @echo Invoking: AVR8/GNU C++ Compiler
+ $(QUOTE)C:\Program Files (x86)\Atmel\AVR Studio 5.1\extensions\Atmel\AVRGCC\3.3.1.27\AVRToolchain\bin\avr-g++.exe$(QUOTE) -funsigned-char -funsigned-bitfields -DF_CPU=20000000 -I"../SdFat" -I"../xsvf" -O2 -ffunction-sections -fpack-struct -fshort-enums -Wall -c -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -mmcu=atmega1284p -o"$@" "$<"
+ @echo Finished building: $<
+
+
+
+# AVR32/GNU Preprocessing Assembler
+
+
+
+# AVR32/GNU Assembler
+
+
+
+
+ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(strip $(C_DEPS)),)
+-include $(C_DEPS)
+endif
+endif
+
+# Add inputs and outputs from these tool invocations to the build variables
+
+# All Target
+all: $(OUTPUT_FILE_PATH) $(ADDITIONAL_DEPENDENCIES)
+
+$(OUTPUT_FILE_PATH): $(OBJS) $(USER_OBJS) $(OUTPUT_FILE_DEP)
+ @echo Building target: $@
+ @echo Invoking: AVR8/GNU C++ Linker
+ $(QUOTE)C:\Program Files (x86)\Atmel\AVR Studio 5.1\extensions\Atmel\AVRGCC\3.3.1.27\AVRToolchain\bin\avr-g++.exe$(QUOTE) -o$(OUTPUT_FILE_PATH_AS_ARGS) $(OBJS_AS_ARGS) $(USER_OBJS) $(LIBS) -Wl,-Map="floppyemu.map" -Wl,-lm -Wl,--gc-sections -mrelax -Wl,-section-start=.bootldrinfo=0x1eff8 -mmcu=atmega1284p
+ @echo Finished building target: $@
+ "C:\Program Files (x86)\Atmel\AVR Studio 5.1\extensions\Atmel\AVRGCC\3.3.1.27\AVRToolchain\bin\avr-objcopy.exe" -O ihex -R .eeprom -R .fuse -R .lock -R .signature "floppyemu.elf" "floppyemu.hex"
+ "C:\Program Files (x86)\Atmel\AVR Studio 5.1\extensions\Atmel\AVRGCC\3.3.1.27\AVRToolchain\bin\avr-objcopy.exe" -O binary -R .eeprom -R .fuse -R .lock -R .signature "floppyemu.elf" "femu.bin"
+ "C:\Program Files (x86)\Atmel\AVR Studio 5.1\extensions\Atmel\AVRGCC\3.3.1.27\AVRToolchain\bin\avr-objcopy.exe" -j .eeprom --set-section-flags=.eeprom=alloc,load --change-section-lma .eeprom=0 --no-change-warnings -O ihex "floppyemu.elf" "floppyemu.eep" || exit 0
+ "C:\Program Files (x86)\Atmel\AVR Studio 5.1\extensions\Atmel\AVRGCC\3.3.1.27\AVRToolchain\bin\avr-objdump.exe" -h -S "floppyemu.elf" > "floppyemu.lss"
+ srec_cat "floppyemu.hex" -intel "..\bootldr\bootldr\Release\bootldr.hex" -intel -o "merged.hex" -intel
+ "C:\Program Files (x86)\Atmel\AVR Studio 5.1\extensions\Atmel\AVRGCC\3.3.1.27\AVRToolchain\bin\avr-size.exe" -C --mcu=atmega1284p "floppyemu.elf"
+
+
+
+
+
+
+
+# Other Targets
+clean:
+ -$(RM) $(OBJS_AS_ARGS)$(C_DEPS_AS_ARGS) $(EXECUTABLES)
+ rm -rf "floppyemu.hex" "floppyemu.lss" "floppyemu.eep" "floppyemu.map"
+
\ No newline at end of file
diff --git a/source-1.0L-F11/AVR/Release/Makefile b/source-1.0L-F11/floppyemu/Release/Makefile~
similarity index 100%
rename from source-1.0L-F11/AVR/Release/Makefile
rename to source-1.0L-F11/floppyemu/Release/Makefile~
diff --git a/source-1.0L-F11/AVR/Release/femu.bin b/source-1.0L-F11/floppyemu/Release/femu.bin
similarity index 100%
rename from source-1.0L-F11/AVR/Release/femu.bin
rename to source-1.0L-F11/floppyemu/Release/femu.bin
diff --git a/source-1.0L-F11/AVR/Release/floppyemu.hex b/source-1.0L-F11/floppyemu/Release/floppyemu.hex
similarity index 100%
rename from source-1.0L-F11/AVR/Release/floppyemu.hex
rename to source-1.0L-F11/floppyemu/Release/floppyemu.hex
diff --git a/source-1.0L-F11/AVR/Release/makedep.mk b/source-1.0L-F11/floppyemu/Release/makedep.mk
similarity index 100%
rename from source-1.0L-F11/AVR/Release/makedep.mk
rename to source-1.0L-F11/floppyemu/Release/makedep.mk
diff --git a/source-1.0L-F11/AVR/Release/merged.hex b/source-1.0L-F11/floppyemu/Release/merged.hex
similarity index 100%
rename from source-1.0L-F11/AVR/Release/merged.hex
rename to source-1.0L-F11/floppyemu/Release/merged.hex
diff --git a/source-1.0L-F11/AVR/SdFat/Sd2Card.cpp b/source-1.0L-F11/floppyemu/SdFat/Sd2Card.cpp
similarity index 96%
rename from source-1.0L-F11/AVR/SdFat/Sd2Card.cpp
rename to source-1.0L-F11/floppyemu/SdFat/Sd2Card.cpp
index 51ed7ec..2261db6 100755
--- a/source-1.0L-F11/AVR/SdFat/Sd2Card.cpp
+++ b/source-1.0L-F11/floppyemu/SdFat/Sd2Card.cpp
@@ -36,7 +36,7 @@
#include
-#include "..\millitimer.h"
+#include "../millitimer.h"
//------------------------------------------------------------------------------
#ifndef SOFTWARE_SPI
diff --git a/source-1.0L-F11/AVR/SdFat/Sd2Card.h b/source-1.0L-F11/floppyemu/SdFat/Sd2Card.h
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/Sd2Card.h
rename to source-1.0L-F11/floppyemu/SdFat/Sd2Card.h
diff --git a/source-1.0L-F11/AVR/SdFat/SdBaseFile.cpp b/source-1.0L-F11/floppyemu/SdFat/SdBaseFile.cpp
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/SdBaseFile.cpp
rename to source-1.0L-F11/floppyemu/SdFat/SdBaseFile.cpp
diff --git a/source-1.0L-F11/AVR/SdFat/SdBaseFile.h b/source-1.0L-F11/floppyemu/SdFat/SdBaseFile.h
similarity index 97%
rename from source-1.0L-F11/AVR/SdFat/SdBaseFile.h
rename to source-1.0L-F11/floppyemu/SdFat/SdBaseFile.h
index 4467ec8..dbf5dc3 100755
--- a/source-1.0L-F11/AVR/SdFat/SdBaseFile.h
+++ b/source-1.0L-F11/floppyemu/SdFat/SdBaseFile.h
@@ -181,7 +181,7 @@ class SdBaseFile {
/** Create an instance. */
SdBaseFile() : writeError(false), type_(FAT_FILE_TYPE_CLOSED) {}
SdBaseFile(const char* path, uint8_t oflag);
- ~SdBaseFile() {if(isOpen()) close();}
+ ~SdBaseFile() { if(isOpen()) close(); }
/**
* writeError is set to true if an error occurs during a write().
* Set writeError to false before calling print() and/or write() and check
diff --git a/source-1.0L-F11/AVR/SdFat/SdFat.cpp b/source-1.0L-F11/floppyemu/SdFat/SdFat.cpp
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/SdFat.cpp
rename to source-1.0L-F11/floppyemu/SdFat/SdFat.cpp
diff --git a/source-1.0L-F11/AVR/SdFat/SdFat.h b/source-1.0L-F11/floppyemu/SdFat/SdFat.h
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/SdFat.h
rename to source-1.0L-F11/floppyemu/SdFat/SdFat.h
diff --git a/source-1.0L-F11/AVR/SdFat/SdFatConfig.h b/source-1.0L-F11/floppyemu/SdFat/SdFatConfig.h
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/SdFatConfig.h
rename to source-1.0L-F11/floppyemu/SdFat/SdFatConfig.h
diff --git a/source-1.0L-F11/AVR/SdFat/SdFatStructs.h b/source-1.0L-F11/floppyemu/SdFat/SdFatStructs.h
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/SdFatStructs.h
rename to source-1.0L-F11/floppyemu/SdFat/SdFatStructs.h
diff --git a/source-1.0L-F11/AVR/SdFat/SdInfo.h b/source-1.0L-F11/floppyemu/SdFat/SdInfo.h
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/SdInfo.h
rename to source-1.0L-F11/floppyemu/SdFat/SdInfo.h
diff --git a/source-1.0L-F11/AVR/SdFat/SdVolume.cpp b/source-1.0L-F11/floppyemu/SdFat/SdVolume.cpp
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/SdVolume.cpp
rename to source-1.0L-F11/floppyemu/SdFat/SdVolume.cpp
diff --git a/source-1.0L-F11/AVR/SdFat/SdVolume.h b/source-1.0L-F11/floppyemu/SdFat/SdVolume.h
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/SdVolume.h
rename to source-1.0L-F11/floppyemu/SdFat/SdVolume.h
diff --git a/source-1.0L-F11/AVR/SdFat/examples/AnalogLogger/AnalogLogger.pde b/source-1.0L-F11/floppyemu/SdFat/examples/AnalogLogger/AnalogLogger.pde
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/examples/AnalogLogger/AnalogLogger.pde
rename to source-1.0L-F11/floppyemu/SdFat/examples/AnalogLogger/AnalogLogger.pde
diff --git a/source-1.0L-F11/AVR/SdFat/examples/HelloWorld/HelloWorld.pde b/source-1.0L-F11/floppyemu/SdFat/examples/HelloWorld/HelloWorld.pde
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/examples/HelloWorld/HelloWorld.pde
rename to source-1.0L-F11/floppyemu/SdFat/examples/HelloWorld/HelloWorld.pde
diff --git a/source-1.0L-F11/AVR/SdFat/examples/OpenNext/OpenNext.pde b/source-1.0L-F11/floppyemu/SdFat/examples/OpenNext/OpenNext.pde
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/examples/OpenNext/OpenNext.pde
rename to source-1.0L-F11/floppyemu/SdFat/examples/OpenNext/OpenNext.pde
diff --git a/source-1.0L-F11/AVR/SdFat/examples/QuickStart/QuickStart.pde b/source-1.0L-F11/floppyemu/SdFat/examples/QuickStart/QuickStart.pde
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/examples/QuickStart/QuickStart.pde
rename to source-1.0L-F11/floppyemu/SdFat/examples/QuickStart/QuickStart.pde
diff --git a/source-1.0L-F11/AVR/SdFat/examples/ReadWriteSdFat/ReadWriteSdFat.pde b/source-1.0L-F11/floppyemu/SdFat/examples/ReadWriteSdFat/ReadWriteSdFat.pde
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/examples/ReadWriteSdFat/ReadWriteSdFat.pde
rename to source-1.0L-F11/floppyemu/SdFat/examples/ReadWriteSdFat/ReadWriteSdFat.pde
diff --git a/source-1.0L-F11/AVR/SdFat/examples/SD_Size/SD_Size.pde b/source-1.0L-F11/floppyemu/SdFat/examples/SD_Size/SD_Size.pde
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/examples/SD_Size/SD_Size.pde
rename to source-1.0L-F11/floppyemu/SdFat/examples/SD_Size/SD_Size.pde
diff --git a/source-1.0L-F11/AVR/SdFat/examples/SdFatSize/SdFatSize.pde b/source-1.0L-F11/floppyemu/SdFat/examples/SdFatSize/SdFatSize.pde
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/examples/SdFatSize/SdFatSize.pde
rename to source-1.0L-F11/floppyemu/SdFat/examples/SdFatSize/SdFatSize.pde
diff --git a/source-1.0L-F11/AVR/SdFat/examples/SdFormatter/SdFormatter.pde b/source-1.0L-F11/floppyemu/SdFat/examples/SdFormatter/SdFormatter.pde
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/examples/SdFormatter/SdFormatter.pde
rename to source-1.0L-F11/floppyemu/SdFat/examples/SdFormatter/SdFormatter.pde
diff --git a/source-1.0L-F11/AVR/SdFat/examples/SdInfo/SdInfo.pde b/source-1.0L-F11/floppyemu/SdFat/examples/SdInfo/SdInfo.pde
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/examples/SdInfo/SdInfo.pde
rename to source-1.0L-F11/floppyemu/SdFat/examples/SdInfo/SdInfo.pde
diff --git a/source-1.0L-F11/AVR/SdFat/examples/TwoCards/TwoCards.pde b/source-1.0L-F11/floppyemu/SdFat/examples/TwoCards/TwoCards.pde
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/examples/TwoCards/TwoCards.pde
rename to source-1.0L-F11/floppyemu/SdFat/examples/TwoCards/TwoCards.pde
diff --git a/source-1.0L-F11/AVR/SdFat/examples/append/append.pde b/source-1.0L-F11/floppyemu/SdFat/examples/append/append.pde
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/examples/append/append.pde
rename to source-1.0L-F11/floppyemu/SdFat/examples/append/append.pde
diff --git a/source-1.0L-F11/AVR/SdFat/examples/average/average.pde b/source-1.0L-F11/floppyemu/SdFat/examples/average/average.pde
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/examples/average/average.pde
rename to source-1.0L-F11/floppyemu/SdFat/examples/average/average.pde
diff --git a/source-1.0L-F11/AVR/SdFat/examples/bench/bench.pde b/source-1.0L-F11/floppyemu/SdFat/examples/bench/bench.pde
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/examples/bench/bench.pde
rename to source-1.0L-F11/floppyemu/SdFat/examples/bench/bench.pde
diff --git a/source-1.0L-F11/AVR/SdFat/examples/bufstream/bufstream.pde b/source-1.0L-F11/floppyemu/SdFat/examples/bufstream/bufstream.pde
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/examples/bufstream/bufstream.pde
rename to source-1.0L-F11/floppyemu/SdFat/examples/bufstream/bufstream.pde
diff --git a/source-1.0L-F11/AVR/SdFat/examples/cin_cout/cin_cout.pde b/source-1.0L-F11/floppyemu/SdFat/examples/cin_cout/cin_cout.pde
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/examples/cin_cout/cin_cout.pde
rename to source-1.0L-F11/floppyemu/SdFat/examples/cin_cout/cin_cout.pde
diff --git a/source-1.0L-F11/AVR/SdFat/examples/eventlog/eventlog.pde b/source-1.0L-F11/floppyemu/SdFat/examples/eventlog/eventlog.pde
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/examples/eventlog/eventlog.pde
rename to source-1.0L-F11/floppyemu/SdFat/examples/eventlog/eventlog.pde
diff --git a/source-1.0L-F11/AVR/SdFat/examples/fgets/fgets.pde b/source-1.0L-F11/floppyemu/SdFat/examples/fgets/fgets.pde
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/examples/fgets/fgets.pde
rename to source-1.0L-F11/floppyemu/SdFat/examples/fgets/fgets.pde
diff --git a/source-1.0L-F11/AVR/SdFat/examples/formatting/formatting.pde b/source-1.0L-F11/floppyemu/SdFat/examples/formatting/formatting.pde
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/examples/formatting/formatting.pde
rename to source-1.0L-F11/floppyemu/SdFat/examples/formatting/formatting.pde
diff --git a/source-1.0L-F11/AVR/SdFat/examples/getline/getline.pde b/source-1.0L-F11/floppyemu/SdFat/examples/getline/getline.pde
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/examples/getline/getline.pde
rename to source-1.0L-F11/floppyemu/SdFat/examples/getline/getline.pde
diff --git a/source-1.0L-F11/AVR/SdFat/examples/readCSV/readCSV.pde b/source-1.0L-F11/floppyemu/SdFat/examples/readCSV/readCSV.pde
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/examples/readCSV/readCSV.pde
rename to source-1.0L-F11/floppyemu/SdFat/examples/readCSV/readCSV.pde
diff --git a/source-1.0L-F11/AVR/SdFat/examples/readlog/readlog.pde b/source-1.0L-F11/floppyemu/SdFat/examples/readlog/readlog.pde
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/examples/readlog/readlog.pde
rename to source-1.0L-F11/floppyemu/SdFat/examples/readlog/readlog.pde
diff --git a/source-1.0L-F11/AVR/SdFat/examples/rename/rename.pde b/source-1.0L-F11/floppyemu/SdFat/examples/rename/rename.pde
similarity index 100%
rename from source-1.0L-F11/AVR/SdFat/examples/rename/rename.pde
rename to source-1.0L-F11/floppyemu/SdFat/examples/rename/rename.pde
diff --git a/source-1.0L-F11/AVR/cardtest.cpp b/source-1.0L-F11/floppyemu/cardtest.cpp
similarity index 95%
rename from source-1.0L-F11/AVR/cardtest.cpp
rename to source-1.0L-F11/floppyemu/cardtest.cpp
index 5ff049f..8e6253b 100755
--- a/source-1.0L-F11/AVR/cardtest.cpp
+++ b/source-1.0L-F11/floppyemu/cardtest.cpp
@@ -30,12 +30,16 @@
#include "diskmenu.h"
#include "cardtest.h"
+#ifdef ENABLE_ORIGINAL_COMPILER_WORKAROUND
+
// work-around for compiler bug
#undef PROGMEM
#define PROGMEM __attribute__(( section(".progmem.data") ))
#undef PSTR
#define PSTR(s) (__extension__({static prog_char __c[] PROGMEM = (s); &__c[0];}))
-
+
+#endif
+
#define STATUS_LED_PORT B
#define STATUS_LED_PIN 3
@@ -213,4 +217,4 @@ void CardTest()
while(1);
-}
\ No newline at end of file
+}
diff --git a/source-1.0L-F11/AVR/cardtest.h b/source-1.0L-F11/floppyemu/cardtest.h
similarity index 100%
rename from source-1.0L-F11/AVR/cardtest.h
rename to source-1.0L-F11/floppyemu/cardtest.h
diff --git a/source-1.0L-F11/AVR/diskmenu.cpp b/source-1.0L-F11/floppyemu/diskmenu.cpp
similarity index 100%
rename from source-1.0L-F11/AVR/diskmenu.cpp
rename to source-1.0L-F11/floppyemu/diskmenu.cpp
diff --git a/source-1.0L-F11/AVR/diskmenu.h b/source-1.0L-F11/floppyemu/diskmenu.h
similarity index 100%
rename from source-1.0L-F11/AVR/diskmenu.h
rename to source-1.0L-F11/floppyemu/diskmenu.h
diff --git a/source-1.0L-F11/AVR/floppyemu.atsln b/source-1.0L-F11/floppyemu/floppyemu.atsln
similarity index 100%
rename from source-1.0L-F11/AVR/floppyemu.atsln
rename to source-1.0L-F11/floppyemu/floppyemu.atsln
diff --git a/source-1.0L-F11/AVR/floppyemu.atsuo b/source-1.0L-F11/floppyemu/floppyemu.atsuo
similarity index 100%
rename from source-1.0L-F11/AVR/floppyemu.atsuo
rename to source-1.0L-F11/floppyemu/floppyemu.atsuo
diff --git a/source-1.0L-F11/AVR/floppyemu.cpp b/source-1.0L-F11/floppyemu/floppyemu.cpp
similarity index 96%
rename from source-1.0L-F11/AVR/floppyemu.cpp
rename to source-1.0L-F11/floppyemu/floppyemu.cpp
index 22474dd..bc8c805 100755
--- a/source-1.0L-F11/AVR/floppyemu.cpp
+++ b/source-1.0L-F11/floppyemu/floppyemu.cpp
@@ -31,12 +31,16 @@
#include "ports.h"
#include "diskmenu.h"
+#ifdef ENABLE_ORIGINAL_COMPILER_WORKAROUND
+
// work-around for compiler bug
#undef PROGMEM
#define PROGMEM __attribute__(( section(".progmem.data") ))
#undef PSTR
#define PSTR(s) (__extension__({static prog_char __c[] PROGMEM = (s); &__c[0];}))
+#endif
+
// I/O pin assignments
#define CPLD_RESET_PORT B
#define CPLD_RESET_PIN 0
@@ -2014,4 +2018,4 @@ restart: ;
}
}
}
-}
\ No newline at end of file
+}
diff --git a/source-1.0L-F11/AVR/floppyemu.cppproj b/source-1.0L-F11/floppyemu/floppyemu.cppproj
similarity index 100%
rename from source-1.0L-F11/AVR/floppyemu.cppproj
rename to source-1.0L-F11/floppyemu/floppyemu.cppproj
diff --git a/source-1.0L-F11/AVR/millitimer.cpp b/source-1.0L-F11/floppyemu/millitimer.cpp
similarity index 100%
rename from source-1.0L-F11/AVR/millitimer.cpp
rename to source-1.0L-F11/floppyemu/millitimer.cpp
diff --git a/source-1.0L-F11/AVR/millitimer.h b/source-1.0L-F11/floppyemu/millitimer.h
similarity index 100%
rename from source-1.0L-F11/AVR/millitimer.h
rename to source-1.0L-F11/floppyemu/millitimer.h
diff --git a/source-1.0L-F11/AVR/noklcd.cpp b/source-1.0L-F11/floppyemu/noklcd.cpp
similarity index 100%
rename from source-1.0L-F11/AVR/noklcd.cpp
rename to source-1.0L-F11/floppyemu/noklcd.cpp
diff --git a/source-1.0L-F11/AVR/noklcd.h b/source-1.0L-F11/floppyemu/noklcd.h
similarity index 100%
rename from source-1.0L-F11/AVR/noklcd.h
rename to source-1.0L-F11/floppyemu/noklcd.h
diff --git a/source-1.0L-F11/AVR/portmacros.h b/source-1.0L-F11/floppyemu/portmacros.h
similarity index 100%
rename from source-1.0L-F11/AVR/portmacros.h
rename to source-1.0L-F11/floppyemu/portmacros.h
diff --git a/source-1.0L-F11/AVR/xsvf/lenval.cpp b/source-1.0L-F11/floppyemu/xsvf/lenval.cpp
similarity index 100%
rename from source-1.0L-F11/AVR/xsvf/lenval.cpp
rename to source-1.0L-F11/floppyemu/xsvf/lenval.cpp
diff --git a/source-1.0L-F11/AVR/xsvf/lenval.h b/source-1.0L-F11/floppyemu/xsvf/lenval.h
similarity index 100%
rename from source-1.0L-F11/AVR/xsvf/lenval.h
rename to source-1.0L-F11/floppyemu/xsvf/lenval.h
diff --git a/source-1.0L-F11/AVR/xsvf/micro.cpp b/source-1.0L-F11/floppyemu/xsvf/micro.cpp
similarity index 100%
rename from source-1.0L-F11/AVR/xsvf/micro.cpp
rename to source-1.0L-F11/floppyemu/xsvf/micro.cpp
diff --git a/source-1.0L-F11/AVR/xsvf/micro.h b/source-1.0L-F11/floppyemu/xsvf/micro.h
similarity index 100%
rename from source-1.0L-F11/AVR/xsvf/micro.h
rename to source-1.0L-F11/floppyemu/xsvf/micro.h
diff --git a/source-1.0L-F11/AVR/xsvf/ports.cpp b/source-1.0L-F11/floppyemu/xsvf/ports.cpp
similarity index 100%
rename from source-1.0L-F11/AVR/xsvf/ports.cpp
rename to source-1.0L-F11/floppyemu/xsvf/ports.cpp
diff --git a/source-1.0L-F11/AVR/xsvf/ports.h b/source-1.0L-F11/floppyemu/xsvf/ports.h
similarity index 100%
rename from source-1.0L-F11/AVR/xsvf/ports.h
rename to source-1.0L-F11/floppyemu/xsvf/ports.h