From bffb2ed8d94393a1fede3ce8065dec3b4f4b138c Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 7 Dec 2024 19:00:31 +0100 Subject: [PATCH] Fix ff init state detection --- libgm/src/Bitstream.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libgm/src/Bitstream.cpp b/libgm/src/Bitstream.cpp index 30ad8eb..fe65211 100644 --- a/libgm/src/Bitstream.cpp +++ b/libgm/src/Bitstream.cpp @@ -439,12 +439,12 @@ Chip Bitstream::deserialise_chip() uint8_t val = 0x00; for (int i = 0; i < 4; i++) { uint8_t v = block[i * 10 + 8] ^ data[i * 10 + 8]; - if (v == 0x30) + if (v & 0x30) val |= Die::FF_INIT_RESET << (i * 2); - else if (v == 0xc0) + else if (v & 0xc0) val |= Die::FF_INIT_SET << (i * 2); else if (v != 0x00) - BITSTREAM_FATAL(stringf("Unknown CPE state %d on pos %d,%d\n", v, x_pos, y_pos), + BITSTREAM_FATAL(stringf("Unknown CPE state %d on pos 0x%02x,0x%02x\n", v, x_pos, y_pos), rd.get_offset()); } die.write_ff_init(x_pos, y_pos, val);