From 1f140e9b0bea9e92a6808db3042677f21793b3ab Mon Sep 17 00:00:00 2001 From: chenyue Date: Thu, 23 Apr 2026 22:08:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E8=B7=AF=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xy2-100-cy/pd.py | 132 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 125 insertions(+), 7 deletions(-) diff --git a/xy2-100-cy/pd.py b/xy2-100-cy/pd.py index 45faac5..ef4f658 100644 --- a/xy2-100-cy/pd.py +++ b/xy2-100-cy/pd.py @@ -20,13 +20,13 @@ import sigrokdecode as srd -ann_bit, ann_stat_bit, ann_type, ann_command, ann_parameter, ann_parity, ann_pos, ann_status, ann_warning = range(9) +ann_bit,ann_bit2, ann_stat_bit, ann_type, ann_command, ann_parameter, ann_parity, ann_type2, ann_command2, ann_parameter2, ann_parity2, ann_pos,ann_pos2, ann_status, ann_warning = range(15) frame_type_none, frame_type_command, frame_type_16bit_pos, frame_type_18bit_pos = range(4) class Decoder(srd.Decoder): api_version = 3 - id = 'xy2-100-bsl' - name = 'XY2-100-bsl' + id = 'xy2-100-cy' + name = 'XY2-100-cy' longname = 'XY2-100(E) and XY-200(E) galvanometer protocol' desc = 'Serial protocol for galvanometer positioning in laser systems' license = 'gplv2+' @@ -40,7 +40,8 @@ class Decoder(srd.Decoder): {'id': 'sync', 'name': 'SYNC', 'desc': 'Sync'}, {'id': 'data', 'name': 'DATA', 'desc': 'X, Y or Z axis data'}, ) - optional_channels = ( + optional_channels = ( + {'id': 'data2', 'name': 'DATA2', 'desc': 'X, Y or Z axis data'}, {'id': 'status', 'name': 'STAT', 'desc': 'X, Y or Z axis status'}, ) @@ -57,9 +58,12 @@ class Decoder(srd.Decoder): ) annotation_rows = ( ('bits', 'Data Bits', (ann_bit,)), + ('bits2', 'Data Bits2', (ann_bit2,)), ('stat_bits', 'Status Bits', (ann_stat_bit,)), ('data', 'Data', (ann_type, ann_command, ann_parameter, ann_parity)), + ('data2', 'Data2', (ann_type2, ann_command2, ann_parameter2, ann_parity2)), ('positions', 'Positions', (ann_pos,)), + ('positions2', 'Positions2', (ann_pos2,)), ('statuses', 'Statuses', (ann_status,)), ('warnings', 'Warnings', (ann_warning,)), ) @@ -192,6 +196,116 @@ class Decoder(srd.Decoder): self.reset() + + def process_bit2(self, sync, bit_ss, bit_es, bit2_value): + self.put_ann(bit_ss, bit_es, ann_bit2, ['%d' % bit2_value]) + self.bits.append((bit_ss, bit_es, bit2_value)) + + if sync == 0: + if len(self.bits) < 20: + self.put_ann(self.bits[0][0], bit_es, ann_warning, ['Not enough data bits']) + self.reset() + return + + # Bit structure: + # 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 + # T --------------- 18-bit pos ----------------- PARITY or + # -TYPE-- ------------ 16-bit pos -------------- PARITY or + # -TYPE-- -8-bit command -8-bit parameter value- PARITY + + # Calculate parity, excluding the parity bit itself + parity = 0 + for ss, es, value in self.bits[:-1]: + parity ^= value + + par_ss, par_es, par_value = self.bits[19] + parity_even = 0 + parity_odd = 0 + if (par_value == parity): + parity_even = 1 + else: + parity_odd = 1 + + type_1_value = self.bits[0][2] + type_3_value = (self.bits[0][2] << 2) | (self.bits[1][2] << 1) | self.bits[2][2] + + # Determine frame type + type = frame_type_none + parity_status = ['X', 'Unknown'] + type_ss = self.bits[0][0] + type_es = self.bits[2][1] + + ### 18-bit position + if (type_1_value == 1) and (parity_odd == 1): + type = frame_type_18bit_pos + type_es = self.bits[0][1] + self.put_ann(self.bits[0][0], bit_es, ann_warning, ['Careful: 18-bit position frames with wrong parity and command frames with wrong parity cannot be identified']) + ### 16-bit position + elif (type_3_value == 1): + type = frame_type_16bit_pos + if (parity_even == 1): + parity_status = ['OK'] + else: + parity_status = ['NOK'] + self.put_ann(self.bits[0][0], bit_es, ann_warning, ['Parity error', 'PE']) + ### Command + elif (type_3_value == 7) and (parity_even == 1): + type = frame_type_command + self.put_ann(self.bits[0][0], bit_es, ann_warning, ['Careful: 18-bit position frames with wrong parity and command frames with wrong parity cannot be identified']) + ### Other + else: + self.put_ann(self.bits[0][0], bit_es, ann_warning, ['Error', 'Unknown command or parity error']) + self.reset() + return + + # Output command and parity annotations + if (type == frame_type_16bit_pos): + self.put_ann(type_ss, type_es, ann_type2, ['16 bit Position Frame', '16 bit Pos', 'Pos', 'P']) + if (type == frame_type_18bit_pos): + self.put_ann(type_ss, type_es, ann_type2, ['18 bit Position Frame', '18 bit Pos', 'Pos', 'P']) + if (type == frame_type_command): + self.put_ann(type_ss, type_es, ann_type2, ['Command Frame', 'Command', 'C']) + + self.put_ann(par_ss, par_es, ann_parity2, parity_status) + + # Output value + if (type == frame_type_16bit_pos) or (type == frame_type_18bit_pos): + pos = 0 + + if (type == frame_type_16bit_pos): + count = 15 + for ss, es, value in self.bits[3:19]: + pos |= value << count + count -= 1 + # pos = pos if pos < 32768 else pos - 65536 + else: + count = 17 + for ss, es, value in self.bits[3:19]: + pos |= value << count + count -= 1 + pos = pos if pos < 131072 else pos - 262144 + + self.put_ann(type_es, par_ss, ann_pos2, ['%d' % pos]) + + if (type == frame_type_command): + count = 7 + cmd = 0 + cmd_es = 0 + for ss, es, value in self.bits[3:11]: + cmd |= value << count + count -= 1 + cmd_es = es + self.put_ann(type_es, cmd_es, ann_command2, ['Command 0x%X' % cmd, 'Cmd 0x%X' % cmd, '0x%X' % cmd]) + + count = 7 + param = 0 + for ss, es, value in self.bits[11:19]: + param |= value << count + count -= 1 + self.put_ann(cmd_es, par_ss, ann_parameter2, ['Parameter 0x%X / %d' % (param, param), '0x%X / %d' % (param, param),'0x%X' % param]) + + self.reset() + def process_stat_bit(self, sync, bit_ss, bit_es, bit_value): if self.stat_skip_bit: self.stat_skip_bit = False @@ -215,15 +329,16 @@ class Decoder(srd.Decoder): bit_ss = None bit_es = None bit_value = 0 + bit2_value = 0 stat_ss = None stat_es = None stat_value = 0 sync_value = 0 - has_stat = self.has_channel(3) - + has_data2 = self.has_channel(3) + has_stat = self.has_channel(4) while True: # Wait for any edge on clk - clk, sync, data, stat = self.wait({0: 'e'}) + clk, sync, data, data2, stat = self.wait({0: 'e'}) if clk == 1: stat_value = stat @@ -231,9 +346,12 @@ class Decoder(srd.Decoder): bit_es = self.samplenum if bit_ss: self.process_bit(sync_value, bit_ss, bit_es, bit_value) + if has_data2: + self.process_bit2(sync_value, bit_ss, bit_es, bit2_value) bit_ss = self.samplenum else: bit_value = data + bit2_value = data2 sync_value = sync stat_es = self.samplenum