sample: E217系車両データを追加

.gitignore

@@ -45,4 +45,15 @@ obj
 /_SampleScenarios/AtsEx.Samples/Vehicles/Basic/Ats_*/AtsEXPlugins/*.xml
 /_SampleScenarios/AtsEx.Samples/Vehicles/Basic/Ats_*/AtsEXPlugins/Resources
 
+/_SampleScenarios/AtsEx.Samples/Vehicles/E217r/Ats/Samples/*/AtsEx/*.dll
+/_SampleScenarios/AtsEx.Samples/Vehicles/E217r/Ats/Samples/*/AtsEx/*.pdb
+/_SampleScenarios/AtsEx.Samples/Vehicles/E217r/Ats/Samples/*/AtsEx/*.dll.config
+/_SampleScenarios/AtsEx.Samples/Vehicles/E217r/Ats/Samples/*/AtsEx/*.xml
+!/_SampleScenarios/AtsEx.Samples/Vehicles/E217r/Ats/Samples/*/AtsEx/*.VehiclePluginUsing.xml
+!/_SampleScenarios/AtsEx.Samples/Vehicles/E217r/Ats/Samples/*/AtsEx/*.VehicleConfig.xml
+/_SampleScenarios/AtsEx.Samples/Vehicles/E217r/Ats/Samples/*/AtsEx/AtsEXPlugins/*.dll
+/_SampleScenarios/AtsEx.Samples/Vehicles/E217r/Ats/Samples/*/AtsEx/AtsEXPlugins/*.pdb
+/_SampleScenarios/AtsEx.Samples/Vehicles/E217r/Ats/Samples/*/AtsEx/AtsEXPlugins/*.dll.config
+/_SampleScenarios/AtsEx.Samples/Vehicles/E217r/Ats/Samples/*/AtsEx/AtsEXPlugins/*.xml
+
 /_SampleScenarios/Uchibo20

AtsEx.Caller/AtsEx.Caller.csproj

@@ -68,6 +68,9 @@ if exist "$(TargetDir)x64\$(TargetName).pdb" echo F | xcopy /y /i "$(TargetDir)x
 echo F | xcopy /y /i "$(TargetDir)x64\$(TargetName).dll" "$(SolutionDir)_SampleScenarios\AtsEx.Samples\Vehicles\Basic\Ats_CooperatingWithMapPlugin\$(TargetName).x64.dll"
 if exist "$(TargetDir)x64\$(TargetName).pdb" echo F | xcopy /y /i "$(TargetDir)x64\$(TargetName).pdb" "$(SolutionDir)_SampleScenarios\AtsEx.Samples\Vehicles\Basic\Ats_CooperatingWithMapPlugin\$(TargetName).x64.pdb"
 
+echo F | xcopy /y /i "$(TargetDir)x64\$(TargetName).dll" "$(SolutionDir)_SampleScenarios\AtsEx.Samples\Vehicles\E217r\Ats\Samples\ConductorPatchTest\AtsEx\$(TargetName).x64.dll"
+if exist "$(TargetDir)x64\$(TargetName).pdb" echo F | xcopy /y /i "$(TargetDir)x64\$(TargetName).pdb" "$(SolutionDir)_SampleScenarios\AtsEx.Samples\Vehicles\E217r\Ats\Samples\ConductorPatchTest\AtsEx\$(TargetName).x64.pdb"
+
 echo F | xcopy /y /i "$(TargetDir)x86\$(TargetName).dll" "$(SolutionDir)_SampleScenarios\AtsEx.Samples\Vehicles\Basic\Ats_Empty\$(TargetName).x86.dll"
 if exist "$(TargetDir)x86\$(TargetName).pdb" echo F | xcopy /y /i "$(TargetDir)x86\$(TargetName).pdb" "$(SolutionDir)_SampleScenarios\AtsEx.Samples\Vehicles\Basic\Ats_Empty\$(TargetName).x86.pdb"
 
@@ -78,7 +81,10 @@ echo F | xcopy /y /i "$(TargetDir)x86\$(TargetName).dll" "$(SolutionDir)_SampleS
 if exist "$(TargetDir)x86\$(TargetName).pdb" echo F | xcopy /y /i "$(TargetDir)x86\$(TargetName).pdb" "$(SolutionDir)_SampleScenarios\AtsEx.Samples\Vehicles\Basic\Ats_WithPanel\$(TargetName).x86.pdb"
 
 echo F | xcopy /y /i "$(TargetDir)x86\$(TargetName).dll" "$(SolutionDir)_SampleScenarios\AtsEx.Samples\Vehicles\Basic\Ats_CooperatingWithMapPlugin\$(TargetName).x86.dll"
-if exist "$(TargetDir)x86\$(TargetName).pdb" echo F | xcopy /y /i "$(TargetDir)x86\$(TargetName).pdb" "$(SolutionDir)_SampleScenarios\AtsEx.Samples\Vehicles\Basic\Ats_CooperatingWithMapPlugin\$(TargetName).x86.pdb"</PostBuildEvent>
+if exist "$(TargetDir)x86\$(TargetName).pdb" echo F | xcopy /y /i "$(TargetDir)x86\$(TargetName).pdb" "$(SolutionDir)_SampleScenarios\AtsEx.Samples\Vehicles\Basic\Ats_CooperatingWithMapPlugin\$(TargetName).x86.pdb"
+
+echo F | xcopy /y /i "$(TargetDir)x86\$(TargetName).dll" "$(SolutionDir)_SampleScenarios\AtsEx.Samples\Vehicles\E217r\Ats\Samples\ConductorPatchTest\AtsEx\$(TargetName).x86.dll"
+if exist "$(TargetDir)x86\$(TargetName).pdb" echo F | xcopy /y /i "$(TargetDir)x64\$(TargetName).pdb" "$(SolutionDir)_SampleScenarios\AtsEx.Samples\Vehicles\E217r\Ats\Samples\ConductorPatchTest\AtsEx\$(TargetName).x86.pdb"</PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
     <DllExportIdent>4A280499-AC2B-4B03-B316-BA94266E244D</DllExportIdent>

_SampleScenarios/AtsEx.Samples/Vehicles/E217r/Ats/IC/3793F.csv

@@ -0,0 +1,27 @@
+0,�؍X�É^�A��,,,,,,,,,,,,,,,,,
+1,11,B125�s�H,,,,,,,,,,,,,,,,
+2,�؍X�� �ʓd,121,,,,,,,,,,,,,,,,
+3,3793F,,,,,,,,,,,,,,,,,
+4,���ӎ���\n793F�����p,,,,,,,,,,,,,,,,,
+//,�J�n�w,�J�n�n�_,�I���n�_,���,,,,,,,,,,,,,,
+5,0,0.639,1.309,0,,,,,,,,,,,,,,
+5,2,1.633,2.033,0,,,,,,,,,,,,,,
+5,5,0.581,0.981,0,,,,,,,,,,,,,,
+5,8,2.885,3.285,0,,,,,,,,,,,,,,
+//,�^�]����,�w��,������,������,�Ԑ���,�i������,�i�o����,��ڃL��,�f,�w�ԃL��,����,��,�w,CH,�ŏ�����,�ō����x,�^�]����,�w�ԍ�
+7,150,��@�t,93630,93730,4,,/45,0.058,0,0.633,1,8,8,4,�O�[��,95,1,0
+7,,****,,,,,,1,1,0.989,1,8,8,,�O�[��,95,1,
+7,195,�{��t,4000,4045,,,,2.05,0,2.205,1,8,8,4,�O�[��,95,1,1
+7,210,�h�@��,94400,94600,5,,,0.094,0,3.438,1,8,8,4,���[��,110,1,2
+7,150,�l�@��,4930,5000,,,,3.532,0,2.132,1,8,8,4,���[��,110,1,3
+7,195,�����h,5230,5300,,,,5.664,0,3.773,1,8,8,4,���[��,110,1,4
+7,285,�܁@��,5615,5645,,,,9.437,0,4.764,1,8,8,4,���[��,110,1,5
+7,,****,,,,,,14.2,1,1.033,1,8,8,4,���[��,110,1,
+7,270,�o����,100130,100200,,,,15.233,0,5.299,1,8,8,4,���[��,110,1,6
+7,210,���@�Y,630,700,,,,20.532,0,4.038,1,8,8,4,���[��,110,1,7
+7,150,�����Y,1030,1100,,,,24.57,0,2.93,1,8,8,4,���[��,110,1,8
+7,240,�ށ@��,��,1300,,,,27.5,0,3.899,1,8,8,4,���[��,110,1,9
+7,280,�؍X��,101730,101830,6,,/35,31.399,0,6.107,1,8,8,4,���[��,110,1,10
+7,,****,,,,,,37.5,1,1.019,1,8,8,,���[��,110,1,
+7,0,�N�@��,102530,��,7,45,,38.519,0,0,1,8,8,4,���[��,110,1,11
+8,1,,,,,,,,,,,,,,,,,

_SampleScenarios/AtsEx.Samples/Vehicles/E217r/Ats/x64/ATS.ini

@@ -0,0 +1,8 @@
+[ATS-P]
+EnableATSP = 1
+
+[ATS-P]
+EnableATSSN = 1
+
+[ATC]
+EnableATC = 0

_SampleScenarios/AtsEx.Samples/Vehicles/E217r/Ats/x64/ConstSpd.ini

@@ -0,0 +1,13 @@
+[CSC]
+enableCSC = 1
+enableCSCSpd = 50
+disableCSCSpd = 48
+enableCSCNotch = 5
+
+[LCSC]
+enableLCSC = 0
+
+[HldB]
+enableHldB = 0
+enableHldBSpd = 55
+disableHldBSpd = 53

_SampleScenarios/AtsEx.Samples/Vehicles/E217r/Ats/x64/IC/3727F.csv

@@ -0,0 +1,34 @@
+0,�؍X�É^�A��,,,,,,,,,,,,,,,,
+
+1,11,B125�s�H,,,,,,,,,,,,,,,
+
+2,�؍X�� �ʓd,121,,,,,,,,,,,,,,,
+
+3,3727F,,,,,,,,,,,,,,,,
+
+4,���ӎ���\n793F�����p,,,,,,,,,,,,,,,,
+
+//,�J�n�w,	�J�n�n�_,	�I���n�_,	���,,,,,,,,,,,,,
+5, 0,		0.639,		1.309,		0,,,,,,,,,,,,,
+5, 2,		1.633,		2.033,		0,,,,,,,,,,,,,
+5, 5,		0.581,		0.981,		0,,,,,,,,,,,,,
+5, 8,		2.885,		3.285,		0,,,,,,,,,,,,,
+
+//,�^�]����,	�w��,	������,	������,	�Ԑ���,	�i������, �i�o����,	��ڃL��, �f,	�w�ԃL��, ����,	��,	�w,	CH,	�ŏ�����,	�ō����x,	�^�]����,	�w�ԍ�	
+7,	150,	��@�t,	 93630,	 93730,	   4,	  ,		45,	 0.058,	  0,	0.633,	  1,	8,	8,	4,	�O�[��,		95,		1,		 0,
+7,	   ,	  ****,	      ,	      ,	    ,	  ,		  ,	 1,	  1,	1.05,	  1,	8,	8,	 ,	�O�[��,		95,		1,		 1,
+7,	195,	�{��t,	  4000,	  4045,	�O��,	  ,		  ,	 2.05,	  0,	2.214,	  1,	8,	8,	4,	�O�[��,		95,		1,		 1,
+7,	210,	�h�@��,	 94400,	 94600,	    ,	  ,		  ,	 0.094,	  0,	3.438,	  1,	8,	8,	4,	���[��,		110,		1,		 2,
+7,	150,	�l�@��,	  4930,	  5000,	    ,	  ,		  ,	 3.532,	  0,	2.132,	  1,	8,	8,	4,	���[��,		110,		1,		 3,
+7,	195,	�����h,	  5230,	  5300,     ,	  ,		  ,	 5.664,	  0,	3.773,	  1,	8,	8,	4,	���[��,		110,		1,		 4,
+7,	285,	�܁@��,	  5615,	  5645,     ,	  ,		  ,	 9.437,	  0,	4.764,	  1,	8,	8,	4,	���[��,		110,		1,		 5,
+7,	   ,	****,	      ,	      ,     ,	  ,		  ,	14.2,	  1,	1.033,	  1,	8,	8,	4,	���[��,		110,		1,		 6,
+7,	270,	�o����,	100130,	100200,     ,	  ,		  ,	15.233,	  0,	5.299,	  1,	8,	8,	4,	���[��,		110,		1,		 6,
+7,	210,	���@�Y,	   630,    700,     ,	  ,		  ,	20.532,	  0,	4.038,	  1,	8,	8,	4,	���[��,		110,		1,		 7,
+7,	150,	�����Y,	  1030,   1100,     ,	  ,		  ,	24.57,	  0,	2.93,	  1,	8,	8,	4,	���[��,		110,		1,		 8,
+7,	240,	�ށ@��,	    ��,	  1300,     ,	  ,		  ,	27.5,	  0,	3.899,	  1,	8,	8,	4,	���[��,		110,		1,		 9,
+7,	280,	�؍X��,	101730, 101830,	 ��1,	  ,		35,	31.399,	  0,	6.107,	  1,	8,	8,	4,	���[��,		110,		1,		10,
+7,	   ,	  ****,	      ,	      ,     ,	  ,		  ,	37.5,	  1,	1.019,	  1,	8,	8,	 ,	���[��,		110,		1,		11,
+7,	  0,	�N�@��,	102530,	    ��,	��{,	45,		  ,	38.519,	  0,	0,	  1,	8,	8,	4,	���[��,		110,		1,		12, 
+
+8,	  1,

_SampleScenarios/AtsEx.Samples/Vehicles/E217r/Ats/x64/IC/3727F_MON.txt

@@ -0,0 +1,16 @@
+BveTs Map 2.02:utf-8
+0;
+	Beacon.put(1000,0,379304);
+	Beacon.put(1001,0,0);//��t
+
+1970;
+	Beacon.put(1001,0,1);//�{��t
+
+4150;
+	Beacon.put(1001,0,2);//�h��
+
+7590;
+	Beacon.put(1001,0,3);//�l��
+
+9730;
+	Beacon.put(1001,0,3);//�����h

_SampleScenarios/AtsEx.Samples/Vehicles/E217r/Ats/x64/TIMS_ICCard.ini

@@ -0,0 +1,2 @@
+[ICCard]
+0 = ..\IC

_SampleScenarios/AtsEx.Samples/Vehicles/E217r/Ats/x64/TIMS_Spec.ini

@@ -0,0 +1,2 @@
+[Disp]
+useLegacyDisp = 1

_SampleScenarios/AtsEx.Samples/Vehicles/E217r/Ats/x64/detailmodules.txt

@@ -0,0 +1,5 @@
+EB.dll
+E217_ATC_ATS.dll
+TIMS_MON_Disp.dll
+DoorInterlock.dll
+ConstSpdCtrl.dll

_SampleScenarios/AtsEx.Samples/Vehicles/E217r/Ats/x86/ATS.ini

@@ -0,0 +1,8 @@
+[ATS-P]
+EnableATSP = 1
+
+[ATS-P]
+EnableATSSN = 1
+
+[ATC]
+EnableATC = 0

_SampleScenarios/AtsEx.Samples/Vehicles/E217r/Ats/x86/ConstSpd.ini

@@ -0,0 +1,13 @@
+[CSC]
+enableCSC = 1
+enableCSCSpd = 50
+disableCSCSpd = 48
+enableCSCNotch = 5
+
+[LCSC]
+enableLCSC = 0
+
+[HldB]
+enableHldB = 0
+enableHldBSpd = 55
+disableHldBSpd = 53

_SampleScenarios/AtsEx.Samples/Vehicles/E217r/Ats/x86/IC/3727F.csv

@@ -0,0 +1,27 @@
+0,�؍X�É^�A��,,,,,,,,,,,,,,,,
+1,11,B125�s�H,,,,,,,,,,,,,,,
+2,�؍X�� �ʓd,121,,,,,,,,,,,,,,,
+3,3727F,,,,,,,,,,,,,,,,
+4,���ӎ���\n793F�����p,,,,,,,,,,,,,,,,
+//,�J�n�w,�J�n�n�_,�I���n�_,���,,,,,,,,,,,,,
+5,0,0.639,1.309,0,,,,,,,,,,,,,
+5,2,1.633,2.033,0,,,,,,,,,,,,,
+5,5,0.581,0.981,0,,,,,,,,,,,,,
+5,8,2.885,3.285,0,,,,,,,,,,,,,
+//,�^�]����,�w��,������,������,�Ԑ���,�i������,�i�o����,��ڃL��,�f,�w�ԃL��,����,��,�w,CH,�ŏ�����,�ō����x,
+7,150,��@�t,93630,93730,4,,45,0.058,0,0.633,1,8,8,4,�O�[��,95,1
+7,,****,,,,,,1,1,1.05,1,8,8,,�O�[��,95,1
+7,195,�{��t,4000,4045,�O��,,,2.05,0,2.214,1,8,8,4,�O�[��,95,1
+7,210,�h�@��,94400,94600,,,,0.094,0,3.438,1,8,8,4,���[��,110,1
+7,150,�l�@��,4930,5000,,,,3.532,0,2.132,1,8,8,4,���[��,110,1
+7,195,�����h,5230,5300,,,,5.664,0,3.773,1,8,8,4,���[��,110,1
+7,285,�܁@��,5615,5645,,,,9.437,0,4.764,1,8,8,4,���[��,110,1
+7,,****,,,,,,14.2,1,1.033,1,8,8,4,���[��,110,1
+7,270,�o����,100130,100200,,,,15.233,0,5.299,1,8,8,4,���[��,110,1
+7,210,���@�Y,630,700,,,,20.532,0,4.038,1,8,8,4,���[��,110,1
+7,150,�����Y,1030,1100,,,,24.57,0,2.93,1,8,8,4,���[��,110,1
+7,240,�ށ@��,��,1300,,,,27.5,0,3.899,1,8,8,4,���[��,110,1
+7,280,�؍X��,101730,101830,��1,,35,31.399,0,6.107,1,8,8,4,���[��,110,1
+7,,****,,,,,,37.5,1,1.019,1,8,8,,���[��,110,1
+7,0,�N�@��,102530,��,��{,45,,38.519,0,0,1,8,8,4,���[��,110,1
+8,1,,,,,,,,,,,,,,,,

_SampleScenarios/AtsEx.Samples/Vehicles/E217r/Ats/x86/TIMS_ICCard.ini

@@ -0,0 +1,2 @@
+[ICCard]
+0 = ..\IC

_SampleScenarios/AtsEx.Samples/Vehicles/E217r/Ats/x86/TIMS_Spec.ini

@@ -0,0 +1,2 @@
+[Disp]
+useLegacyDisp = 1

_SampleScenarios/AtsEx.Samples/Vehicles/E217r/Ats/x86/detailmodules.txt

@@ -0,0 +1,5 @@
+EB.dll
+E217_ATC_ATS.dll
+TIMS_MON_Disp.dll
+DoorInterlock.dll
+ConstSpdCtrl.dll

_SampleScenarios/AtsEx.Samples/Vehicles/E217r/Notch/B-Prmtr.csv

@@ -0,0 +1,14 @@
+BveTs Vehicle Performance Table 1.00,
+#,#VALUE!
+BreakerDelay_On,0
+BreakerDelay_Off,0
+CurrentReducingTime,0
+JerkRegulation_Up,46
+JerkRegulation_Down,68
+RequiredNotch_Up,2
+RequiredNotch_Down,0
+Stepdelay_Up,0
+Stepdelay_Down,0
+CurrentLimitingValue_Empty,0
+CurrentLimitingValue_Full,0
+ResetTime,2

_SampleScenarios/AtsEx.Samples/Vehicles/E217r/Notch/B-c.csv

@@ -0,0 +1,153 @@
+BveTs Vehicle Performance Table 1.00,
+#,C-Empty
+0,1.00
+1,23.00
+2,46.00
+3,69.00
+4,92.00
+5,92.00
+6,92.00
+7,92.00
+8,92.00
+9,92.00
+10,92.00
+11,92.00
+12,92.00
+13,92.00
+14,92.00
+15,92.00
+16,92.00
+17,92.00
+18,92.00
+19,92.00
+20,92.00
+21,92.00
+22,92.00
+23,92.00
+24,92.00
+25,92.00
+26,92.00
+27,92.00
+28,92.00
+29,92.00
+30,92.00
+31,92.00
+32,92.00
+33,92.00
+34,92.00
+35,92.00
+36,92.00
+37,92.00
+38,92.00
+39,92.00
+40,92.00
+41,92.00
+42,92.00
+43,92.00
+44,92.00
+45,92.00
+46,92.00
+47,92.00
+48,92.00
+49,92.00
+50,92.00
+51,92.00
+52,92.00
+53,92.00
+54,92.00
+55,92.00
+56,92.46
+57,92.93
+58,93.43
+59,93.95
+60,94.48
+61,95.03
+62,95.60
+63,96.19
+64,96.79
+65,97.40
+66,98.03
+67,98.66
+68,99.32
+69,99.98
+70,100.65
+71,101.00
+72,99.60
+73,98.23
+74,96.90
+75,95.61
+76,94.35
+77,93.13
+78,91.93
+79,90.77
+80,89.64
+81,88.53
+82,87.45
+83,86.40
+84,85.37
+85,84.36
+86,83.38
+87,82.42
+88,81.49
+89,80.57
+90,79.68
+91,78.80
+92,77.94
+93,77.11
+94,76.29
+95,75.48
+96,74.70
+97,73.93
+98,73.17
+99,72.43
+100,71.71
+101,71.00
+102,70.30
+103,69.62
+104,68.95
+105,68.29
+106,67.65
+107,67.02
+108,66.40
+109,65.79
+110,65.19
+111,64.60
+112,64.03
+113,63.46
+114,62.90
+115,62.36
+116,61.82
+117,61.29
+118,60.77
+119,60.26
+120,59.76
+121,59.26
+122,58.78
+123,58.30
+124,57.83
+125,57.37
+126,56.91
+127,56.46
+128,56.02
+129,55.59
+130,55.16
+131,54.74
+132,54.33
+133,53.92
+134,53.51
+135,53.12
+136,52.73
+137,52.34
+138,51.96
+139,51.59
+140,51.22
+141,50.86
+142,50.50
+143,50.15
+144,49.80
+145,49.45
+146,49.12
+147,48.78
+148,48.45
+149,48.13
+150,47.81