1
0
mirror of https://github.com/jonathanhogg/scopething synced 2025-07-14 03:02:09 +01:00

Actually, simplify the SerialStream again and don't use the delay stuff from the Storm version

This commit is contained in:
2017-03-26 16:13:50 +01:00
parent c7bc7beded
commit 891d7037a8
2 changed files with 17 additions and 53 deletions

View File

@ -162,7 +162,7 @@ class Scope(vm.VirtualMachine):
await self.set_registers(TraceMode=clock_mode.TraceMode, BufferMode=clock_mode.BufferMode,
SampleAddress=0, ClockTicks=ticks, ClockScale=1,
TraceIntro=total_samples//2, TraceOutro=total_samples//2, TraceDelay=0,
Timeout=int(round((period*5 if timeout is None else timeout) / self.trigger_timeout_tick)),
Timeout=max(1, int(round((period*5 if timeout is None else timeout) / self.trigger_timeout_tick))),
TriggerMask=0x7f, TriggerLogic=0x80, TriggerLevel=trigger_level, SpockOption=spock_option,
TriggerIntro=trigger_intro, TriggerOutro=2 if hair_trigger else 4, Prelude=0,
ConverterLo=lo, ConverterHi=hi,
@ -345,6 +345,6 @@ def generate(*args, **kwargs):
if __name__ == '__main__':
import sys
logging.basicConfig(level=logging.DEBUG, stream=sys.stderr)
logging.basicConfig(level=logging.INFO, stream=sys.stderr)
asyncio.get_event_loop().run_until_complete(main())