2
0
forked from Ivasoft/DSView

Merge pull request #572 from yunyaobaihong/master

fix:decoder wait function problem on 2022/09/08
This commit is contained in:
dreamsourcelabTAI
2022-12-06 15:03:31 +08:00
committed by GitHub
2 changed files with 3 additions and 3 deletions

View File

@@ -620,7 +620,8 @@ class Decoder(srd.Decoder):
# re-use 'iec' decoder logic. Turn ATN to positive logic for
# easier processing. The data bits get handled during byte
# accumulation.
pins = self.wait(step_wait_conds[step])
(dio1,dio2,dio3,dio4,dio5,dio6,dio7,dio8,eoi,dav,nrfd,ndac,ifc,srq,atn,ren,clk)= self.wait(step_wait_conds[step])
pins = (dio1,dio2,dio3,dio4,dio5,dio6,dio7,dio8,eoi,dav,nrfd,ndac,ifc,srq,atn,ren,clk)
data, clk = pins[PIN_DATA], pins[PIN_CLK]
atn, = self.invert_pins([pins[PIN_ATN]])

View File

@@ -492,8 +492,7 @@ class Decoder(srd.Decoder):
is_outgoing = self.state == 'OUT'
is_processing = self.state == 'PROC'
pins = self.wait(conditions)
io = pins[Pin.IO]
(rst,clk,io) = self.wait(conditions)
# Handle RESET conditions, including an optional CLK pulse
# while RST is asserted.