Compare commits
2 Commits
0.2.2
...
fix_counte
| Author | SHA1 | Date | |
|---|---|---|---|
| 5f86266fc0 | |||
| eefb8c2053 |
@@ -81,7 +81,7 @@ clearChannel{
|
|||||||
}
|
}
|
||||||
|
|
||||||
clearCounter4 {
|
clearCounter4 {
|
||||||
out "15";
|
out "CC 15";
|
||||||
in;
|
in;
|
||||||
@mismatch{in "%(\$1MsgTxt)s";}
|
@mismatch{in "%(\$1MsgTxt)s";}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ class DAQ:
|
|||||||
]
|
]
|
||||||
|
|
||||||
def clearCount(self, counter):
|
def clearCount(self, counter):
|
||||||
self.counts[counter-1] = 0
|
self.counts[counter] = 0
|
||||||
|
|
||||||
def clearCounts(self):
|
def clearCounts(self):
|
||||||
self.counts = [0] * self.total_channels
|
self.counts = [0] * self.total_channels
|
||||||
@@ -260,7 +260,11 @@ with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
|
|||||||
|
|
||||||
elif re.fullmatch(r'CC (\d+)', data):
|
elif re.fullmatch(r'CC (\d+)', data):
|
||||||
counter = int(re.fullmatch(r'CC (\d+)', data).group(1))
|
counter = int(re.fullmatch(r'CC (\d+)', data).group(1))
|
||||||
daq.clearCount(counter)
|
num_bits = daq.total_channels
|
||||||
|
bits = [(counter >> bit) & 1 for bit in range(num_bits - 1, -1, -1)]
|
||||||
|
for ch, bit in enumerate(bits):
|
||||||
|
if bit:
|
||||||
|
daq.clearCount(ch)
|
||||||
send('')
|
send('')
|
||||||
|
|
||||||
elif re.fullmatch(r'TP (\d+(\.\d+)?)', data):
|
elif re.fullmatch(r'TP (\d+(\.\d+)?)', data):
|
||||||
|
|||||||
Reference in New Issue
Block a user