Johannes Müller hace 3 años
padre
commit
534e782118

+ 6 - 0
AI-energy-meter-Project/AI-energy-meter-Project.info

@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<InfoFile xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <User>Jomueller</User>
+  <Computer>C2404</Computer>
+  <Time>2022-05-02T13:02:03.1125772Z</Time>
+</InfoFile>

BIN
AI-energy-meter-Project/AdditionalFiles/TCI/Siemens/S7-PCT/AutoCatalog.zip


+ 35 - 5
AI-energy-meter-Project/AdditionalFiles/TCI/Siemens/S7-PCT/OM/1052700-1396.pct

@@ -101,11 +101,41 @@ Die Anwendung prüft die Datei auf Bearbeitung und verwendet sich nicht mehr, we
           <Parameter Name="eventCodeText" Value="Keine Fehlfunktion" Type="String" />
           <Parameter Name="eventQualifier" Value="0" Type="Byte" />
           <Parameter Name="Identification" Value="11604e51-7156-474b-b292-9ee406d26de1" Type="String" />
-          <Parameter Name="M_ChannelParametersF3_2_V_ChannelParametersF3_1" Value="6" Type="Double" />
+          <Parameter Name="M_ChannelParametersF1_2_V_ChannelParametersF1_1" Value="10" Type="Double" />
+          <Parameter Name="M_ChannelParametersF10_2_V_ChannelParametersF10_1" Value="10" Type="Double" />
+          <Parameter Name="M_ChannelParametersF11_2_V_ChannelParametersF11_1" Value="10" Type="Double" />
+          <Parameter Name="M_ChannelParametersF12_2_V_ChannelParametersF12_1" Value="10" Type="Double" />
+          <Parameter Name="M_ChannelParametersF13_2_V_ChannelParametersF13_1" Value="10" Type="Double" />
+          <Parameter Name="M_ChannelParametersF14_2_V_ChannelParametersF14_1" Value="10" Type="Double" />
+          <Parameter Name="M_ChannelParametersF15_2_V_ChannelParametersF15_1" Value="10" Type="Double" />
+          <Parameter Name="M_ChannelParametersF16_2_V_ChannelParametersF16_1" Value="10" Type="Double" />
+          <Parameter Name="M_ChannelParametersF2_2_V_ChannelParametersF2_1" Value="10" Type="Double" />
+          <Parameter Name="M_ChannelParametersF3_2_V_ChannelParametersF3_1" Value="10" Type="Double" />
+          <Parameter Name="M_ChannelParametersF4_2_V_ChannelParametersF4_1" Value="10" Type="Double" />
+          <Parameter Name="M_ChannelParametersF5_2_V_ChannelParametersF5_1" Value="10" Type="Double" />
+          <Parameter Name="M_ChannelParametersF6_2_V_ChannelParametersF6_1" Value="10" Type="Double" />
+          <Parameter Name="M_ChannelParametersF7_2_V_ChannelParametersF7_1" Value="10" Type="Double" />
+          <Parameter Name="M_ChannelParametersF8_2_V_ChannelParametersF8_1" Value="10" Type="Double" />
+          <Parameter Name="M_ChannelParametersF9_2_V_ChannelParametersF9_1" Value="10" Type="Double" />
           <Parameter Name="Name" Value="DF2101" Type="String" />
           <Parameter Name="ret_CheckDeviceIdentification" Value="1" Type="Byte" />
           <Parameter Name="TabIndex" Value="1" Type="Int32" />
-          <Parameter Name="V_ChannelParametersF3_1" Value="6" Type="Byte" />
+          <Parameter Name="V_ChannelParametersF1_1" Value="10" Type="Byte" />
+          <Parameter Name="V_ChannelParametersF10_1" Value="10" Type="Byte" />
+          <Parameter Name="V_ChannelParametersF11_1" Value="10" Type="Byte" />
+          <Parameter Name="V_ChannelParametersF12_1" Value="10" Type="Byte" />
+          <Parameter Name="V_ChannelParametersF13_1" Value="10" Type="Byte" />
+          <Parameter Name="V_ChannelParametersF14_1" Value="10" Type="Byte" />
+          <Parameter Name="V_ChannelParametersF15_1" Value="10" Type="Byte" />
+          <Parameter Name="V_ChannelParametersF16_1" Value="10" Type="Byte" />
+          <Parameter Name="V_ChannelParametersF2_1" Value="10" Type="Byte" />
+          <Parameter Name="V_ChannelParametersF3_1" Value="10" Type="Byte" />
+          <Parameter Name="V_ChannelParametersF4_1" Value="10" Type="Byte" />
+          <Parameter Name="V_ChannelParametersF5_1" Value="10" Type="Byte" />
+          <Parameter Name="V_ChannelParametersF6_1" Value="10" Type="Byte" />
+          <Parameter Name="V_ChannelParametersF7_1" Value="10" Type="Byte" />
+          <Parameter Name="V_ChannelParametersF8_1" Value="10" Type="Byte" />
+          <Parameter Name="V_ChannelParametersF9_1" Value="10" Type="Byte" />
           <Parameter Name="V_DetailedDeviceStatusDisplay[0]" Value="Keine Fehlfunktion" Type="String" />
           <Parameter Name="V_DetailedDeviceStatusDisplay[1]" Value="Keine Fehlfunktion" Type="String" />
           <Parameter Name="V_DetailedDeviceStatusDisplay[10]" Value="Keine Fehlfunktion" Type="String" />
@@ -154,14 +184,14 @@ Die Anwendung prüft die Datei auf Bearbeitung und verwendet sich nicht mehr, we
           <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" />
         </Transforms>
         <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <DigestValue>0CrTeezMpbb3BZ6SFZExsQ1R8Rg=</DigestValue>
+        <DigestValue>TjBqRj4GlUtWxC6I31nC4wFFq7I=</DigestValue>
       </Reference>
     </SignedInfo>
-    <SignatureValue>ZNg35zhAOOOirHOulc/yc7HO2Im4ZIBVYZSlkafPNyqsMfzj0ANOhte5rI7FbxbCRgffFbcYq7qfWae2L/CiQNhnlyqFVz18+B5zGVQwxu+zxTNV5KcbYTQyMyYCZ5G9cOn1WPaV80+Zw6GvUii+hXk4HnCj/HvD91N2wUpmxnQ=</SignatureValue>
+    <SignatureValue>KGo/QP3qS0FwWQmKuhvoaC73kM14VSE3qD+cURiCA2LqGe3iV0qMbzmYiSwlG3pZb+HsbBQPlsPmmGzfQ3ckdNXo7XgU4Ipv2SvQ1SKnwfRgHgvYXU3KUfd37hTKkMbxQFHh6rJs3SFkyGIrvqB2CTif381OkOKEaf4iIIyJ66U=</SignatureValue>
     <KeyInfo>
       <KeyValue>
         <RSAKeyValue>
-          <Modulus>pwl3kovvSoa3A1OeaKMQYFvF2xvy7sDq3bTqS1QrR1M0No8zG5jaEmXn2Yao2s8BqFELtjKcZvVk2/xvg9qYUfxcyYIRWrUpHLCLSLDCIPDRN+uLPtJpS7h2eLGjcRCd8BxKdbz8hp4hmjnp+67xxTSbPOfWbkkxWMu/X5noU7k=</Modulus>
+          <Modulus>9ImgHDUxkVSV8jR1F59rxT4KaNCVw2IW8SfNBx6eNCCWM+E1y6Wzkt97yhroaHfC/C+HgJNyk3T/wMRshMZpz1wtWTMfZIWZQl7AmqRZQjNIcDvslp8NXaJPGFDHiO6+vO07IZTVVw5ikAyuJvpEzzPMwtxtTSiburR8JFQnvfk=</Modulus>
           <Exponent>AQAB</Exponent>
         </RSAKeyValue>
       </KeyValue>

BIN
AI-energy-meter-Project/IM/SearchIndex/segments.gen


BIN
AI-energy-meter-Project/IM/SearchIndex/segments_lc → AI-energy-meter-Project/IM/SearchIndex/segments_ld


+ 0 - 0
AI-energy-meter-Project/IM/SearchIndex/write.lock


BIN
AI-energy-meter-Project/System/~PEData.1


+ 2 - 2
box-pc/application/main.py

@@ -11,10 +11,10 @@ logging.basicConfig(level=logging.WARNING)
 logging.info("starting")
 
 sources = [
-  SiemensCPU("192.168.10.6"),
+  SiemensCPU("192.168.1.10"),
   SiemensServer(),
   #Balluff(),
-  AllenBradleyCPU("192.168.10.5"),
+  #AllenBradleyCPU("192.168.10.5"),
 ]
 
 sinks = [