separate the i2c over tcp from puzzle bus libraries

5 files changed, 10 insertions, 89 deletions

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 6aa4b4f..73c703d 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -7,7 +7,7 @@ set(CMAKE_BUILD_TYPE Debug)
 
 project(puzzlebox_client C CXX)
 
-include(../proto/include.cmake)
+include(../i2ctcp/include.cmake)
 
 add_executable(pbc
 	main.cpp
@@ -19,7 +19,7 @@ add_executable(pbc
 	)
 
 target_link_libraries(pbc
-	puzbus
+	i2ctcp
 	mpack
 	readline # this is such a common library that I did not bother adding it as a submodule
 	)
diff --git a/client/cmd.cpp b/client/cmd.cpp
index 736cf12..a26de13 100644
--- a/client/cmd.cpp
+++ b/client/cmd.cpp
@@ -3,11 +3,11 @@
 #include <string.h>
 
 #include "cmd.h"
-#include "puzbusv1.h"
+#include "i2ctcpv1.h"
 #include "sock.h"
 #include "parse.h"
 
-#include "../shared/busaddr.h"
+#include "../shared/puzbus.h"
 
 char* consume_token(char* input, const char* ifs) {
 	strtok(input, ifs);
diff --git a/client/examples/puzbus-hello-world.cpp b/client/examples/puzbus-hello-world.cpp
deleted file mode 100644
index dcc965b..0000000
--- a/client/examples/puzbus-hello-world.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <unistd.h>
-
-#include "puzbusv1.h"
-
-int send_message() {
-	const char* data = "Test message data!";
-	struct pb_msg output = {
-		.addr = 0x39,
-		.data = (char*) data,
-		.length = strlen(data),
-	};
-
-	char* packed;
-	size_t size;
-	if (!pb_write(&output, &packed, &size)) {
-		printf("error writing!\n");
-		return EXIT_FAILURE;
-	}
-
-	fwrite(packed, sizeof(packed[0]), size, stdout);
-	fflush(stdout);
-
-	return EXIT_SUCCESS;
-}
-
-int read_message() {
-	freopen(NULL, "rb", stdin); // allow binary on stdin
-	struct pb_msg input;
-	
-	char buf[4]; // extremely small buffer to test chunked message parsing
-	size_t bytes = 0;
-
-	while ((bytes = fread(buf, sizeof(buf[0]), sizeof(buf), stdin)) > 0) {
-		int ret = pb_read(&input, buf, bytes);
-
-		// header read error
-		if (ret < 0) {
-			printf("error reading!\n");
-			return EXIT_FAILURE;
-		}
-
-		// continue reading if more bytes needed...
-		if (ret > 0) continue;
-
-		// message read completely!
-		printf("address: 0x%02x\n", input.addr);
-		printf("data:    \"%.*s\"\n", input.length, input.data);
-		free(input.data);
-		return EXIT_SUCCESS;
-	}
-
-	// if we reach this point, data was read but it did not contain a complete
-	// message, and is thus considered a failure
-	return EXIT_FAILURE;
-}
-
-int main() {
-	if (!isatty(fileno(stdout))) return send_message();
-	if (!isatty(fileno(stdin))) return read_message();
-	
-	printf("please pipe some data in or out to use this program\n");
-	return EXIT_SUCCESS;
-}
-
diff --git a/client/readme.md b/client/readme.md
index 98cd853..1b4cc34 100644
--- a/client/readme.md
+++ b/client/readme.md
@@ -1,17 +1,5 @@
 # puzzle box client
 
-goal (in order of implementation):
-```
-(pbc) help
-    exit                exit pbc
-    test                send a test puzbus message
-    help                show this help
-    send <addr> <data>  [debug] send raw message
-    status              show global puzzle box state (main controller state)
-    reset               reset entire game state
-    ls                  list connected puzzle modules
-```
-
 ## Send data
 
 ```
diff --git a/client/sock.cpp b/client/sock.cpp
index f967f64..2d5787d 100644
--- a/client/sock.cpp
+++ b/client/sock.cpp
@@ -10,7 +10,7 @@
 
 #include <thread>
 
-#include "puzbusv1.h"
+#include "i2ctcpv1.h"
 #include "sock.h"
 #include "rl.h"
 
@@ -72,7 +72,7 @@ void PBSocket::send(const char * buf, size_t buf_sz) {
 }
 
 void PBSocket::sock_task() {
-	struct pb_msg input;
+	i2ctcp_msg_t input;
 
 	while(1) {
 		char buf[80];
@@ -86,11 +86,11 @@ void PBSocket::sock_task() {
 		// skip empty frames
 		if (bytes == 0) continue;
 
-		int ret = pb_read(&input, buf, bytes);
+		int ret = i2ctcp_read(&input, buf, bytes);
 
 		// header read error
 		if (ret < 0) {
-			rl_printf("pb_read error!\n");
+			rl_printf("i2ctcp_read error!\n");
 			break;
 		}
 
@@ -106,7 +106,7 @@ void PBSocket::sock_task() {
 }
 
 void i2c_send(uint16_t addr, const char * data, size_t data_size) {
-	struct pb_msg msg = {
+	i2ctcp_msg_t msg = {
 		.addr = addr,
 		.data = (char *) data,
 		.length = data_size,
@@ -114,7 +114,7 @@ void i2c_send(uint16_t addr, const char * data, size_t data_size) {
 
 	char* packed;
 	size_t size;
-	if (!pb_write(&msg, &packed, &size)) return;
+	if (!i2ctcp_write(&msg, &packed, &size)) return;
 
 	sock->send(packed, size);
 }