fixed time(sec) in csv

ardiehl · Oct 23, 2023 · f0a32fc · f0a32fc
1 parent e185236
commit f0a32fc
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 40 deletions.
diff --git a/ebcc.lps b/ebcc.lps
@@ -20,8 +20,8 @@
         <ResourceBaseClass Value="Form"/>
         <IsVisibleTab Value="True"/>
         <EditorIndex Value="4"/>
-        <TopLine Value="308"/>
-        <CursorPos Y="323"/>
+        <TopLine Value="761"/>
+        <CursorPos X="44" Y="777"/>
         <ExtraEditorCount Value="1"/>
         <ExtraEditor1>
           <EditorIndex Value="-1"/>
@@ -34,10 +34,10 @@
           <Item0 X="19" Y="657"/>
           <Item1 Y="619" ID="9"/>
           <Item2 X="11" Y="675" ID="3"/>
-          <Item3 X="3" Y="2181" ID="4"/>
-          <Item4 X="7" Y="2151" ID="5"/>
+          <Item3 X="3" Y="2183" ID="4"/>
+          <Item4 X="7" Y="2153" ID="5"/>
           <Item5 X="3" Y="135" ID="2"/>
-          <Item6 Y="2186" ID="1"/>
+          <Item6 X="9" Y="772" ID="1"/>
         </Bookmarks>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -189,122 +189,121 @@
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="main.pas"/>
-        <Caret Line="134" Column="3" TopLine="113"/>
+        <Caret Line="702" Column="15" TopLine="676"/>
       </Position1>
       <Position2>
         <Filename Value="main.pas"/>
-        <Caret Line="1513" TopLine="1489"/>
       </Position2>
       <Position3>
         <Filename Value="main.pas"/>
-        <Caret Line="1514" TopLine="1489"/>
+        <Caret Line="170" Column="21" TopLine="144"/>
       </Position3>
       <Position4>
         <Filename Value="main.pas"/>
-        <Caret Line="1515" TopLine="1489"/>
+        <Caret Line="205" Column="30" TopLine="179"/>
       </Position4>
       <Position5>
         <Filename Value="main.pas"/>
-        <Caret Line="1524" TopLine="1508"/>
+        <Caret Line="269" Column="43" TopLine="244"/>
       </Position5>
       <Position6>
         <Filename Value="main.pas"/>
-        <Caret Line="1513" TopLine="1507"/>
+        <Caret Line="378" Column="26" TopLine="353"/>
       </Position6>
       <Position7>
         <Filename Value="main.pas"/>
-        <Caret Line="1514" TopLine="1507"/>
+        <Caret Line="379" Column="25" TopLine="354"/>
       </Position7>
       <Position8>
         <Filename Value="main.pas"/>
-        <Caret Line="1515" TopLine="1507"/>
+        <Caret Line="380" Column="25" TopLine="355"/>
       </Position8>
       <Position9>
         <Filename Value="main.pas"/>
-        <Caret Line="1524" TopLine="1507"/>
+        <Caret Line="421" Column="63" TopLine="397"/>
       </Position9>
       <Position10>
         <Filename Value="main.pas"/>
-        <Caret Line="1513" TopLine="1507"/>
+        <Caret Line="559" Column="38" TopLine="533"/>
       </Position10>
       <Position11>
         <Filename Value="main.pas"/>
-        <Caret Line="1514" TopLine="1507"/>
+        <Caret Line="561" Column="59" TopLine="535"/>
       </Position11>
       <Position12>
         <Filename Value="main.pas"/>
-        <Caret Line="1517" TopLine="1507"/>
+        <Caret Line="629" Column="15" TopLine="603"/>
       </Position12>
       <Position13>
         <Filename Value="main.pas"/>
-        <Caret Line="2809" TopLine="2783"/>
+        <Caret Line="698" Column="68" TopLine="672"/>
       </Position13>
       <Position14>
         <Filename Value="main.pas"/>
-        <Caret Line="2810" TopLine="2600"/>
+        <Caret Line="702" Column="15" TopLine="676"/>
       </Position14>
       <Position15>
         <Filename Value="main.pas"/>
-        <Caret Line="1515" Column="51" TopLine="1497"/>
+        <Caret Line="1848" Column="33" TopLine="1822"/>
       </Position15>
       <Position16>
         <Filename Value="main.pas"/>
-        <Caret Line="1517" Column="51" TopLine="1499"/>
+        <Caret Line="170" Column="21" TopLine="154"/>
       </Position16>
       <Position17>
         <Filename Value="main.pas"/>
-        <Caret Line="2190" Column="16" TopLine="2188"/>
+        <Caret Line="205" Column="30" TopLine="179"/>
       </Position17>
       <Position18>
         <Filename Value="main.pas"/>
-        <Caret Line="134" Column="19" TopLine="129"/>
+        <Caret Line="269" Column="43" TopLine="244"/>
       </Position18>
       <Position19>
         <Filename Value="main.pas"/>
-        <Caret Line="2190" Column="3" TopLine="2174"/>
+        <Caret Line="378" Column="26" TopLine="353"/>
       </Position19>
       <Position20>
         <Filename Value="main.pas"/>
+        <Caret Line="379" Column="25" TopLine="354"/>
       </Position20>
       <Position21>
         <Filename Value="main.pas"/>
-        <Caret Line="131" Column="23" TopLine="105"/>
+        <Caret Line="380" Column="25" TopLine="355"/>
       </Position21>
       <Position22>
         <Filename Value="main.pas"/>
-        <Caret Line="251" Column="13" TopLine="226"/>
+        <Caret Line="421" Column="63" TopLine="397"/>
       </Position22>
       <Position23>
         <Filename Value="main.pas"/>
-        <Caret Line="311" Column="27" TopLine="286"/>
+        <Caret Line="559" Column="38" TopLine="533"/>
       </Position23>
       <Position24>
         <Filename Value="main.pas"/>
-        <Caret Line="365" Column="75" TopLine="340"/>
+        <Caret Line="561" Column="59" TopLine="535"/>
       </Position24>
       <Position25>
         <Filename Value="main.pas"/>
-        <Caret Line="377" Column="16" TopLine="352"/>
+        <Caret Line="629" Column="15" TopLine="603"/>
       </Position25>
       <Position26>
         <Filename Value="main.pas"/>
-        <Caret Line="378" Column="16" TopLine="353"/>
+        <Caret Line="710" Column="68" TopLine="679"/>
       </Position26>
       <Position27>
         <Filename Value="main.pas"/>
-        <Caret Line="476" Column="15" TopLine="451"/>
       </Position27>
       <Position28>
         <Filename Value="main.pas"/>
-        <Caret Line="2183" Column="39" TopLine="2175"/>
+        <Caret Line="744" Column="80" TopLine="719"/>
       </Position28>
       <Position29>
         <Filename Value="main.pas"/>
-        <Caret Line="2182" Column="39" TopLine="2174"/>
+        <Caret Line="774" Column="40" TopLine="756"/>
       </Position29>
       <Position30>
         <Filename Value="main.pas"/>
-        <Caret Line="2187" TopLine="2174"/>
+        <Caret Line="717" TopLine="698"/>
       </Position30>
     </JumpHistory>
     <RunParams>

diff --git a/main.lfm b/main.lfm
@@ -76,11 +76,11 @@ object frmMain: TfrmMain
       Height = 382
       Top = 306
       Width = 290
-      ActivePage = tsDischarge
+      ActivePage = tsProgram
       Anchors = [akTop, akRight, akBottom]
       BorderSpacing.Right = 2
       Constraints.MaxWidth = 290
-      TabIndex = 1
+      TabIndex = 2
       TabOrder = 2
       OnChange = pcProgramChange
       object tsCharge: TTabSheet

diff --git a/main.pas b/main.pas
@@ -702,17 +702,18 @@ function TfrmMain.InterpretPackage(APacket: string; ANow: TDateTime) : boolean;
   T: TDateTime;
   chkIsValid : boolean;
   chk : char;
+  TSec : longint;
 begin
   result := false;
   if FSampleCounter > 0 then
   begin
     dT := MillisecondsBetween(ANow, FLastTime);
   end else
-  begin
     dT := 2000;
-  end;
 
   T := ANow - FStartTime;
+  TSec := SecondsBetween(ANow,FStartTime);
+  if (TSec < 0) then tSec := 0;
 
   chkIsValid := frmSettings.cgSettings.Checked[cIgnoreCRC];
   if not chkIsValid then
@@ -768,11 +769,12 @@ function TfrmMain.InterpretPackage(APacket: string; ANow: TDateTime) : boolean;
       SetLength(FData, Length(FData) + 1);
       with FData[Length(FData) - 1] do
       begin
-        vTime := DecodeTimer(Copy(APacket, 15, 2));
+        //vTime := DecodeTimer(Copy(APacket, 15, 2));
+
         vVoltage := FLastU;
         vCurrent := FLastI;
         if mm_AutoLog.Checked then
-          SaveCSVLine(FLogFile, vTime, FLastI, FLastU);
+          SaveCSVLine(FLogFile, TSec{vTime}, FLastI, FLastU);
       end;
       lsVoltage.AddXY(T, FLastU);
       lsInvisibleVoltage.AddXY(0, Round1V(FLastU));