some bugs are fixed

5 files changed, 33 insertions, 28 deletions

diff --git a/.DS_Store b/.DS_Store
index 59e06eb..3b95ee1 100644
--- a/.DS_Store
+++ b/.DS_Store
diff --git a/Release/Bootloader.axf b/Release/Bootloader.axf
index 20ba08c..d9275d7 100755
--- a/Release/Bootloader.axf
+++ b/Release/Bootloader.axf
diff --git a/Release/Bootloader.hex b/Release/Bootloader.hex
index c97f2a7..5776c54 100755
--- a/Release/Bootloader.hex
+++ b/Release/Bootloader.hex
@@ -25,7 +25,7 @@
 :10018000F11FFF1F08B50B4A0B4B03E0117801323A

 :100190001970013309498B42F8D3094B02E0002260

 :1001A0001A700133074A9342F9D300F02DFA00F098

-:1001B00069FAFEE7AF070000000000100800001019

+:1001B00069FAFEE7FD0700000000001008000010CB

 :1001C000080000100800001010B5031C00200FE00C

 :1001D0001A78013312025040082204B24000002C69

 :1001E00001DA064C6040013AD2B280B2002AF4D162

@@ -36,25 +36,25 @@
 :1002300080222068311C5200FFF756FFA8420DD1E2

 :1002400080222068311C52002B1CFFF783FFA8423C

 :1002500004D1236801350133FF332360281C70BDAE

-:100260000000001070B5454C4549A5445E228CA89D

-:1002700000F00CFA7822ADAB1A80ACAB093A1A80C8

-:100280004049523AA4A800F001FA9620800100F0FB

-:100290004FF901200721FFF713FF002869D1013032

-:1002A0000721FFF73BFF002863D18CA85E2100F0F7

+:100260000000001070B5454C4549A544AC228BA850

+:1002700000F00CFA7822BFAB1A80BEAB093A1A80A4

+:100280004049523AB6A800F001FA9620800100F0E9

+:100290004FF901200721FFF713FF00286AD1013031

+:1002A0000721FFF73BFF002864D18BA8AC2100F0A9

 :1002B0009BF9354C6C44201C00F088F90028F8D0DC

-:1002C000227801AB1A70012400251CE0337801A8C4

-:1002D0000355802301345B0000259C4213D1FFF7B6

-:1002E0009BFFA84201D1ADA800E0ACA8022100F01C

-:1002F0007BF9002301AA0024D45480220133520048

-:100300009342F7D1251C204E6E44301C00F05EF95C

-:100310000028DBD11D4B01359D42F4DD01A8FFF71C

-:100320007BFF002801D1ADA800E0ACA8022100F0BD

-:100330005BF9802040011649FFF746FFFE234CAAD7

-:10034000DB0102CB02C2802109028B42F9D18B90E2

-:100350000720011CFFF7B4FE002806D1FE308022E2

-:10036000C0014CA95200FFF7BFFEA4A81D2100F058

-:100370003BF9AE239B009D4470BDC04648FDFFFF86

-:100380003407000092070000B7020000FEFF0F00D4

+:1002C00023786A461370012400251DE033786A46BE

+:1002D0001355802301345B0000259C4214D16846ED

+:1002E000FFF79AFFA84201D1BFA800E0BEA80221F3

+:1002F00000F07AF900236A460024D45480220133A6

+:1003000052009342F7D1251C1F4E6E44301C00F062

+:100310005DF90028DAD11D4B01359D42F4DD6846B8

+:10032000FFF77AFF002801D1BFA800E0BEA8022194

+:1003300000F05AF9802040011549FFF745FFFE23E0

+:100340004BAADB0102CB02C2802109028B42F9D108

+:100350008A900720011CFFF7B3FE002806D1FE306B

+:100360008022C0014BA95200FFF7BEFEB6A81D2196

+:1003700000F03AF9C0239B009D4470BD00FDFFFFD3

+:1003800034070000E0070000FF020000FEFF0F003E

 :10039000FC6F000037B5A0228023D2051B02D15884

 :1003A0000220184C8143D1502288174B9A4217D013

 :1003B0007E3040011549FFF707FF238883420FD1A4

@@ -63,7 +63,7 @@
 :1003E000FFF740FFFFF70CFF05E00A48006885466D

 :1003F00009480068874600203EBD9620800100F035

 :1004000097F8DEE7FC7F0000FFFF0000FC6F0000B4

-:10041000FEFF00000010000004100000014800680A

+:10041000FEFF0F00001000000410000001480068FB

 :100420008746000008100000014800688746000069

 :100430000C10000001480068874600002C100000E6

 :100440000148006887460000381000000148006835

@@ -117,10 +117,15 @@
 :10074000586F647573696E6F210D0A687474703A1E

 :100750002F2F656372616674732E672E68617465EE

 :100760006E612E6E652E6A702F4C796E782D4579EC

-:1007700045442F0D0A4C796E5862656520426F6FB3

-:10078000746C6F616465722053746172742E2E2EC6

-:100790002E000D0A50726F6772616D20656E642EB7

-:0F07A000205265626F6F74696E672E2E2E2E00C9

-:0807AF0000100000006CDC02E8

+:1007700045442F0D0A43415554494F4E3A54484978

+:100780005320424F4F544C4F41444552204953202F

+:10079000414C4C4F574544204F4E4C5920464F52E8

+:1007A000204E4F4E2D434F4D4D45524349414C2015

+:1007B0005553452E2843432042592D4E432D4E4438

+:1007C000290D0A4C796E5862656520426F6F746C12

+:1007D0006F616465722053746172742E2E2E2E0028

+:1007E0000D0A50726F6772616D20656E642E205223

+:0D07F00065626F6F74696E672E2E2E2E00ED

+:0807FD0000100000006CDC029A

 :040000030000018573

 :00000001FF

diff --git a/src/core/SPI.h b/src/core/SPI.h
index 6040e74..0dfd6c6 100755
--- a/src/core/SPI.h
+++ b/src/core/SPI.h
@@ -35,7 +35,7 @@
 
 /*! @enum	SSP_PORT
   @brief	SPIポートのチャンネル選択。使用時のCS信号を選択する
-  @note		SPIが1ポートしかないMARYでは使用していないので特に影響はないが、2ポート以上あるLPCXpressoやmbedシリーズとの後方互換性を考慮し用意している
+  @note		SPIが1ポートしかないMARYでは使用していないので特に影響はないが、2ポート以上あるLPCXpresso LPC1114やmbedシリーズとの後方互換性を考慮し用意している
 */
 typedef enum {
 	marySSP0,	/*!< MARYのSSPポート(デフォルト) */
diff --git a/src/core/startup_mary.cpp b/src/core/startup_mary.cpp
index 8ce5c39..c7ec282 100755
--- a/src/core/startup_mary.cpp
+++ b/src/core/startup_mary.cpp
@@ -13,8 +13,8 @@ void loop(void);
 int main(void)
 {
 
-	setup_systick();
-	setup_TIMER32_1();
+	setup_systick();	// for millis(),delay(us)
+	setup_TIMER32_1();	// for micros(),delayMicroseconds(us),attachMicroseconds(func,usec)
 
 	setup();