Skip to content

Commit

Permalink
Manual Merge + Tested Merge branch 'pr/queengooborg/36'
Browse files Browse the repository at this point in the history
  • Loading branch information
thekakester committed Nov 19, 2024
2 parents 402ce0e + 8d9612f commit 1e0cc61
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ Example Data:
| -------- | ------ | ----------- | --------------------------------------- |
| 0 (AA) | 2 | uint16 (LE) | Drying Temperature in °C |
| 2 (BB) | 2 | uint16 (LE) | Drying time in hours |
| 4 (CC) | 4 | uint16 (LE) | Bed Temerature Type **(types unknown)** |
| 4 (CC) | 2 | uint16 (LE) | Bed Temerature Type **(types unknown)** |
| 6 (DD) | 2 | uint16 (LE) | Bed Temperature in °C |
| 8 (EE) | 2 | uint16 (LE) | Max Temperature for Hotend in °C |
| 10 (FF) | 2 | uint16 (LE) | Min Temperature for Hotend in °C |
Expand Down
25 changes: 25 additions & 0 deletions parse.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,31 @@ def __gt__(self, other):
values = self.__get_comparison_values(self, other)
return values[0] > values[1]

class ColorList(list):
def __init__(self, value):
if type(value) in [list, tuple]:
super().__init__(value)
else:
super().__init__([value])

def __str__(self):
return " / ".join("#" + c for c in self)

def __setitem__(self, index, item):
super().__setitem__(index, str(item))

def insert(self, index, item):
super().insert(index, str(item))

def append(self, item):
super().append(str(item))

def extend(self, other):
if isinstance(other, type(self)):
super().extend(other)
else:
super().extend(str(item) for item in other)

class Tag():
def __init__(self, filename, data):
# Check to make sure the data is 1KB
Expand Down

0 comments on commit 1e0cc61

Please sign in to comment.