コンパイルエラーを修正
@@ -10,6 +10,7 @@ | ||
10 | 10 | #include "Tds01vCtrl.h" |
11 | 11 | #include "SerialCtrl.h" |
12 | 12 | #include "Delay.h" |
13 | +#include <cstdlib> | |
13 | 14 | |
14 | 15 | using namespace beego; |
15 | 16 |
@@ -11,6 +11,7 @@ | ||
11 | 11 | */ |
12 | 12 | |
13 | 13 | #include "GpsInterface.h" |
14 | +#include <memory> | |
14 | 15 | |
15 | 16 | |
16 | 17 | namespace beego { |
@@ -18,6 +18,8 @@ | ||
18 | 18 | #include "MathUtils.h" |
19 | 19 | #include <string> |
20 | 20 | #include <vector> |
21 | +#include <cstdlib> | |
22 | +#include <cstring> | |
21 | 23 | |
22 | 24 | #include "str01.h" |
23 | 25 |
@@ -11,6 +11,7 @@ | ||
11 | 11 | */ |
12 | 12 | |
13 | 13 | #include "GpsInterface.h" |
14 | +#include <memory> | |
14 | 15 | |
15 | 16 | |
16 | 17 | namespace beego { |
@@ -56,11 +56,11 @@ | ||
56 | 56 | void initSCI(long baudrate) { |
57 | 57 | |
58 | 58 | SCI1.SCR.BYTE = 0x00; |
59 | - SCI1.SMR.BYTE = 0; /* 8bit, 1stop, no parity */ | |
59 | + SCI1.SMR.BYTE = 0; /* 8bit, 1stop, no parity */ | |
60 | 60 | setBaudrate(baudrate); |
61 | - PFC.PACRL2.WORD |= 0x0140; /* enable RxD1, TxD1 */ | |
62 | - SCI1.SCR.BYTE = 0x30; /* TE = 1, RE = 1 */ | |
61 | + PFC.PACRL2.WORD |= 0x0140; /* enable RxD1, TxD1 */ | |
63 | 62 | SCI1.SSR.BYTE &= ~0x40; |
63 | + SCI1.SCR.BYTE = 0x30; /* TE = 1, RE = 1 */ | |
64 | 64 | } |
65 | 65 | |
66 | 66 |
@@ -70,7 +70,7 @@ | ||
70 | 70 | while((SCI1.SSR.BYTE & 0x40) == 0) /* RDRF */ |
71 | 71 | ; |
72 | 72 | ch = SCI1.RDR; |
73 | - SCI1.SSR.BYTE &= ~0x40; /* clear RDRF */ | |
73 | + SCI1.SSR.BYTE &= ~0x40; /* clear RDRF */ | |
74 | 74 | |
75 | 75 | return ch; |
76 | 76 | } |
@@ -98,7 +98,7 @@ | ||
98 | 98 | "\x00\x00\x96\x00\x00\x00\xe1\x00\x00\x01\xc2\x00\x00\x09\x00\x09" |
99 | 99 | "\x2f\x86\x2f\x96\x98\x1a\xe1\x00\x2f\xe6\x69\x83\x4f\x22\x79\x02" |
100 | 100 | "\x29\x10\x28\x10\xd1\x0b\x41\x0b\x6e\xf3\x93\x10\x92\x10\x61\x31" |
101 | -"\x21\x2b\x23\x11\xe1\x30\x29\x10\x78\x04\x60\x80\xc9\xbf\x28\x00" | |
101 | +"\x21\x2b\x23\x11\x78\x04\x60\x80\xc9\xbf\x28\x00\xe1\x30\x29\x10" | |
102 | 102 | "\x6f\xe3\x4f\x26\x6e\xf6\x69\xf6\x00\x0b\x68\xf6\x81\xb0\x83\x8e" |
103 | 103 | "\x01\x40\x00\x09\xff\xff\xf5\x20\x00\x09\x00\x09\x00\x09\x00\x09" |
104 | 104 | "\x2f\xe6\x91\x10\x6e\xf3\x00\x09\x60\x10\xc9\x40\x20\x08\x89\xfb" |
@@ -12,6 +12,7 @@ | ||
12 | 12 | */ |
13 | 13 | |
14 | 14 | #include "BaseEntity.h" |
15 | +#include <cstdio> | |
15 | 16 | |
16 | 17 | using namespace beego; |
17 | 18 |
@@ -10,6 +10,8 @@ | ||
10 | 10 | #include "UkagakaShellHandler.h" |
11 | 11 | #include <string> |
12 | 12 | #include <fstream> |
13 | +#include <cstdlib> | |
14 | +#include <cstring> | |
13 | 15 | |
14 | 16 | using namespace beego; |
15 | 17 |
@@ -12,6 +12,7 @@ | ||
12 | 12 | |
13 | 13 | #include <memory> |
14 | 14 | #include <vector> |
15 | +#include <string> | |
15 | 16 | |
16 | 17 | namespace beego { |
17 | 18 | class ConnectionInterface; |
@@ -15,6 +15,8 @@ | ||
15 | 15 | #include "MathUtils.h" |
16 | 16 | #include "GetTicks.h" |
17 | 17 | #include "Delay.h" |
18 | +#include <cstring> | |
19 | +#include <cstdlib> | |
18 | 20 | |
19 | 21 | //#include "ConnectionLogger.h" |
20 | 22 |
@@ -18,9 +18,9 @@ | ||
18 | 18 | |
19 | 19 | typedef std::vector<boost::shared_ptr<TextSurface> > FadeSurfaces; |
20 | 20 | |
21 | - typedef enum FadeMode { | |
21 | + typedef enum { | |
22 | 22 | FadeInFromLeft, //!< 左から右方向に表れる |
23 | - }; | |
23 | + } FadeMode; | |
24 | 24 | |
25 | 25 | class FadeSurfacesInterface { |
26 | 26 | public: |
@@ -9,6 +9,8 @@ | ||
9 | 9 | |
10 | 10 | #include "SearchFilePath.h" |
11 | 11 | #include "ExistFile.h" |
12 | +#include <cstdlib> | |
13 | +#include <cstring> | |
12 | 14 | |
13 | 15 | using namespace beego; |
14 | 16 |
@@ -9,6 +9,8 @@ | ||
9 | 9 | |
10 | 10 | #include "TransmitCtrl.h" |
11 | 11 | #include "ConnectionInterface.h" |
12 | +#include <cstring> | |
13 | +#include <cstdio> | |
12 | 14 | |
13 | 15 | using namespace beego; |
14 | 16 |
@@ -15,6 +15,8 @@ | ||
15 | 15 | #include "tRunCtrl.h" |
16 | 16 | #include "FileToArgs.h" |
17 | 17 | #include "SearchFilePath.h" |
18 | +#include <cstring> | |
19 | +#include <cstdlib> | |
18 | 20 | |
19 | 21 | using namespace beego; |
20 | 22 |
@@ -38,6 +38,7 @@ | ||
38 | 38 | putstr.mot \ |
39 | 39 | putstr.rom \ |
40 | 40 | putstr.dis \ |
41 | + putstr.rom_dis \ | |
41 | 42 | timer1sec.mot \ |
42 | 43 | timer1sec.dis \ |
43 | 44 |