diff --git a/.github/workflows/python-syntax-checker.yml b/.github/workflows/python-syntax-checker.yml index 0fba3b5..eeaa191 100644 --- a/.github/workflows/python-syntax-checker.yml +++ b/.github/workflows/python-syntax-checker.yml @@ -14,11 +14,13 @@ jobs: python-version: ['3.7', '3.8', '3.9', '3.10', '3.x'] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 + - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} + - name: Install dependencies run: | python -m pip install --upgrade pip @@ -27,6 +29,7 @@ jobs: # pip install flake8 pytest # next line is for future use of requirements file # if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + - name: Lint with flake8 run: | # stop the build if there are Python syntax errors or undefined names diff --git a/epson_print_conf.py b/epson_print_conf.py index 0d2c1bd..7bd657a 100644 --- a/epson_print_conf.py +++ b/epson_print_conf.py @@ -478,26 +478,88 @@ class EpsonPrinter: # uncompleted }, "XP-620": { - "read_key": [57, 5], - "write_key": b'Althaea.', - # uncompleted + "read_key": [87, 5], + "write_key": b"Althaea.", + "main_waste": {"oids": [16, 17, 6], "divider": 84.5}, + "borderless_waste": {"oids": [18, 19, 6], "divider": 33.7}, + "raw_waste_reset": {16: 0, 17: 0, 6: 0, 52: 94, 20: 0, 21: 0, 18: 0, 19: 0, 53: 94, 493: 0}, + "stats": { + "Timer cleaning counter": [245], + "Total print pass counter": [99, 98, 97, 96], + "Total print CD-R counter": [255, 254], + "Maintenance required level of 1st waste ink counter": [52], + "Maintenance required level of 2nd waste ink counter": [53], + }, + "serial_number": range(216, 226), + "alias": ["XP-621", "XP-625"], }, "XP-700": { "read_key": [40, 0], - # uncompleted + "write_key": b"Hibiscus", + "main_waste": {"oids": [16, 17, 6], "divider": 84.5}, + "borderless_waste": {"oids": [18, 19, 6], "divider": 29.03}, + "raw_waste_reset": {16: 0, 17: 0, 6: 0, 52: 94, 20: 0, 21: 0, 18: 0, 19: 0, 53: 94, 493: 0}, + "stats": { + "Timer cleaning counter": [245], + "Total print pass counter": [99, 98, 97, 96], + "Total print CD-R counter": [255, 254], + "Maintenance required level of 1st waste ink counter": [52], + "Maintenance required level of 2nd waste ink counter": [53], + }, + "serial_number": range(216, 226), + "alias": ["XP-701", "XP-702"], }, "XP-760": { "read_key": [87, 5], - # uncompleted + "write_key": b"Althaea.", + "main_waste": {"oids": [16, 17, 6], "divider": 84.5}, + "borderless_waste": {"oids": [18, 19, 6], "divider": 33.7}, + "raw_waste_reset": {16: 0, 17: 0, 6: 0, 52: 94, 20: 0, 21: 0, 18: 0, 19: 0, 53: 94, 493: 0}, + "stats": { + "Timer cleaning counter": [245], + "Total print pass counter": [99, 98, 97, 96], + "Total print CD-R counter": [255, 254], + "Maintenance required level of 1st waste ink counter": [52], + "Maintenance required level of 2nd waste ink counter": [53], + }, + "serial_number": range(216, 226), }, "XP-830": { - "alias": ["XP-530", "XP-630", "XP-635"], "read_key": [40, 9], - "write_key": b'Irisgarm', # (Iris graminea with typo?) - "main_waste": {"oids": [0x10, 0x11], "divider": 84.5}, # Incorrect - "borderless_waste": {"oids": [0x12, 0x13], "divider": 33.7}, # Incorrect + "write_key": b"Irisgarm", # (Iris graminea with typo?) + "main_waste": {"oids": [16, 17, 6], "divider": 84.5}, + "borderless_waste": {"oids": [18, 19, 6], "divider": 33.7}, + "raw_waste_reset": {16: 0, 17: 0, 6: 0, 52: 94, 20: 0, 21: 0, 18: 0, 19: 0, 53: 94, 493: 0}, + "stats": { + "Timer cleaning counter": [245], + "Total print pass counter": [99, 98, 97, 96], + "Total print CD-R counter": [255, 254], + "Total scan counter": [453, 452, 451, 450], + "Total scan counter % (ADF)": [457, 456, 455, 454], + "Maintenance required level of 1st waste ink counter": [52], + "Maintenance required level of 2nd waste ink counter": [53], + }, + "serial_number": range(216, 226), "idProduct": 0x110b, - # uncompleted + }, + "XP-960": { + "read_key": [40, 9], + "write_key": b"Irisgarm", + "main_waste": {"oids": [16, 17, 6], "divider": 93.85}, + "borderless_waste": {"oids": [18, 19, 6], "divider": 29.77}, + "raw_waste_reset": { + 16: 0, 17: 0, 6: 0, 52: 94, 18: 0, 19: 0, 20: 0, 21: 0, + 53: 94, 493: 0 + }, + "stats": { + "Timer cleaning counter": [245], + "Total print pass counter": [99, 98, 97, 96], + "Total print CD-R counter": [255, 254], + "Total scan counter": [453, 452, 451, 450], + "Maintenance required level of 1st waste ink counter": [52], + "Maintenance required level of 2nd waste ink counter": [53], + }, + "serial_number": range(216, 226), }, "XP-850": { "alias": ["XP-820"],