Changeset 260 for rtos_arduino/trunk/examples/MultiTask
- Timestamp:
- Oct 23, 2016, 8:29:46 PM (8 years ago)
- Location:
- rtos_arduino/trunk/examples/MultiTask
- Files:
-
- 1 edited
- 6 moved
Legend:
- Unmodified
- Added
- Removed
-
rtos_arduino/trunk/examples/MultiTask/Makefile
r137 r260 7 7 # ã¢ããªã±ã¼ã·ã§ã³ãã¡ã¤ã« 8 8 # 9 APPL_CXXOBJS += r ca_app.o9 APPL_CXXOBJS += r2ca_app.o 10 10 APPL_COBJS += 11 APPL_CFG = r ca_app.cfg11 APPL_CFG = r2ca_app.cfg 12 12 13 13 # … … 25 25 26 26 # 27 # R CAã®ãã£ã¬ã¯ããªã®å®ç¾©27 # R2CAã®ãã£ã¬ã¯ããªã®å®ç¾© 28 28 # 29 R CA_DIR = ../..29 R2CA_DIR = ../.. 30 30 31 31 # … … 41 41 APPL_DIR = 42 42 43 include $(R CA_DIR)/lib/Makefile.rca43 include $(R2CA_DIR)/lib/Makefile.r2ca -
rtos_arduino/trunk/examples/MultiTask/r2ca.atsln
r258 r260 4 4 VisualStudioVersion = 14.0.23107.0 5 5 MinimumVisualStudioVersion = 10.0.40219.1 6 Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "r ca", "rca.cproj", "{DCE6C7E3-EE26-4D79-826B-08594B9AD897}"6 Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "r2ca", "r2ca.cproj", "{DCE6C7E3-EE26-4D79-826B-08594B9AD897}" 7 7 EndProject 8 8 Global -
rtos_arduino/trunk/examples/MultiTask/r2ca.componentinfo.xml
r258 r260 23 23 <CVersion>1.0.0</CVersion> 24 24 <DefaultRepoPath>C:/Program Files (x86)\Atmel\Studio\7.0\Packs</DefaultRepoPath> 25 <DependentComponents /> 25 <DependentComponents> 26 <d4p1:anyType z:Ref="i1" /> 27 </DependentComponents> 26 28 <Description></Description> 27 29 <Files> 28 30 <d4p1:anyType i:type="FileInfo"> 29 <AbsolutePath>C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\SAMD21_DFP\1.0.2 22\samd21a\include</AbsolutePath>31 <AbsolutePath>C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\SAMD21_DFP\1.0.231\samd21a\include</AbsolutePath> 30 32 <Attribute></Attribute> 31 33 <Category>include</Category> … … 38 40 </d4p1:anyType> 39 41 <d4p1:anyType i:type="FileInfo"> 40 <AbsolutePath>C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\SAMD21_DFP\1.0.2 22\samd21a\include\sam.h</AbsolutePath>42 <AbsolutePath>C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\SAMD21_DFP\1.0.231\samd21a\include\sam.h</AbsolutePath> 41 43 <Attribute></Attribute> 42 44 <Category>header</Category> … … 49 51 </d4p1:anyType> 50 52 <d4p1:anyType i:type="FileInfo"> 51 <AbsolutePath>C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\SAMD21_DFP\1.0.2 22\samd21a\templates\main.c</AbsolutePath>53 <AbsolutePath>C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\SAMD21_DFP\1.0.231\samd21a\templates\main.c</AbsolutePath> 52 54 <Attribute>template</Attribute> 53 55 <Category>source</Category> 54 56 <Condition>C Exe</Condition> 55 <FileContentHash> dSS7TLoDl1MS+uFZPgKPWQ==</FileContentHash>57 <FileContentHash>o0ncidL5gR0Z0YwWJ1YroQ==</FileContentHash> 56 58 <FileVersion></FileVersion> 57 59 <Name>samd21a/templates/main.c</Name> … … 60 62 </d4p1:anyType> 61 63 <d4p1:anyType i:type="FileInfo"> 62 <AbsolutePath>C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\SAMD21_DFP\1.0.2 22\samd21a\templates\main.cpp</AbsolutePath>64 <AbsolutePath>C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\SAMD21_DFP\1.0.231\samd21a\templates\main.cpp</AbsolutePath> 63 65 <Attribute>template</Attribute> 64 66 <Category>source</Category> … … 71 73 </d4p1:anyType> 72 74 <d4p1:anyType i:type="FileInfo"> 73 <AbsolutePath>C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\SAMD21_DFP\1.0.2 22\samd21a\gcc\system_samd21.c</AbsolutePath>75 <AbsolutePath>C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\SAMD21_DFP\1.0.231\samd21a\gcc\system_samd21.c</AbsolutePath> 74 76 <Attribute>config</Attribute> 75 77 <Category>source</Category> … … 82 84 </d4p1:anyType> 83 85 <d4p1:anyType i:type="FileInfo"> 84 <AbsolutePath>C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\SAMD21_DFP\1.0.2 22\samd21a\gcc\gcc\startup_samd21.c</AbsolutePath>86 <AbsolutePath>C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\SAMD21_DFP\1.0.231\samd21a\gcc\gcc\startup_samd21.c</AbsolutePath> 85 87 <Attribute>config</Attribute> 86 88 <Category>source</Category> … … 93 95 </d4p1:anyType> 94 96 <d4p1:anyType i:type="FileInfo"> 95 <AbsolutePath>C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\SAMD21_DFP\1.0.2 22\samd21a\gcc\gcc\samd21g18a_flash.ld</AbsolutePath>97 <AbsolutePath>C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\SAMD21_DFP\1.0.231\samd21a\gcc\gcc\samd21g18a_flash.ld</AbsolutePath> 96 98 <Attribute>config</Attribute> 97 99 <Category>linkerScript</Category> … … 104 106 </d4p1:anyType> 105 107 <d4p1:anyType i:type="FileInfo"> 106 <AbsolutePath>C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\SAMD21_DFP\1.0.2 22\samd21a\gcc\gcc\samd21g18a_sram.ld</AbsolutePath>108 <AbsolutePath>C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\SAMD21_DFP\1.0.231\samd21a\gcc\gcc\samd21g18a_sram.ld</AbsolutePath> 107 109 <Attribute>config</Attribute> 108 110 <Category>other</Category> … … 116 118 </Files> 117 119 <PackName>SAMD21_DFP</PackName> 118 <PackPath>C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/SAMD21_DFP/1.0.2 22/Atmel.SAMD21_DFP.pdsc</PackPath>119 <PackVersion>1.0.2 22</PackVersion>120 <PackPath>C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/SAMD21_DFP/1.0.231/Atmel.SAMD21_DFP.pdsc</PackPath> 121 <PackVersion>1.0.231</PackVersion> 120 122 <PresentInProject>true</PresentInProject> 121 123 <ReferenceConditionId>ATSAMD21G18A</ReferenceConditionId> -
rtos_arduino/trunk/examples/MultiTask/r2ca.cproj
r258 r260 13 13 <OutputFileExtension>.elf</OutputFileExtension> 14 14 <OutputDirectory>$(MSBuildProjectDirectory)\$(Configuration)</OutputDirectory> 15 <AssemblyName>r ca</AssemblyName>16 <Name>r ca</Name>17 <RootNamespace>r ca</RootNamespace>15 <AssemblyName>r2ca</AssemblyName> 16 <Name>r2ca</Name> 17 <RootNamespace>r2ca</RootNamespace> 18 18 <ToolchainFlavour>Native</ToolchainFlavour> 19 19 <KeepTimersRunning>true</KeepTimersRunning> … … 73 73 <armgcc.compiler.directories.IncludePaths> 74 74 <ListValues> 75 <Value>%24(PackRepoDir)\atmel\SAMD21_DFP\1.0.222\samd21a\include</Value>76 75 <Value>%24(PackRepoDir)\arm\cmsis\4.2.0\CMSIS\Include\</Value> 76 <Value>%24(PackRepoDir)\atmel\SAMD21_DFP\1.0.231\samd21a\include</Value> 77 77 </ListValues> 78 78 </armgcc.compiler.directories.IncludePaths> … … 92 92 <armgcc.linker.optimization.GarbageCollectUnusedSections>True</armgcc.linker.optimization.GarbageCollectUnusedSections> 93 93 <armgcc.linker.miscellaneous.LinkerFlags>-Tsamd21g18a_flash.ld</armgcc.linker.miscellaneous.LinkerFlags> 94 <armgcc.assembler.general.IncludePaths> 95 <ListValues> 96 <Value>%24(PackRepoDir)\atmel\SAMD21_DFP\1.0.231\samd21a\include</Value> 97 </ListValues> 98 </armgcc.assembler.general.IncludePaths> 94 99 <armgcc.preprocessingassembler.general.IncludePaths> 95 100 <ListValues> 96 <Value>%24(PackRepoDir)\atmel\SAMD21_DFP\1.0.222\samd21a\include</Value>97 101 <Value>%24(PackRepoDir)\arm\cmsis\4.2.0\CMSIS\Include\</Value> 102 <Value>%24(PackRepoDir)\atmel\SAMD21_DFP\1.0.231\samd21a\include</Value> 98 103 </ListValues> 99 104 </armgcc.preprocessingassembler.general.IncludePaths> … … 116 121 <armgcc.compiler.directories.IncludePaths> 117 122 <ListValues> 118 <Value>%24(PackRepoDir)\atmel\SAMD21_DFP\1.0.222\samd21a\include</Value>119 123 <Value>%24(PackRepoDir)\arm\cmsis\4.2.0\CMSIS\Include\</Value> 124 <Value>%24(PackRepoDir)\atmel\SAMD21_DFP\1.0.231\samd21a\include</Value> 120 125 </ListValues> 121 126 </armgcc.compiler.directories.IncludePaths> … … 136 141 <armgcc.linker.optimization.GarbageCollectUnusedSections>True</armgcc.linker.optimization.GarbageCollectUnusedSections> 137 142 <armgcc.linker.miscellaneous.LinkerFlags>-Tsamd21g18a_flash.ld</armgcc.linker.miscellaneous.LinkerFlags> 143 <armgcc.assembler.general.IncludePaths> 144 <ListValues> 145 <Value>%24(PackRepoDir)\atmel\SAMD21_DFP\1.0.231\samd21a\include</Value> 146 </ListValues> 147 </armgcc.assembler.general.IncludePaths> 138 148 <armgcc.assembler.debugging.DebugLevel>Default (-g)</armgcc.assembler.debugging.DebugLevel> 139 149 <armgcc.preprocessingassembler.general.IncludePaths> 140 150 <ListValues> 141 <Value>%24(PackRepoDir)\atmel\SAMD21_DFP\1.0.222\samd21a\include</Value>142 151 <Value>%24(PackRepoDir)\arm\cmsis\4.2.0\CMSIS\Include\</Value> 152 <Value>%24(PackRepoDir)\atmel\SAMD21_DFP\1.0.231\samd21a\include</Value> 143 153 </ListValues> 144 154 </armgcc.preprocessingassembler.general.IncludePaths> … … 153 163 </PropertyGroup> 154 164 <ItemGroup> 155 <None Include="r ca_app.cfg">165 <None Include="r2ca_app.cfg"> 156 166 <SubType>compile</SubType> 157 167 </None> 158 <None Include="r ca_app.cpp">168 <None Include="r2ca_app.cpp"> 159 169 <SubType>compile</SubType> 160 170 </None> 161 171 </ItemGroup> 162 172 <ItemGroup> 163 <Compile Include="r ca_app.h">173 <Compile Include="r2ca_app.h"> 164 174 <SubType>compile</SubType> 165 175 </Compile> -
rtos_arduino/trunk/examples/MultiTask/r2ca_app.cfg
r258 r260 6 6 * ãµã³ãã«ããã°ã©ã (1)ã®ã·ã¹ãã ã³ã³ãã£ã®ã¥ã¬ã¼ã·ã§ã³ãã¡ã¤ã« 7 7 */ 8 INCLUDE("r ca_lib.cfg");8 INCLUDE("r2ca_lib.cfg"); -
rtos_arduino/trunk/examples/MultiTask/r2ca_app.cpp
r258 r260 1 #include "r ca.h"1 #include "r2ca.h" 2 2 3 3 /* … … 6 6 void setup() { 7 7 Serial.begin(115200); 8 Serial.println("setup() : running"); 9 delay(1); 8 Serial.println("setup() : running "); 9 10 pinMode(13, OUTPUT); 10 11 } 11 12 … … 13 14 14 15 void loop() { 15 Serial.print("loop() : running ");16 Serial.print("loop() : running "); 16 17 Serial.print(loop_cnt++); 17 18 Serial.println(" ."); … … 22 23 * For TASK1 23 24 */ 24 void task1_setup() { 25 pinMode(13, OUTPUT); 26 Serial.println("task1_setup() : running"); 27 } 28 29 void task1_loop() { 25 void loop1() { 30 26 digitalWrite(13, HIGH); 31 27 delay(1000); … … 34 30 } 35 31 36 37 32 int task2_loop_cnt = 0; 38 33 … … 40 35 * For TASK2 41 36 */ 42 void task2_setup() { 43 Serial.println("task2_setup() : running"); 44 SerialUSB.begin(115200); 45 while(!SerialUSB){ ; } 46 SerialUSB.println("task2_setup() : running"); 47 } 48 49 void task2_loop() { 50 Serial.print("task2_loop() : running"); 51 Serial.print(task2_loop_cnt); 37 void loop2() { 38 Serial.print("task2_loop() : running "); 39 Serial.print(task2_loop_cnt++); 52 40 Serial.println(" ."); 53 SerialUSB.print("task2_loop() : running");54 SerialUSB.print(task2_loop_cnt++);55 SerialUSB.println(" .");56 41 delay(2000); 57 42 } … … 62 47 * For TASK3 63 48 */ 64 void task3_setup() { 65 Serial.println("task3_setup() : running"); 66 delay(1); 67 } 68 69 void task3_loop() { 70 Serial.print("task3_loop() : running"); 49 void loop3() { 50 Serial.print("task3_loop() : running "); 71 51 Serial.print(task3_loop_cnt++); 72 52 Serial.println(" ."); … … 79 59 * For TASK4 80 60 */ 81 void task4_setup() { 82 Serial.println("task4_setup() : running"); 83 delay(1); 84 } 85 86 void task4_loop() { 87 Serial.print("task4_loop() : running"); 61 void loop4() { 62 Serial.print("task4_loop() : running "); 88 63 Serial.print(task4_loop_cnt++); 89 64 Serial.println(" ."); -
rtos_arduino/trunk/examples/MultiTask/r2ca_app.h
r258 r260 1 #ifndef _R CA_APP_H_2 #define _R CA_APP_H_1 #ifndef _R2CA_APP_H_ 2 #define _R2CA_APP_H_ 3 3 4 #define RCA_NUM_TASK 4 5 6 #define RCA_TASK2_SETUP_PRI 6 4 #define R2CA_NUM_TASK 4 7 5 8 6 #endif /* _RCA_APP_H_ */
Note:
See TracChangeset
for help on using the changeset viewer.