aboutsummaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorLoek Le Blansch <loek@pipeframe.xyz>2024-05-30 18:58:13 +0200
committerLoek Le Blansch <loek@pipeframe.xyz>2024-05-30 18:58:13 +0200
commit18d06c79b9f6a625eb218a15c8216556fb99dc02 (patch)
treed70e32865ec6ad92eae90d40f2475ec6469fb1a0 /client
parent47bbee8b8a5d7eae452b76f58f30d6a70d265ebe (diff)
WIP parsing the connected puzzle module list
Diffstat (limited to 'client')
-rw-r--r--client/i2c.cpp30
-rw-r--r--client/readme.md10
2 files changed, 40 insertions, 0 deletions
diff --git a/client/i2c.cpp b/client/i2c.cpp
index fd29e1e..ee57e20 100644
--- a/client/i2c.cpp
+++ b/client/i2c.cpp
@@ -5,6 +5,11 @@
#include "sock.h"
#include "xxd.h"
+#include "pb/bus.h"
+#include "pb/types.h"
+
+#include "pb/mod/main.h"
+
bool i2c_dump_send = false;
bool i2c_dump_recv = true;
@@ -28,10 +33,35 @@ void i2c_send(uint16_t addr, const char * data, size_t data_size) {
free(packed);
}
+static void i2c_handle_cmd_read(uint16_t, const char *, size_t);
+
void i2c_recv(uint16_t addr, const char * data, size_t data_size) {
if (i2c_dump_recv) {
printf("[%s] addr(0x%02x) data(0x%02lx):\n", __FUNCTION__, addr, data_size);
xxd(data, data_size);
}
+
+ if (data_size == 0) return;
+ enum pb_cmd cmd = (enum pb_cmd) data[0];
+ data++; data_size--;
+
+ switch (cmd) {
+ case PB_CMD_READ: return i2c_handle_cmd_read(addr, data, data_size);
+ default: return;
+ }
+}
+
+static void i2c_handle_cmd_read(uint16_t i2c_addr, const char * buf, size_t sz) {
+ if (sz < 2) return; // require data address + 1 byte of data
+ pb_cmd_read_t * cmd = (pb_cmd_read_t *) buf;
+ sz--; // sz now represents size of cmd->data
+
+ if (i2c_addr == BUSADDR_MAIN && cmd->address == 0x01) {
+ if (sz % 2 != 0) return; // invalid data
+ for (size_t offset = 0; offset < sz; offset += sizeof(pb_mod_main_mod_t)) {
+ pb_mod_main_mod_t * mod = (pb_mod_main_mod_t *) (cmd->data + offset);
+ printf("module at addr 0x%02x with state %d\n", mod->addr, mod->state);
+ }
+ }
}
diff --git a/client/readme.md b/client/readme.md
index ea3e034..da48cf1 100644
--- a/client/readme.md
+++ b/client/readme.md
@@ -7,6 +7,16 @@ game operator to control and monitor the state of a puzzle box, but is also a
useful debugging tool when developing puzzle modules, as it allows you to send
arbitrary data over the puzzle bus.
+## WIP TODO
+
+- cleanup
+ - separate ../shared/pb/moddrv.c into a puzzle module specific and 'common' bit
+ - use the common bit in i2c.cpp instead
+ - cast to structs in ../shared/pb/moddrv.c
+- functionality
+ - print pretty tree of connected puzzle modules
+ - add enum to string functions in CLIENT ONLY
+
## Features
- List detected puzzle modules