[Perl] DAQ system for the FAPG.
Simplify redox/ORP naming to ORP.
Changed files
roles/daq-node/bin/fapg-daq-node
@@ -131,8 +131,7 @@
131
131
}
132
132
133
133
my $hostname = hostname();
134
Removed:
return $1 if $hostname =~ /(?:\A|-)(ph|do|ec)(?:-|\z)/;
135
Removed:
return 'redox' if $hostname =~ /(?:\A|-)(?:orp|redox)(?:-|\z)/;
134
Added:
return $1 if $hostname =~ /(?:\A|-)(ph|do|ec|orp)(?:-|\z)/;
136
135
137
136
return undef;
138
137
}
roles/daq-node/lib/perl5/FAPG/DAQ/EZO/USB.pm
@@ -198,7 +198,7 @@
198
198
( $p eq 'ph' ) ? 'ph'
199
199
: ( $p eq 'do' || $p eq 'dissolvedoxygen' ) ? 'do'
200
200
: ( $p eq 'ec' || $p eq 'conductivity' ) ? 'ec'
201
Removed:
: ( $p eq 'orp' || $p eq 'redox' ) ? 'redox'
201
Added:
: ( $p eq 'orp' ) ? 'orp'
202
202
: croak "unknown EZO probe type '$probe'";
203
203
}
204
204
@@ -208,7 +208,7 @@
208
208
209
209
return 'pH' if $p eq 'ph';
210
210
return 'mg/L' if $p eq 'do';
211
Removed:
return 'mV' if $p eq 'redox';
211
Added:
return 'mV' if $p eq 'orp';
212
212
return 'uS/cm' if $p eq 'ec';
213
213
214
214
croak "unknown normalized probe type '$p'";
roles/daq-node/t/01-ezo-usb.t
@@ -77,7 +77,7 @@
77
77
is $info->{probe}, 'ph';
78
78
is $info->{unit}, 'pH';
79
79
80
Removed:
is detect_probe_type( Local::FakeSerial->new('?I,ORP,2.13') ), 'redox';
80
Added:
is detect_probe_type( Local::FakeSerial->new('?I,ORP,2.13') ), 'orp';
81
81
};
82
82
83
83
subtest 'single-value reading' => sub {
@@ -102,12 +102,12 @@
102
102
subtest 'normalization and units' => sub {
103
103
is normalize_probe_type('pH'), 'ph';
104
104
is normalize_probe_type('Dissolved Oxygen'), 'do';
105
Removed:
is normalize_probe_type('ORP'), 'redox';
105
Added:
is normalize_probe_type('ORP'), 'orp';
106
106
is normalize_probe_type('EC'), 'ec';
107
107
108
Removed:
is unit_for_probe_type('ph'), 'pH';
109
Removed:
is unit_for_probe_type('redox'), 'mV';
110
Removed:
is unit_for_probe_type('ec'), 'uS/cm';
108
Added:
is unit_for_probe_type('ph'), 'pH';
109
Added:
is unit_for_probe_type('orp'), 'mV';
110
Added:
is unit_for_probe_type('ec'), 'uS/cm';
111
111
};
112
112
113
113
subtest 'USB device discovery prefers UART by-id devices' => sub {
roles/dashboard/lib/dashboard.pm
@@ -46,7 +46,7 @@
46
46
},
47
47
{
48
48
key => 'orp',
49
Removed:
label => 'Redox / ORP',
49
Added:
label => 'ORP',
50
50
unit => 'mV',
51
51
node => 'Pi Zero 04',
52
52
},
t/lib/FAPG/TestSupport.pm
@@ -40,7 +40,7 @@
40
40
hostname => 'fapg-daq-zero-orp-01',
41
41
user => 'pirou',
42
42
password => 'pipirou',
43
Removed:
probe => 'redox',
43
Added:
probe => 'orp',
44
44
unit => 'mV',
45
45
},
46
46
{
t/lib/FAPG/TestSupport.pm.example
@@ -40,7 +40,7 @@
40
40
hostname => 'fapg-daq-zero-orp-01',
41
41
user => 'pirou',
42
42
password => 'CHANGE_ME',
43
Removed:
probe => 'redox',
43
Added:
probe => 'orp',
44
44
unit => 'mV',
45
45
},
46
46
{