Changeset 260 for rtos_arduino/trunk/examples/PIXY_Zumo_Wifi
- Timestamp:
- Oct 23, 2016, 8:29:46 PM (8 years ago)
- Location:
- rtos_arduino/trunk/examples/PIXY_Zumo_Wifi
- Files:
-
- 1 edited
- 6 moved
Legend:
- Unmodified
- Added
- Removed
-
rtos_arduino/trunk/examples/PIXY_Zumo_Wifi/Makefile
r236 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 # … … 37 37 38 38 # 39 # R CAã®ãã£ã¬ã¯ããªã®å®ç¾©39 # R2CAã®ãã£ã¬ã¯ããªã®å®ç¾© 40 40 # 41 R CA_DIR = ../..41 R2CA_DIR = ../.. 42 42 43 43 # … … 56 56 # Zumo Library 57 57 # 58 APPL_DIR += $(R CA_DIR)/arduino_lib/libraries/ZumoShield58 APPL_DIR += $(R2CA_DIR)/arduino_lib/libraries/ZumoShield 59 59 APPL_CXXOBJS += Accelerometer.o L3G.o LSM303.o Pushbutton.o QTRSensors.o ZumoBuzzer.o ZumoMotors.o 60 60 APPL_CFG += ZumoShield.cfg … … 63 63 # Pixy Library 64 64 # 65 APPL_DIR += $(R CA_DIR)/arduino_lib/libraries/Pixy65 APPL_DIR += $(R2CA_DIR)/arduino_lib/libraries/Pixy 66 66 67 67 # 68 68 # Wifi Library 69 69 # 70 APPL_DIR += $(R CA_DIR)/arduino_lib/libraries/ESP8266_Arudino_AT/70 APPL_DIR += $(R2CA_DIR)/arduino_lib/libraries/ESP8266_Arudino_AT/ 71 71 APPL_CXXOBJS += ESP8266.o 72 72 73 include $(R CA_DIR)/lib/Makefile.rca73 include $(R2CA_DIR)/lib/Makefile.r2ca -
rtos_arduino/trunk/examples/PIXY_Zumo_Wifi/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/PIXY_Zumo_Wifi/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> … … 153 153 </PropertyGroup> 154 154 <ItemGroup> 155 <None Include="r ca_app.cfg">155 <None Include="r2ca_app.cfg"> 156 156 <SubType>compile</SubType> 157 157 </None> 158 <None Include="r ca_app.cpp">158 <None Include="r2ca_app.cpp"> 159 159 <SubType>compile</SubType> 160 160 </None> 161 161 </ItemGroup> 162 162 <ItemGroup> 163 <Compile Include="r ca_app.h">163 <Compile Include="r2ca_app.h"> 164 164 <SubType>compile</SubType> 165 165 </Compile> -
rtos_arduino/trunk/examples/PIXY_Zumo_Wifi/r2ca_app.cfg
r258 r260 6 6 * ãµã³ãã«ããã°ã©ã (1)ã®ã·ã¹ãã ã³ã³ãã£ã®ã¥ã¬ã¼ã·ã§ã³ãã¡ã¤ã« 7 7 */ 8 INCLUDE("r ca_lib.cfg");8 INCLUDE("r2ca_lib.cfg"); 9 9 INCLUDE("ZumoShield.cfg"); -
rtos_arduino/trunk/examples/PIXY_Zumo_Wifi/r2ca_app.cpp
r258 r260 1 #include "r ca.h"1 #include "r2ca.h" 2 2 #include "ESP8266.h" 3 3 … … 108 108 void FollowBlock(int trackedBlock); 109 109 int TrackBlock(int blockCount); 110 void task1_setup(); 110 111 111 112 //--------------------------------------- … … 121 122 122 123 button.waitForPress(); 123 buzzer.playStart(); 124 buzzer.playStart(); 125 126 task1_setup(); 124 127 } 125 128 … … 271 274 272 275 273 bool setup_done = false;274 275 276 void task1_setup() 276 277 { … … 350 351 351 352 Serial.print("setup end\r\n"); 352 353 setup_done = true;354 353 } 355 354 … … 361 360 uint8_t task1_mux_id = MUX_NULL; 362 361 363 void task1_loop()362 void loop1() 364 363 { 365 364 char buf[128]; -
rtos_arduino/trunk/examples/PIXY_Zumo_Wifi/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 R CA_NUM_TASK 14 #define R2CA_NUM_TASK 1 5 5 6 #define R CA_MAINTASK_LOOP_PRI 57 #define R CA_TASK1_LOOP_PRI 66 #define R2CA_MAINTASK_LOOP_PRI 5 7 #define R2CA_TASK1_LOOP_PRI 6 8 8 9 #endif /* _R CA_APP_H_ */9 #endif /* _R2CA_APP_H_ */
Note:
See TracChangeset
for help on using the changeset viewer.