From 0a8a67e352ce8a47c5b2c78a8ebb22d444b03c0b Mon Sep 17 00:00:00 2001 From: Sin Shimozono Date: Mon, 14 Jul 2014 10:35:01 +0900 Subject: [PATCH] source --- floppy-emu-source-1.0L-F11/AVR/.gitignore | 1 + .../AVR/.settings/de.innot.avreclipse.core.prefs | 7 +++++++ .../AVR/.settings/org.eclipse.cdt.core.prefs | 11 +++++++++++ floppy-emu-source-1.0L-F11/AVR/SdFat/Sd2Card.cpp | 2 +- floppy-emu-source-1.0L-F11/AVR/cardtest.cpp | 6 ++++-- floppy-emu-source-1.0L-F11/AVR/floppyemu.cpp | 4 +++- floppy-emu-source-1.0L-F11/AVR/noklcd.cpp | 2 +- 7 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 floppy-emu-source-1.0L-F11/AVR/.gitignore create mode 100644 floppy-emu-source-1.0L-F11/AVR/.settings/de.innot.avreclipse.core.prefs create mode 100644 floppy-emu-source-1.0L-F11/AVR/.settings/org.eclipse.cdt.core.prefs diff --git a/floppy-emu-source-1.0L-F11/AVR/.gitignore b/floppy-emu-source-1.0L-F11/AVR/.gitignore new file mode 100644 index 0000000..3df573f --- /dev/null +++ b/floppy-emu-source-1.0L-F11/AVR/.gitignore @@ -0,0 +1 @@ +/Debug/ diff --git a/floppy-emu-source-1.0L-F11/AVR/.settings/de.innot.avreclipse.core.prefs b/floppy-emu-source-1.0L-F11/AVR/.settings/de.innot.avreclipse.core.prefs new file mode 100644 index 0000000..1b9830c --- /dev/null +++ b/floppy-emu-source-1.0L-F11/AVR/.settings/de.innot.avreclipse.core.prefs @@ -0,0 +1,7 @@ +avrtarget/ClockFrequency=16000000 +avrtarget/ExtRAMSize=0 +avrtarget/ExtendedRAM=false +avrtarget/MCUType=atmega1284p +avrtarget/UseEEPROM=false +avrtarget/UseExtendedRAMforHeap=true +eclipse.preferences.version=1 diff --git a/floppy-emu-source-1.0L-F11/AVR/.settings/org.eclipse.cdt.core.prefs b/floppy-emu-source-1.0L-F11/AVR/.settings/org.eclipse.cdt.core.prefs new file mode 100644 index 0000000..eb53487 --- /dev/null +++ b/floppy-emu-source-1.0L-F11/AVR/.settings/org.eclipse.cdt.core.prefs @@ -0,0 +1,11 @@ +eclipse.preferences.version=1 +environment/project/de.innot.avreclipse.configuration.app.debug.674828633/LANG/delimiter=\: +environment/project/de.innot.avreclipse.configuration.app.debug.674828633/LANG/operation=append +environment/project/de.innot.avreclipse.configuration.app.debug.674828633/LANG/value=en-US +environment/project/de.innot.avreclipse.configuration.app.debug.674828633/append=true +environment/project/de.innot.avreclipse.configuration.app.debug.674828633/appendContributed=true +environment/project/de.innot.avreclipse.configuration.app.release.1024470171/LANG/delimiter=\: +environment/project/de.innot.avreclipse.configuration.app.release.1024470171/LANG/operation=append +environment/project/de.innot.avreclipse.configuration.app.release.1024470171/LANG/value=en-US +environment/project/de.innot.avreclipse.configuration.app.release.1024470171/append=true +environment/project/de.innot.avreclipse.configuration.app.release.1024470171/appendContributed=true diff --git a/floppy-emu-source-1.0L-F11/AVR/SdFat/Sd2Card.cpp b/floppy-emu-source-1.0L-F11/AVR/SdFat/Sd2Card.cpp index 51ed7ec..2261db6 100755 --- a/floppy-emu-source-1.0L-F11/AVR/SdFat/Sd2Card.cpp +++ b/floppy-emu-source-1.0L-F11/AVR/SdFat/Sd2Card.cpp @@ -36,7 +36,7 @@ #include -#include "..\millitimer.h" +#include "../millitimer.h" //------------------------------------------------------------------------------ #ifndef SOFTWARE_SPI diff --git a/floppy-emu-source-1.0L-F11/AVR/cardtest.cpp b/floppy-emu-source-1.0L-F11/AVR/cardtest.cpp index 5ff049f..9e2054d 100755 --- a/floppy-emu-source-1.0L-F11/AVR/cardtest.cpp +++ b/floppy-emu-source-1.0L-F11/AVR/cardtest.cpp @@ -30,12 +30,14 @@ #include "diskmenu.h" #include "cardtest.h" +#ifdef PROGMEM_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 +215,4 @@ void CardTest() while(1); -} \ No newline at end of file +} diff --git a/floppy-emu-source-1.0L-F11/AVR/floppyemu.cpp b/floppy-emu-source-1.0L-F11/AVR/floppyemu.cpp index 22474dd..cb34e5e 100755 --- a/floppy-emu-source-1.0L-F11/AVR/floppyemu.cpp +++ b/floppy-emu-source-1.0L-F11/AVR/floppyemu.cpp @@ -31,11 +31,13 @@ #include "ports.h" #include "diskmenu.h" +#ifdef PROGMEM_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 @@ -2014,4 +2016,4 @@ restart: ; } } } -} \ No newline at end of file +} diff --git a/floppy-emu-source-1.0L-F11/AVR/noklcd.cpp b/floppy-emu-source-1.0L-F11/AVR/noklcd.cpp index 1bb86e8..24c1523 100755 --- a/floppy-emu-source-1.0L-F11/AVR/noklcd.cpp +++ b/floppy-emu-source-1.0L-F11/AVR/noklcd.cpp @@ -306,7 +306,7 @@ void LcdClear(void) void LcdReset(void) { - lcd_vop = 0xBF; + lcd_vop = 0xa4; //0xBF; lcd_bias = 0x14; lcd_tempCoef = 0x04;