WIP

Author: mattnite

build.zig

@@ -138,8 +138,8 @@ pub const Cart = struct {
             watch_run.addArgs(&.{"--input-dir"});
             watch_run.addFileArg(c.options.root_source_file.dirname());
         }
-        watch_run.addArgs(&.{ "--cart", b.getInstallPath(install_artifact_step.dest_dir.?, install_artifact_step.dest_sub_path) });
 
+        watch_run.addArgs(&.{ "--cart", b.getInstallPath(install_artifact_step.dest_dir.?, install_artifact_step.dest_sub_path) });
         return watch_run;
     }
 };
@@ -183,22 +183,18 @@ pub fn add_cart(
         .target = wasm_target,
         .optimize = options.optimize,
     });
-
     wasm.entry = .disabled;
     wasm.import_memory = true;
     wasm.initial_memory = 64 * 65536;
     wasm.max_memory = 64 * 65536;
     wasm.stack_size = 14752;
     wasm.global_base = 160 * 128 * 2 + 0x1e;
-
     wasm.rdynamic = true;
     wasm.root_module.addImport("cart-api", d.module("cart-api"));
 
     const microzig_dep = d.builder.dependency("microzig", .{});
     const mb = MicroBuild.init(d.builder, microzig_dep) orelse return null;
-
     const sycl_badge_target = sycl_badge_microzig_target(mb);
-
     const cart_lib = b.addStaticLibrary(.{
         .name = "cart",
         .root_source_file = options.root_source_file,
@@ -232,6 +228,7 @@ pub fn add_cart(
         .cart_lib = cart_lib,
         .options = options,
     };
+
     return cart;
 }
 

build.zig.zon

@@ -19,9 +19,8 @@
             .hash = "zigimg-0.1.0-8_eo2lrXEgBlEihqJdiw_ZtxgL-vO72ajJpmOdO59qxp",
         },
         .microzig = .{
-            //.url = "git+https://github.com/zigEmbeddedGroup/microzig#ec738a03fe0000c9cba1e3633aac5e2fc8024875",
-            //.hash = "microzig-0.14.2-D20YSac--gD-H2ujNAL4m5IvkYOWYlgO7SlU1j8fJbeX",
-            .path = "../microzig",
+            .url = "git+https://github.com/ZigEmbeddedGroup/microzig#cbbe44943a1f877329214c5697b482d9f3c3b57a",
+            .hash = "microzig-0.14.2-D20YScPb-gAGfmER_MCmiyaGjAdhSL-zll6VWvUm_Vz8",
         },
         .ws = .{
             .url = "git+https://github.com/karlseguin/websocket.zig#7240830dc8d1ab426d408cb76144794169943aa9",

src/watch/Reloader.zig

@@ -12,7 +12,7 @@ const Watcher = switch (builtin.target.os.tag) {
 };
 
 gpa: std.mem.Allocator,
-//ws_server: ws.Server(WsHandler),
+ws_server: ws.Server,
 zig_exe: []const u8,
 watcher: Watcher,
 output_dir_index: usize,
@@ -25,12 +25,12 @@ pub fn init(
     zig_exe: []const u8,
     dirs_to_watch: []const []const u8,
 ) !Reloader {
-    //const ws_server = try ws.Server.init(gpa, .{});
+    const ws_server = try ws.Server.init(gpa, .{});
 
     return .{
         .gpa = gpa,
         .zig_exe = zig_exe,
-        // .ws_server = ws_server,
+        .ws_server = ws_server,
         .watcher = try Watcher.init(gpa, dirs_to_watch),
         .output_dir_index = dirs_to_watch.len - 1,
     };
@@ -121,10 +121,7 @@ pub fn onChange(reloader: *Reloader, dir_that_changed: usize) void {
     }
 }
 
-const WsHandler = struct {};
-
 pub fn handleWs(reloader: *Reloader, stream: std.net.Stream, h: [20]u8) void {
-    _ = reloader;
     var buf =
         ("HTTP/1.1 101 Switching Protocols\r\n" ++
             "Access-Control-Allow-Origin: *\r\n" ++
@@ -137,13 +134,12 @@ pub fn handleWs(reloader: *Reloader, stream: std.net.Stream, h: [20]u8) void {
 
     stream.writeAll(&buf) catch @panic("bad");
 
-    // var conn = reloader.ws_server.newConn(stream);
-    // const conn = reloader.gpa.create(ws.Conn) catch @panic("bad");
-    // conn.* = reloader.ws_server.newConn(stream);
+    const conn = reloader.gpa.create(ws.Conn) catch @panic("bad");
+    conn.* = reloader.ws_server.newConn(stream);
 
-    // var context: Handler.Context = .{ .watcher = reloader };
-    // var handler = Handler.init(undefined, conn, &context) catch @panic("bad");
-    // reloader.ws_server.handle(Handler, &handler, conn);
+    var context: Handler.Context = .{ .watcher = reloader };
+    var handler = Handler.init(undefined, conn, &context) catch @panic("bad");
+    reloader.ws_server.handle(Handler, &handler, conn);
 }
 
 const Handler = struct {

src/watch/main.zig

@@ -237,7 +237,7 @@ fn serve(s: *Server, cart_path: []const u8, listen_port: u16) !void {
     const server_port = tcp_server.listen_address.in.getPort();
     std.debug.assert(server_port == listen_port);
 
-    std.debug.print("\x1b[2K\rSimulator live! Go to https://badgesim.microzig.tech/ to test your cartridge.\n", .{});
+    std.debug.print("\x1b[2K\rSimulator live! Go to https://zigembeddedgroup.github.io/sycl-badge/ to test your cartridge.\n", .{});
 
     var buffer: [1024]u8 = undefined;
     accept: while (true) {