separate the i2c over tcp from puzzle bus libraries

2 files changed, 8 insertions, 8 deletions

diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index 30685a4..6390d7c 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -7,7 +7,7 @@ set(PICO_BOARD pico_w)
 
 include(lib/pico-sdk/pico_sdk_init.cmake)
 include(lib/FreeRTOS-Kernel/portable/ThirdParty/GCC/RP2040/FreeRTOS_Kernel_import.cmake)
-include(../proto/include.cmake)
+include(../i2ctcp/include.cmake)
 
 project(puzzlebox_main C CXX ASM)
 
@@ -33,7 +33,7 @@ target_link_libraries(main
 	hardware_i2c
 	FreeRTOS-Kernel
 	FreeRTOS-Kernel-Heap4
-	puzbus
+	i2ctcp
 	mpack
 	)
 
diff --git a/main/sock.c b/main/sock.c
index 4f50981..fe932bb 100644
--- a/main/sock.c
+++ b/main/sock.c
@@ -7,16 +7,16 @@
 
 #include "init.h"
 #include "config.h"
-#include "puzbusv1.h"
+#include "i2ctcpv1.h"
 #include "sock.h"
 
 struct netconn* current_connection = NULL;
-struct pb_msg recv_msg;
+i2ctcp_msg_t recv_msg;
 
 void i2c_send(uint16_t addr, const char * data, size_t data_size) {
 	if (current_connection == NULL) return;
 
-	struct pb_msg send_msg = {
+	i2ctcp_msg_t send_msg = {
 		.addr = addr,
 		.data = (char *) data,
 		.length = data_size,
@@ -25,7 +25,7 @@ void i2c_send(uint16_t addr, const char * data, size_t data_size) {
 	char * buf;
 	size_t buf_sz;
 
-	if (!pb_write(&send_msg, &buf, &buf_sz)) return;
+	if (!i2ctcp_write(&send_msg, &buf, &buf_sz)) return;
 
 	// NOTE: netconn does return an error code, but the data needs to be freed
 	// whether netconn throws an error or not, so it remains unused
@@ -47,7 +47,7 @@ void i2c_recv(uint16_t addr, const char * data, size_t data_size) {
 }
 
 void recv_handler(struct netconn* conn, struct netbuf* buf) {
-	pb_read_reset(&recv_msg);
+	i2ctcp_read_reset(&recv_msg);
 
 	do {
 		char* data;
@@ -55,7 +55,7 @@ void recv_handler(struct netconn* conn, struct netbuf* buf) {
 		netbuf_data(buf, (void**)&data, &len);
 
 		// continue early if more data is needed to complete message
-		if (!pb_read(&recv_msg, data, len)) continue;
+		if (!i2ctcp_read(&recv_msg, data, len)) continue;
 
 		// forward received message to puzzle bus
 		i2c_recv(recv_msg.addr, recv_msg.data, recv_msg.length);