Skip to content

Commit

Permalink
大会前の政岡の家での調整
Browse files Browse the repository at this point in the history
  • Loading branch information
Taikono-Himazin committed Mar 20, 2017
1 parent 3fb14c2 commit 8a3d582
Show file tree
Hide file tree
Showing 31 changed files with 2,849 additions and 44 deletions.
2 changes: 1 addition & 1 deletion HMC5883L_calibrate/__vm/Compile.vmps.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion HMC5883L_calibrate/__vm/Configuration.Debug.vmps.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion HMC5883L_calibrate/__vm/Upload.vmps.xml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions MPU6050_calibration/__vm/Compile.vmps.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion MPU6050_calibration/__vm/Configuration.Debug.vmps.xml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions MPU6050_calibration/__vm/Upload.vmps.xml

Large diffs are not rendered by default.

14 changes: 13 additions & 1 deletion Revolution_Include Main.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26206.0
VisualStudioVersion = 15.0.26228.9
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A76DDDD5-2258-4608-8E23-C2AEEB51808C}"
ProjectSection(SolutionItems) = preProject
Expand Down Expand Up @@ -67,6 +67,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Revolution_include_Main_2.4
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Revolution_include_Main_2.4.1", "Revolution_include_Main_2.4.1\Revolution_include_Main_2.4.1.vcxproj", "{716E13D4-CC81-454F-B253-F1C85AAA1F02}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Revolution_include_Main_2.4.2", "Revolution_include_Main_2.4.2\Revolution_include_Main_2.4.2.vcxproj", "{68518E20-7D57-4F58-9A5D-ECF172A3E219}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Revolution_include_Main_2.4.3", "Revolution_include_Main_2.4.3\Revolution_include_Main_2.4.3.vcxproj", "{EC401D87-05BF-4148-A331-0506FFF65959}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86
Expand Down Expand Up @@ -189,6 +193,14 @@ Global
{716E13D4-CC81-454F-B253-F1C85AAA1F02}.Debug|x86.Build.0 = Debug|Win32
{716E13D4-CC81-454F-B253-F1C85AAA1F02}.Release|x86.ActiveCfg = Release|Win32
{716E13D4-CC81-454F-B253-F1C85AAA1F02}.Release|x86.Build.0 = Release|Win32
{68518E20-7D57-4F58-9A5D-ECF172A3E219}.Debug|x86.ActiveCfg = Debug|Win32
{68518E20-7D57-4F58-9A5D-ECF172A3E219}.Debug|x86.Build.0 = Debug|Win32
{68518E20-7D57-4F58-9A5D-ECF172A3E219}.Release|x86.ActiveCfg = Release|Win32
{68518E20-7D57-4F58-9A5D-ECF172A3E219}.Release|x86.Build.0 = Release|Win32
{EC401D87-05BF-4148-A331-0506FFF65959}.Debug|x86.ActiveCfg = Debug|Win32
{EC401D87-05BF-4148-A331-0506FFF65959}.Debug|x86.Build.0 = Debug|Win32
{EC401D87-05BF-4148-A331-0506FFF65959}.Release|x86.ActiveCfg = Release|Win32
{EC401D87-05BF-4148-A331-0506FFF65959}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
86 changes: 86 additions & 0 deletions Revolution_include_2.4.2/Revolution_include_2.4.2.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{C5F80730-F44F-4478-BDAE-6634EFC2CA88}</ProjectGuid>
<RootNamespace>Revolution_include_2_4_2</RootNamespace>
<ProjectName>Sketch</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset></PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset></PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />

<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
<IgnoreStandardIncludePath>true</IgnoreStandardIncludePath>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ProjectCapability Include="VisualMicro" />
</ItemGroup>
<PropertyGroup>
<DebuggerFlavor>VisualMicroDebugger</DebuggerFlavor>
</PropertyGroup>
<ItemGroup>
<None Include="Revolution_include_2_4_2.ino">
<FileType>CppCode</FileType>
</None>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
21 changes: 21 additions & 0 deletions Revolution_include_2.4.2/Revolution_include_2.4.2.vcxproj.filters
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="Revolution_include_2_4_2.ino" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ void setup() {
void loop() {
LINE_status = 0;
for (uint8_t i = 0; i < 8; i++) {
LINE[i] = mcp1Get(i);
LINE[i] = mcp1Get(i);
Serial.print(LINE[i]);
Serial.print(",");
}
Expand Down

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Revolution_include_LINE_2.2.0/__vm/Compile.vmps.xml

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Revolution_include_LINE_2.2.0/__vm/Upload.vmps.xml

Large diffs are not rendered by default.

28 changes: 2 additions & 26 deletions Revolution_include_Main_2.4.1/Revolution_include_Main_2.4.1.ino
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ void setup() {
uint16_t val = EEPROM.read(4) << 8 | EEPROM.read(5);
LINE_Set(val);
Servo_Start();
lcd_Start("2.4.1_Neo");//lcd初期化関数
lcd_Start("2.4.1_Neo Gyro");//lcd初期化関数

#if Gyro_Mode
Gryo_Start();
Expand Down Expand Up @@ -210,8 +210,8 @@ void moter(uint8_t Force, int16_t Degree,bool PID) { //一応解読したがい

HMC_Get();
Input = HMC_val;
#endif
myPID.Compute(); //pid計算
#endif
}

GyroGet();
Expand All @@ -220,30 +220,6 @@ void moter(uint8_t Force, int16_t Degree,bool PID) { //一応解読したがい
hosei = 0;
}

/*if (Gyro > 300) {
hosei = -200;
}
else if (Gyro > 260) {
hosei = -120;
}
else if (Gyro > 200) {
hosei = -60;
}
else if (Gyro > 190) {
hosei = -40;
}
else if (Gyro < 60) {
hosei = 200;
}
else if (Gyro < 100) {
hosei = 120;
}
else if (Gyro < 160) {
hosei = 60;
}
else if (Gyro < 170) {
hosei = 40;
}*/
m1 = m1 - hosei;//pidのデータをモーターに突っ込む
m2 = m2 - hosei;
m3 = m3 - hosei;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\..\Program Files (x86)\Arduino\libraries\Arduino-HMC5883L-master;$(ProjectDir)..\..\..\..\..\..\Program Files (x86)\Arduino\libraries\MPU6050;$(ProjectDir)..\..\..\..\..\..\Program Files (x86)\Arduino\libraries\I2Cdev;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\hardware\avr\1.6.17\libraries\Wire\src;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\hardware\avr\1.6.17\libraries\EEPROM\src;$(ProjectDir)..\..\..\..\..\..\Program Files (x86)\Arduino\libraries\Servo\src;$(ProjectDir)..\..\..\..\Documents\Arduino\libraries\Utility;$(ProjectDir)..\..\..\..\..\..\Program Files (x86)\Arduino\libraries\br3ttb-Arduino-PID-Library-fb095d8;$(ProjectDir)..\..\..\..\..\..\Program Files (x86)\Arduino\libraries\NewliquidCrystal;$(ProjectDir)..\..\..\..\..\..\Program Files (x86)\Arduino\libraries\NewliquidCrystal\utility;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\hardware\avr\1.6.17\libraries\Wire\src\utility;$(ProjectDir)..\..\..\..\..\..\Program Files (x86)\Arduino\libraries;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\hardware\avr\1.6.17\libraries;$(ProjectDir)..\..\..\..\Documents\Arduino\libraries;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\hardware\avr\1.6.17\cores\arduino;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\hardware\avr\1.6.17\variants\eightanaloginputs;$(ProjectDir)..\Revolution_include_Main_2.4.1;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\tools\avr-gcc\4.9.2-atmel3.5.3-arduino2\avr\include\;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\tools\avr-gcc\4.9.2-atmel3.5.3-arduino2\avr\include\avr\;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\tools\avr-gcc\4.9.2-atmel3.5.3-arduino2\lib\gcc\avr\4.8.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\..\Program Files (x86)\Arduino\libraries\Arduino-HMC5883L-master;$(ProjectDir)..\..\..\..\..\..\Program Files (x86)\Arduino\libraries\br3ttb-Arduino-PID-Library-fb095d8;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\hardware\avr\1.6.17\libraries\EEPROM\src;$(ProjectDir)..\..\..\..\..\..\Program Files (x86)\Arduino\libraries\MPU6050;$(ProjectDir)..\..\..\..\..\..\Program Files (x86)\Arduino\libraries\NewliquidCrystal;$(ProjectDir)..\..\..\..\..\..\Program Files (x86)\Arduino\libraries\NewliquidCrystal\utility;$(ProjectDir)..\..\..\..\..\..\Program Files (x86)\Arduino\libraries\Servo\src;$(ProjectDir)..\..\..\..\Documents\Arduino\libraries\Utility;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\hardware\avr\1.6.17\libraries\Wire\src;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\hardware\avr\1.6.17\libraries\Wire\src\utility;$(ProjectDir)..\..\..\..\..\..\Program Files (x86)\Arduino\libraries;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\hardware\avr\1.6.17\libraries;$(ProjectDir)..\..\..\..\Documents\Arduino\libraries;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\hardware\avr\1.6.17\cores\arduino;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\hardware\avr\1.6.17\variants\eightanaloginputs;$(ProjectDir)..\Revolution_include_Main_2.4.1;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\tools\avr-gcc\4.9.2-atmel3.5.3-arduino2\avr\include\;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\tools\avr-gcc\4.9.2-atmel3.5.3-arduino2\avr\include\avr\;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\tools\avr-gcc\4.9.2-atmel3.5.3-arduino2\lib\gcc\avr\4.8.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles>$(ProjectDir)__vm\.Revolution_include_Main_2.4.1.vsarduino.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
<PreprocessorDefinitions>__AVR_ATmega328p__;__AVR_ATmega328P__;F_CPU=16000000L;ARDUINO=10801;ARDUINO_AVR_NANO;ARDUINO_ARCH_AVR;__cplusplus=201103L;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="Revolution_include_Main_2.4.1.ino" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="__vm\.Revolution_include_Main_2.4.1.vsarduino.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="Revolution_include_Main_2.4.1.ino" />
</ItemGroup>
</Project>
Loading

0 comments on commit 8a3d582

Please sign in to comment.