Quellcode durchsuchen

8路板开关检测

liyi vor 1 Jahr
Ursprung
Commit
070542b69a

Datei-Diff unterdrückt, da er zu groß ist
+ 82 - 37
control/PDU-AC-New-6/Project/GD32KeilPrj.uvguix.Gowon


+ 1 - 5
control/PDU-AC-New-6/Project/GD32KeilPrj.uvoptx

@@ -117,10 +117,6 @@
         <pMon>Segger\JL2CM3.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGUARM</Key>
-        </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>DLGTARM</Key>
@@ -418,7 +414,7 @@
       <GroupNumber>3</GroupNumber>
       <FileNumber>13</FileNumber>
       <FileType>1</FileType>
-      <tvExp>0</tvExp>
+      <tvExp>1</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
       <PathWithFileName>..\App\Sn74lvc573\Sn74lvc573.c</PathWithFileName>

+ 3 - 0
control/PDU-AC/App/Main/Main.c

@@ -1441,6 +1441,9 @@ int main(void)
 #elif (ACSingPhHigCurr &&(ACSingPhHig_Control_type == ACSingPh_Sub_C))
 			sub_control();
 #endif
+#if ACSingPhSmaCurr
+			check_or_control_detection();
+#endif
 		
 		if(write_2_minute_flag == 1)
 		{

Datei-Diff unterdrückt, da er zu groß ist
+ 131 - 122
control/PDU-AC/Project/GD32KeilPrj.uvguix.Gowon


+ 1 - 1
control/PDU-AC/Project/GD32KeilPrj.uvprojx

@@ -49,7 +49,7 @@
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
           <OutputDirectory>.\Objects\</OutputDirectory>
-          <OutputName>jeff-40A-1通道-Sub-12-12</OutputName>
+          <OutputName>jeff-23A-8通道-12-16</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>1</CreateHexFile>