stimulus and actuators for all 4 channels

2023-05-16 14:09:00 -07:00 · 2023-05-16 14:09:00 -07:00 · ea68a5b0a0
parent 956af7c771
commit ea68a5b0a0
6 changed files with 108 additions and 14 deletions
--- a/pt2001/project/rusefi/Actuator/inj2.xml
+++ b/pt2001/project/rusefi/Actuator/inj2.xml
@ -0,0 +1,23 @@
+<Actuator name="Inj2" type="BoostParallelSolenoid2">
+  <Resistance>1000</Resistance>
+  <Inductance>500</Inductance>
+  <RSense>10</RSense>
+  <CurrentFeedback>CurFbk1</CurrentFeedback>
+  <FeedBackSource>Form</FeedBackSource>
+  <OutputUsed number="3">
+    <Output>Hs1Command</Output>
+    <Output>Ls2Command</Output>
+    <Output>Hs2Command</Output>
+  </OutputUsed>
+  <VoltageLoad>
+    <Voltage>-66</Voltage>
+    <Voltage>-1</Voltage>
+    <Voltage>-1</Voltage>
+    <Voltage>65</Voltage>
+    <Voltage>-1</Voltage>
+    <Voltage>-1</Voltage>
+    <Voltage>13</Voltage>
+    <Voltage>65</Voltage>
+  </VoltageLoad>
+  <BoostFeedback>None</BoostFeedback>
+</Actuator>
--- a/pt2001/project/rusefi/Actuator/inj4.xml
+++ b/pt2001/project/rusefi/Actuator/inj4.xml
@ -0,0 +1,23 @@
+<Actuator name="Inj4" type="BoostParallelSolenoid2">
+  <Resistance>1000</Resistance>
+  <Inductance>500</Inductance>
+  <RSense>10</RSense>
+  <CurrentFeedback>CurFbk2</CurrentFeedback>
+  <FeedBackSource>Form</FeedBackSource>
+  <OutputUsed number="3">
+    <Output>Hs3Command</Output>
+    <Output>Ls4Command</Output>
+    <Output>Hs4Command</Output>
+  </OutputUsed>
+  <VoltageLoad>
+    <Voltage>-66</Voltage>
+    <Voltage>-1</Voltage>
+    <Voltage>-1</Voltage>
+    <Voltage>65</Voltage>
+    <Voltage>-1</Voltage>
+    <Voltage>-1</Voltage>
+    <Voltage>13</Voltage>
+    <Voltage>65</Voltage>
+  </VoltageLoad>
+  <BoostFeedback>None</BoostFeedback>
+</Actuator>
--- a/pt2001/project/rusefi/Feedbacks/dcdc_voltage.xml
+++ b/pt2001/project/rusefi/Feedbacks/dcdc_voltage.xml
@ -88,7 +88,7 @@
    <Input>FeedbackHs3Vsrc</Input>
    <Output>Hs3Command</Output>
    <SourceShared level="True">Hs4Command</SourceShared>
-    <ActuatorNumber>-1</ActuatorNumber>
+    <ActuatorNumber>-2</ActuatorNumber>
    <Current>0</Current>
    <AboveHigh>
      <Value>True</Value>
@ -124,7 +124,7 @@
    <Input>FeedbackHs4Vsrc</Input>
    <Output>Hs4Command</Output>
    <SourceShared level="False">Hs3Command</SourceShared>
-    <ActuatorNumber>-1</ActuatorNumber>
+    <ActuatorNumber>-2</ActuatorNumber>
    <Current>0</Current>
    <AboveHigh>
      <Value>True</Value>
@ -155,6 +155,18 @@
      <Delay>500 ns</Delay>
    </AboveLow>
  </Transition>
+  <Transition threshold="False" type="1">
+    <Input>FeedbackLs2Vds</Input>
+    <Output>Ls2Command</Output>
+    <AboveHigh>
+      <Value>False</Value>
+      <Delay>500 ns</Delay>
+    </AboveHigh>
+    <AboveLow>
+      <Value>True</Value>
+      <Delay>500 ns</Delay>
+    </AboveLow>
+  </Transition>
  <Transition threshold="False" type="1">
    <Input>FeedbackLs3Vds</Input>
    <Output>Ls3Command</Output>
@ -167,6 +179,18 @@
      <Delay>500 ns</Delay>
    </AboveLow>
  </Transition>
+  <Transition threshold="False" type="1">
+    <Input>FeedbackLs4Vds</Input>
+    <Output>Ls4Command</Output>
+    <AboveHigh>
+      <Value>False</Value>
+      <Delay>500 ns</Delay>
+    </AboveHigh>
+    <AboveLow>
+      <Value>True</Value>
+      <Delay>500 ns</Delay>
+    </AboveLow>
+  </Transition>
  <Transition threshold="False" type="2">
    <Input>FeedbackHs2VdsVbat</Input>
    <Output>Hs2Command</Output>
--- a/pt2001/project/rusefi/Logic_Wave/wave_list.do
+++ b/pt2001/project/rusefi/Logic_Wave/wave_list.do
@ -71,6 +71,15 @@
    <Direction>Output</Direction>
    <Radix>Decimal</Radix>
  </Wave>
+  <Wave>
+    <Name>CurrentFeedback1</Name>
+    <Path>
+      <PathElement>PT2001</PathElement>
+    </Path>
+    <Ordinal>0</Ordinal>
+    <Direction>Internal</Direction>
+    <Radix>Decimal</Radix>
+  </Wave>
  <Wave>
    <Name>Cnt1</Name>
    <Path>
@ -299,6 +308,15 @@
    <Direction>Output</Direction>
    <Radix>Decimal</Radix>
  </Wave>
+  <Wave>
+    <Name>CurrentFeedback2</Name>
+    <Path>
+      <PathElement>PT2001</PathElement>
+    </Path>
+    <Ordinal>1</Ordinal>
+    <Direction>Internal</Direction>
+    <Radix>Decimal</Radix>
+  </Wave>
  <Wave>
    <Name>Oaout2FlagOut</Name>
    <Path>
--- a/pt2001/project/rusefi/Stimulus/stim.xml
+++ b/pt2001/project/rusefi/Stimulus/stim.xml
@ -3,4 +3,8 @@
  <Stimulus target="Start1" time="3 ms" period="" value="low" />
  <Stimulus target="Start3" time="5 ms" period="" value="high" />
  <Stimulus target="Start3" time="7 ms" period="" value="low" />
+  <Stimulus target="Start4" time="11 ms" period="" value="high" />
+  <Stimulus target="Start4" time="13 ms" period="" value="low" />
+  <Stimulus target="Start2" time="15 ms" period="" value="high" />
+  <Stimulus target="Start2" time="17 ms" period="" value="low" />
 </Stimuli>
--- a/pt2001/project/rusefi/project.xml
+++ b/pt2001/project/rusefi/project.xml
@ -13,8 +13,8 @@
    <RegisterFile areaName="Channel 2 Configuration Registers (C2PR)">Registers\ch2_config_reg.hex</RegisterFile>
    <RegisterFile areaName="Diagnosis Configuration Registers (DCR)">Registers\diag_config_reg.hex</RegisterFile>
    <RegisterFile areaName="Crossbar Configuration Registers (XCR)">Registers\io_config_reg.hex</RegisterFile>
-    <MicroCodeFile channel="1" type="source" date="133287424524592163">MicrocodeCh1\ch1.psc</MicroCodeFile>
-    <MicroCodeFile channel="2" type="source" date="133287424535586377">MicrocodeCh2\ch2.psc</MicroCodeFile>
+    <MicroCodeFile channel="1" type="source" date="133287442290484143">MicrocodeCh1\ch1.psc</MicroCodeFile>
+    <MicroCodeFile channel="2" type="source" date="133287442303036622">MicrocodeCh2\ch2.psc</MicroCodeFile>
    <MicroCodeFile channel="1" type="binary" date="133287424468344753">bin\ch1.bin</MicroCodeFile>
    <MicroCodeFile channel="2" type="binary" date="133028335144648651">bin\ch2.bin</MicroCodeFile>
    <MicroCodeFile channel="1" type="hex" date="133287424469330378">bin\ch1.hex</MicroCodeFile>
@ -23,9 +23,11 @@
    <DPramFile channel="2">Registers\dram2.hex</DPramFile>
    <LabelFile>labels.xml</LabelFile>
    <ActuatorFile>Actuator\inj1.xml</ActuatorFile>
+    <ActuatorFile>Actuator\inj2.xml</ActuatorFile>
+    <ActuatorFile>Actuator\inj3.xml</ActuatorFile>
+    <ActuatorFile>Actuator\inj4.xml</ActuatorFile>
    <ActuatorFile>Actuator\dcdc_current.xml</ActuatorFile>
    <ActuatorFile>Actuator\dcdc_voltage.xml</ActuatorFile>
-    <ActuatorFile>Actuator\inj3.xml</ActuatorFile>
    <VoltageFile>Feedbacks\dcdc_voltage.xml</VoltageFile>
    <StimulusFile>Stimulus\stim.xml</StimulusFile>
    <WaveFile>Logic_Wave\wave_list.do</WaveFile>
@ -35,9 +37,9 @@
    <Clock>1 MHz</Clock>
  </General>
  <Windows>
-    <Structure x="2632" y="930" xSize="392" ySize="482" state="Normal" visible="True" />
-    <Signals x="670" y="433" xSize="250" ySize="1083" state="Normal" visible="True" />
-    <Micro x="9" y="3" xSize="1971" ySize="715" state="Normal" visible="True">
+    <Structure x="2516" y="1041" xSize="392" ySize="482" state="Normal" visible="True" />
+    <Signals x="715" y="467" xSize="250" ySize="1083" state="Normal" visible="True" />
+    <Micro x="12" y="12" xSize="1971" ySize="715" state="Normal" visible="True">
      <Hex8ForLine>True</Hex8ForLine>
      <SeparateCompiledFolder>True</SeparateCompiledFolder>
      <DPram channel="1" addressFormat="Hex">
@ -362,11 +364,11 @@
        <Reg>Hex</Reg>
      </RegisterArea>
    </Micro>
-    <Log x="78" y="78" xSize="931" ySize="663" state="Normal" visible="True" />
-    <Wave x="964" y="9" xSize="1567" ySize="879" state="Normal" visible="True" />
-    <Current x="1030" y="973" xSize="1436" ySize="464" state="Normal" visible="True" />
-    <Stimulus x="519" y="1170" xSize="540" ySize="368" state="Normal" visible="False" />
-    <Voltage x="0" y="0" xSize="580" ySize="357" state="Normal" visible="False" />
-    <Actuator x="29" y="747" xSize="601" ySize="444" state="Normal" visible="True" />
+    <Log x="208" y="208" xSize="931" ySize="663" state="Normal" visible="True" />
+    <Wave x="1458" y="57" xSize="1567" ySize="1095" state="Normal" visible="True" />
+    <Current x="1034" y="1056" xSize="1436" ySize="464" state="Normal" visible="True" />
+    <Stimulus x="80" y="1202" xSize="540" ySize="368" state="Normal" visible="False" />
+    <Voltage x="684" y="1109" xSize="580" ySize="357" state="Normal" visible="False" />
+    <Actuator x="48" y="778" xSize="601" ySize="444" state="Normal" visible="True" />
  </Windows>
 </Project>