Skip to content

Special Function Return data instead of string #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tmacinc wants to merge 2 commits into
base: master
Choose a base branch
from
+21 −21
Open

Special Function Return data instead of string #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38c3cbe
Update diol.py
tmacinc Dec 21, 2020
837a3d2
Update diol.py
tmacinc Dec 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions maq20/modules/diol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,17 +159,17 @@ def read_special_function_1_pulse_frequency_counter(self, timer):
response = self.read_registers({0: 1100, 1: 1200}[timer], 13)
pulse_count = utils.int16_to_int32(response[4:6])
frequency = utils.int16_to_int32(response[6:8])
return "Function : 1 = Pulse/Frequency Counter\n" \
"Arm/Disarm : {0[1]}\n" \
"Function Status : {0[2]}\n" \
"Alarm Status : {0[3]}\n" \
"Pulse Count : {1}\n" \
"Frequency : {2}\n" \
"RPM : {0[8]}\n" \
"Pulses Per Revolution : {0[9]}\n" \
"Internal Trigger : {0[10]}\n" \
"External Enable : {0[11]}\n" \
"External Enable Status: {0[12]}\n".format(response, pulse_count, frequency)
return {"Function": "1 = Pulse/Frequency Counter".format(response, pulse_count, frequency),
"Arm/Disarm": "{0[1]}".format(response, pulse_count, frequency),
"Function Status": "{0[2]}".format(response, pulse_count, frequency),
"Alarm_Status": "{0[3]}".format(response, pulse_count, frequency),
"Pulse_Count": "{1}".format(response, pulse_count, frequency),
"Frequency": "{2}".format(response, pulse_count, frequency),
"RPM": "{0[8]}".format(response, pulse_count, frequency),
"Pulses Per Revolution": "{0[9]}".format(response, pulse_count, frequency),
"Internal Trigger": "{0[10]}".format(response, pulse_count, frequency),
"External Enable": "{0[11]}".format(response, pulse_count, frequency),
"External Enable Status": "{0[12]}".format(response, pulse_count, frequency)}

def write_special_function_2_pulse_frequency_counter_with_debounce(self,
timer,
Expand Down Expand Up @@ -236,16 +236,16 @@ def read_special_function_2_pulse_frequency_counter_with_debounce(self, timer):
response = self.read_registers({0: 1100, 1: 1200}[timer], 12)
pulse_count = utils.int16_to_int32(response[4:6])
frequency = utils.int16_to_int32(response[6:8])
return "Function : 2 = Pulse/Frequency Counter w/ Debounce\n" \
"Arm/Disarm : {0[1]}\n" \
"Function Status : {0[2]}\n" \
"Alarm Status : {0[3]}\n" \
"Pulse Count : {1}\n" \
"Frequency : {2}\n" \
"Internal Trigger : {0[8]}\n" \
"Debounce Output Enable: {0[9]}\n" \
"Low Time (x 100us) : {0[10]}\n" \
"High Time (x 100us) : {0[11]}\n".format(response, pulse_count, frequency)
return {"Function": "2 = Pulse/Frequency Counter w/ Debounce".format(response, pulse_count, frequency),
"Arm/Disarm": "{0[1]}".format(response, pulse_count, frequency),
"Function Status": "{0[2]}".format(response, pulse_count, frequency),
"Alarm Status": "{0[3]}".format(response, pulse_count, frequency),
"Pulse Count": "{1}".format(response, pulse_count, frequency),
"Frequency": "{2}".format(response, pulse_count, frequency),
"Internal Trigger": "{0[8]}".format(response, pulse_count, frequency),
"Debounce Output Enable": "{0[9]}".format(response, pulse_count, frequency),
"Low Time (x 100us)": "{0[10]}".format(response, pulse_count, frequency),
"High Time (x 100us)": "{0[11]}".format(response, pulse_count, frequency)}

def write_special_function_3_waveform_measurement(self,
timer,
Expand Down