Skip to content
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

Jump to bottom

Solve Poetry install error om macOS 12.2.1 #37

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Solve Poetry install error om macOS 12.2.1 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
92027b6
Solve Poetry install error by updating the required black version to …
rrooggiieerr Feb 24, 2022
03496a7
Fix showing port number when reading mate3 values in text format
rrooggiieerr Feb 24, 2022
081c81a
Show field read/write mode when reading mate3 values in text format
rrooggiieerr Feb 24, 2022
353108a
Fix cache_writeable when dumping a full modbus read
rrooggiieerr Feb 24, 2022
538d2ce
Fix regular expression to get idx from field when writing values
rrooggiieerr Feb 24, 2022
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
13 changes: 7 additions & 6 deletions mate3/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@ def read(client, args):
for device in client.devices.connected_devices:
# name:
name = device.__class__.__name__
if hasattr(device, "port"):
if hasattr(device, "port_number"):
name = f"{name} on port {device.port_number.value}"
print(name)
# values:
print("\t" + " | ".join(["name".ljust(50), "impl", "sf", "unscaled", "value".ljust(20)]))
print("\t" + " | ".join(["-" * 50, "----", "--", "--------", "-" * 20]))
print("\t" + " | ".join(["name".ljust(50), "impl", "RW", "sf", "unscaled", "value".ljust(20)]))
print("\t" + " | ".join(["-" * 50, "----", "--", "--", "--------", "-" * 20]))
for value in device.fields([Mode.R, Mode.RW]):
ss = [f"\t{value.field.name.ljust(50)}"]
ss.append("Y".rjust(4) if value.implemented else "N".rjust(4))
ss.append(value.field.mode.name.ljust(2))
if value.scale_factor is not None:
ss.append(f"{value.scale_factor.value}".rjust(2))
ss.append(f"{value.raw_value}".rjust(8))
Expand All @@ -53,10 +54,10 @@ def read(client, args):
def write(client, args):

# Util functions to get the field from a string such as `charge_controllers[3].config.absorb_volts`
attr_idx_pattern = re.compile(r"([^\[\.]+)(\[[0-9]+\])?")
attr_idx_pattern = re.compile(r"([^\[\.]+)(\[([0-9]+)\])?")

def get_field(field, paths: List[Tuple[str]]):
attr, idx = paths[0]
attr, _ignore, idx = paths[0]
field = getattr(field, attr)
if idx:
field = field[int(idx)]
Expand Down Expand Up @@ -89,7 +90,7 @@ def dump_modbus_reads(args, port):
dump_path = Path(args.dump_path)
if dump_path.exists():
os.remove(dump_path)
with Mate3Client(host=args.host, port=port, cache_path=args.dump_path, cache_only=False) as client:
with Mate3Client(host=args.host, port=port, cache_path=args.dump_path, cache_only=False, cache_writeable=True) as client:
client.read_all_modbus_values_unparsed()
print(
f"All debug modbus reads are cached in the file '{args.dump_path}'.\nNOTE THAT THIS MAY CONTAIN SENSITIVE "
Expand Down
Loading