From fb3509614dfc2d86fb1de102c653e3d03295b08f Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sun, 12 May 2024 02:43:17 +0900 Subject: [PATCH] removed double sleeping on baud rate emulation --- tsvm_core/src/net/torvald/tsvm/peripheral/GraphicsAdapter.kt | 2 +- tsvm_core/src/net/torvald/tsvm/peripheral/TexticsAdapter.kt | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/tsvm_core/src/net/torvald/tsvm/peripheral/GraphicsAdapter.kt b/tsvm_core/src/net/torvald/tsvm/peripheral/GraphicsAdapter.kt index 07660ac..0e0d42e 100644 --- a/tsvm_core/src/net/torvald/tsvm/peripheral/GraphicsAdapter.kt +++ b/tsvm_core/src/net/torvald/tsvm/peripheral/GraphicsAdapter.kt @@ -39,7 +39,7 @@ data class AdapterConfig( val paletteShader: String = DRAW_SHADER_FRAG, val drawScale: Float = 1f, val scaleFiltered: Boolean = false, - val baudRate: Double = 115200.0, + val baudRate: Double = 57600.0, val bitsPerChar: Int = 10 // start bit + 8 data bits + stop bit ) diff --git a/tsvm_core/src/net/torvald/tsvm/peripheral/TexticsAdapter.kt b/tsvm_core/src/net/torvald/tsvm/peripheral/TexticsAdapter.kt index ea1b4b5..02dec02 100644 --- a/tsvm_core/src/net/torvald/tsvm/peripheral/TexticsAdapter.kt +++ b/tsvm_core/src/net/torvald/tsvm/peripheral/TexticsAdapter.kt @@ -54,7 +54,6 @@ open class TexticsAdapterBase(assetsRoot: String, vm: VM, config: AdapterConfig) in 0 until 250972 -> (-1).toByte() else -> super.peek(addr) } - applyDelay() } override fun poke(addr: Long, byte: Byte) { @@ -62,12 +61,10 @@ open class TexticsAdapterBase(assetsRoot: String, vm: VM, config: AdapterConfig) in 0 until 250972 -> { /*do nothing*/ } else -> super.poke(addr, byte) } - applyDelay() } override fun setCursorPos(x: Int, y: Int) { super.setCursorPos(x, y) - applyDelay() } override fun putChar(x: Int, y: Int, text: Byte, foreColour: Byte, backColour: Byte) { @@ -123,7 +120,7 @@ class Term(assetsRoot: String, vm: VM) : TexticsAdapterBase(assetsRoot, vm, Adap "./hp2640.png", 0.32f, GraphicsAdapter.TEXT_TILING_SHADER_MONOCHROME, - baudRate = 115200.0 + baudRate = 57600.0 )) class WpTerm(assetsRoot: String, vm: VM) : TexticsAdapterBase(assetsRoot, vm, AdapterConfig(