Skip to content

Commit fd4a837

Browse files
committed
Revert "Add spool_id support to RFID filament protocol"
This reverts commit f2f40b929c0bd9d16d74ff6400fe8030aafcca25.
1 parent 0a5c228 commit fd4a837

File tree

3 files changed

+2
-10
lines changed

3 files changed

+2
-10
lines changed

docs/rfid_support.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ Example payload:
6161
"min_temp": 190,
6262
"max_temp": 220,
6363
"bed_min_temp": 50,
64-
"bed_max_temp": 60,
65-
"spool_id": 1
64+
"bed_max_temp": 60
6665
}
6766
```
6867

@@ -102,7 +101,6 @@ Using the non-standard OpenSpool `subtype` field it is possible to specify a mat
102101
- `additional_color_hexes` - Additional colors for multicolor spools (up to 4)
103102
- `weight` - Spool weight in grams
104103
- `diameter` - Filament diameter in mm (e.g., 1.75)
105-
- `spool_id` - Spoolman spool ID for integration with spool management systems
106104

107105
### Snapmaker Orca Naming Convention
108106

overlays/firmware-extended/13-patch-rfid/root/home/lava/klipper/klippy/extras/filament_protocol_ndef.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -224,11 +224,6 @@ def openspool_parse_payload(payload, card_uid=[]):
224224
info['OFFICIAL'] = True
225225
info['CARD_UID'] = card_uid
226226

227-
try:
228-
info['SPOOL_ID'] = int(data.get('spool_id', 0))
229-
except (ValueError, TypeError):
230-
info['SPOOL_ID'] = 0
231-
232227
return filament_protocol.FILAMENT_PROTO_OK, info
233228

234229
except json.JSONDecodeError as e:

overlays/firmware-extended/13-patch-rfid/test/openspool-pla-basic.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@
77
"min_temp": 190,
88
"max_temp": 220,
99
"bed_min_temp": 50,
10-
"bed_max_temp": 60,
11-
"spool_id": 1
10+
"bed_max_temp": 60
1211
}

0 commit comments

Comments
 (0)