From 58d73abc08952aac55301bd1ac66af49a3022711 Mon Sep 17 00:00:00 2001 From: Matt Knight Date: Fri, 24 Feb 2023 09:12:22 -0800 Subject: [PATCH] Update microzig (#24) * update microzig * update paths and for loops --------- Co-authored-by: mattnite --- build.zig | 2 +- deps/microzig | 2 +- src/boards.zig | 2 +- src/chips.zig | 2 +- src/hal/adc.zig | 4 ++-- src/hal/pins.zig | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.zig b/build.zig index 51bb874..a0ed86c 100644 --- a/build.zig +++ b/build.zig @@ -3,7 +3,7 @@ const Builder = std.build.Builder; const Pkg = std.build.Pkg; const comptimePrint = std.fmt.comptimePrint; -pub const microzig = @import("deps/microzig/src/main.zig"); +pub const microzig = @import("deps/microzig/build.zig"); const chips = @import("src/chips.zig"); const boards = @import("src/boards.zig"); diff --git a/deps/microzig b/deps/microzig index 4bb6561..11214ed 160000 --- a/deps/microzig +++ b/deps/microzig @@ -1 +1 @@ -Subproject commit 4bb65617a47dc30282ffe340cc45d202b973650b +Subproject commit 11214ed8ba05e380a516beef3f3f594571a1c732 diff --git a/src/boards.zig b/src/boards.zig index 4329182..ebbf0d8 100644 --- a/src/boards.zig +++ b/src/boards.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const microzig = @import("../deps/microzig/src/main.zig"); +const microzig = @import("../deps/microzig/build.zig"); const chips = @import("chips.zig"); fn root_dir() []const u8 { diff --git a/src/chips.zig b/src/chips.zig index 5e0d39a..8363cea 100644 --- a/src/chips.zig +++ b/src/chips.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const microzig = @import("../deps/microzig/src/main.zig"); +const microzig = @import("../deps/microzig/build.zig"); fn root_dir() []const u8 { return std.fs.path.dirname(@src().file) orelse "."; diff --git a/src/hal/adc.zig b/src/hal/adc.zig index 1746ccc..ba293b0 100644 --- a/src/hal/adc.zig +++ b/src/hal/adc.zig @@ -83,8 +83,8 @@ pub const InputMask = InputMask: { var fields: [enum_fields.len]std.builtin.Type.StructField = undefined; const default_value: u1 = 0; - for (enum_fields) |enum_field, i| - fields[i] = std.builtin.Type.StructField{ + for (enum_fields, &fields) |enum_field, *field| + field = std.builtin.Type.StructField{ .name = enum_field.name, .field_type = u1, .default_value = &default_value, diff --git a/src/hal/pins.zig b/src/hal/pins.zig index 24b9d7a..7a204b8 100644 --- a/src/hal/pins.zig +++ b/src/hal/pins.zig @@ -237,7 +237,7 @@ pub const Function = enum { fn all() [30]u1 { var ret: [30]u1 = undefined; - for (ret) |*elem| + for (&ret) |*elem| elem.* = 1; return ret;