alex/ase_perl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://mail.aseltd.eu:6922/volume1/git_repos/ase_perl

Browse Source
This commit is contained in:
battilo
2018-11-19 21:57:30 +01:00
parent 9587e037be c6d3ac2c26
commit bce54c0c1d
2 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
prova.pl

41
LoadCSVData.pl
View File

@@ -464,15 +464,50 @@ while ( my $line = <FILE> ) {
#print Dumper \@din;
}elsif ( $tooltype eq "LOC" ) {
if ( !defined $din[0] ) {
if ( !defined $din[0] or ($din[0] eq '0') ) {
print getTimeStamp("log"). " - pid $$ >> Din not defined.\n";
print getTimeStamp("log"). " - pid $$ >> Execution ended.\n";
exit;
}
my ( $Vbat, $Tmod, $Ain1, $Ain2, $Din1, $Din2 ) =
split( /;/, $NodeData );
$CSVData[0] = $Vbat . ";" . $Tmod;
$CSVData[1] = $Din1;
my $idx = 0;
my ($chDin1, $chDin2) = split("", $channels[0]);
$CSVData[$idx++] = $Vbat . ";" . $Tmod;
if ($din[0] eq '1') {
if ( ($chDin1 eq '1') and ($chDin2 eq '9') ) {
$CSVData[$idx++] = $Din1;
}elsif ( ($chDin1 eq '9') and ($chDin2 eq '1') ){
$CSVData[$idx++] = $Din2;
}elsif ( ($chDin1 eq '2') and ($chDin2 eq '9') ){
$CSVData[$idx++] = $Din1 . ";" . $Ain1;
}elsif ( ($chDin1 eq '9') and ($chDin2 eq '2') ){
$CSVData[$idx++] = $Din2 . ";" . $Ain2;
}
}elsif ($din[0] eq '2') {
if ( ($chDin1 eq '1') and ($chDin2 eq '1') ) {
$CSVData[$idx++] = $Din1;
$CSVData[$idx++] = $Din2;
}elsif ( ($chDin1 eq '2') and ($chDin2 eq '1') ){
$CSVData[$idx++] = $Din1 . ";" . $Ain1;
$CSVData[$idx++] = $Din2;
}elsif ( ($chDin1 eq '1') and ($chDin2 eq '2') ){
$CSVData[$idx++] = $Din1;
$CSVData[$idx++] = $Din1 . ";" . $Ain1;
}elsif ( ($chDin1 eq '2') and ($chDin2 eq '2') ){
$CSVData[$idx++] = $Din1 . ";" . $Ain1;
$CSVData[$idx++] = $Din2 . ";" . $Ain2;
}
}
# $CSVData[1] = $Din1;
}elsif ( $tooltype eq "GD" ) {
my ( $div, $Vbat, $Tmod ) =
split( /;/, $NodeData );