From aeb5347b871ae58e8d2ef5fd0ede21d7c1a1bf95 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Thu, 27 Aug 2026 09:25:57 +0200 Subject: [PATCH] next sim module firmware sim017.bin, --- armsrc/i2c.c | 27 +++++++++++++-------------- armsrc/i2c.h | 10 ++++++++++ client/resources/sim017.bin | Bin 0 -> 6759 bytes client/resources/sim017.sha512.txt | 1 + client/src/emv/cmdemv.c | 17 +++++++++++++---- 5 files changed, 37 insertions(+), 18 deletions(-) create mode 100644 client/resources/sim017.bin create mode 100644 client/resources/sim017.sha512.txt diff --git a/armsrc/i2c.c b/armsrc/i2c.c index 6a4289ccf..0a54b575c 100644 --- a/armsrc/i2c.c +++ b/armsrc/i2c.c @@ -41,6 +41,9 @@ // cannot drift apart. #define I2C_DELAY_1CLK SpinDelayUsPrecision(I2C_DELAY_1CLK_US) #define I2C_DELAY_2CLK SpinDelayUsPrecision(I2C_DELAY_2CLK_US) +#define I2C_DELAY_SDA SpinDelayUsPrecision(I2C_DELAY_SDA_US) +#define I2C_DELAY_HOLD SpinDelayUsPrecision(I2C_DELAY_HOLD_US) +#define I2C_DELAY_HIGH SpinDelayUsPrecision(I2C_DELAY_HIGH_US) #define SC_PROTO_T0 (1 << 0) #define SC_PROTO_T1 (1 << 1) @@ -188,15 +191,11 @@ static bool WaitSCL_L(void) { #define SIM_START_TIMEOUT_MS 50 static bool WaitSCL_L_timeout(void) { - volatile uint32_t delay = SIM_START_TIMEOUT_MS; - while (delay--) { - // exit on SCL LOW - if (SCL_read == false) - return true; - - WaitMS(1); - } - return false; + // How long the module may take to *start* stretching, not how long it may + // hold. Polled at bus granularity: a command the module already finished + // never shows SCL low at all, and at 1 ms a step that cost the full + // timeout on every fast exchange. + return WaitSCL_L_delay(I2C_ITERS_FOR_MS(SIM_START_TIMEOUT_MS)); } static bool I2C_Start(void) { @@ -318,7 +317,7 @@ static void I2C_SendByte(uint8_t data) { while (bits--) { SCL_L; - I2C_DELAY_1CLK; + I2C_DELAY_HOLD; if (data & 0x80) SDA_H; @@ -327,14 +326,14 @@ static void I2C_SendByte(uint8_t data) { data <<= 1; - I2C_DELAY_1CLK; + I2C_DELAY_SDA; SCL_H; if (WaitSCL_H() == false) { return; } - I2C_DELAY_2CLK; + I2C_DELAY_HIGH; } SCL_L; } @@ -351,13 +350,13 @@ static int16_t I2C_ReadByte(void) { return -2; } - I2C_DELAY_1CLK; + I2C_DELAY_SDA; SCL_H; if (WaitSCL_H() == false) { return -1; } - I2C_DELAY_1CLK; + I2C_DELAY_HIGH; if (SDA_read) { b |= 0x01; } diff --git a/armsrc/i2c.h b/armsrc/i2c.h index 62dc1fd1a..30d320704 100644 --- a/armsrc/i2c.h +++ b/armsrc/i2c.h @@ -60,6 +60,16 @@ #define I2C_DELAY_1CLK_US 20 #define I2C_DELAY_2CLK_US 22 +// Only one delay per bit is rise time critical: the one bracketing an SDA +// transition, where a released line has to charge through the pull-up before +// it reads as a 1. Sampling before that is what corrupted the bus every time +// these were simply scaled down together. The others are padding - hold after +// SCL falls (spec 0.3 us) and SCL high width (spec 4 us) - so they get the +// standard mode minimum with margin instead of a full clock. +#define I2C_DELAY_SDA_US I2C_DELAY_1CLK_US +#define I2C_DELAY_HOLD_US 2 +#define I2C_DELAY_HIGH_US 6 + // The SCL wait loops spend one 1CLK per iteration, so their timeouts are // iteration counts. Written in ms and converted here so the two cannot drift. #define I2C_ITERS_PER_MS (1000U / I2C_DELAY_1CLK_US) diff --git a/client/resources/sim017.bin b/client/resources/sim017.bin new file mode 100644 index 0000000000000000000000000000000000000000..11f32420093181bc1c38e1e87f0f10da2f7305c0 GIT binary patch literal 6759 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