From 423c886d2ec9d78579afcf6dfef47528c188487d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Quei=C3=9Fner?= Date: Sat, 28 May 2022 10:37:14 +0200 Subject: [PATCH] Master update (#51) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Adds logo * Update to latest master. Co-authored-by: Felix "xq" Queißner --- design/logo-text-inkscape-variant-1.svg | 64 +++++++++++++++++++++++++ design/logo-text-inkscape-variant-2.svg | 64 +++++++++++++++++++++++++ design/logo-text-inkscape.svg | 64 +++++++++++++++++++++++++ design/logo-text-variant-1.svg | 15 ++++++ design/logo-text-variant-2.svg | 15 ++++++ design/logo.svg | 9 ++++ src/main.zig | 20 ++++---- 7 files changed, 241 insertions(+), 10 deletions(-) create mode 100644 design/logo-text-inkscape-variant-1.svg create mode 100644 design/logo-text-inkscape-variant-2.svg create mode 100644 design/logo-text-inkscape.svg create mode 100644 design/logo-text-variant-1.svg create mode 100644 design/logo-text-variant-2.svg create mode 100644 design/logo.svg diff --git a/design/logo-text-inkscape-variant-1.svg b/design/logo-text-inkscape-variant-1.svg new file mode 100644 index 0000000..f26743e --- /dev/null +++ b/design/logo-text-inkscape-variant-1.svg @@ -0,0 +1,64 @@ + + + + + + + + + MicroZig + + diff --git a/design/logo-text-inkscape-variant-2.svg b/design/logo-text-inkscape-variant-2.svg new file mode 100644 index 0000000..875cef6 --- /dev/null +++ b/design/logo-text-inkscape-variant-2.svg @@ -0,0 +1,64 @@ + + + + + + + + + MicroZig + + diff --git a/design/logo-text-inkscape.svg b/design/logo-text-inkscape.svg new file mode 100644 index 0000000..69dba8b --- /dev/null +++ b/design/logo-text-inkscape.svg @@ -0,0 +1,64 @@ + + + + + + + + + MicroZig + + diff --git a/design/logo-text-variant-1.svg b/design/logo-text-variant-1.svg new file mode 100644 index 0000000..530592f --- /dev/null +++ b/design/logo-text-variant-1.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/design/logo-text-variant-2.svg b/design/logo-text-variant-2.svg new file mode 100644 index 0000000..9a732cb --- /dev/null +++ b/design/logo-text-variant-2.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/design/logo.svg b/design/logo.svg new file mode 100644 index 0000000..3e5f419 --- /dev/null +++ b/design/logo.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/main.zig b/src/main.zig index afd868a..cd30986 100644 --- a/src/main.zig +++ b/src/main.zig @@ -108,18 +108,18 @@ pub fn addEmbeddedExecutable( const config_pkg = Pkg{ .name = "microzig-config", - .path = .{ .path = config_file_name }, + .source = .{ .path = config_file_name }, }; const chip_pkg = Pkg{ .name = "chip", - .path = .{ .path = chip.path }, + .source = .{ .path = chip.path }, .dependencies = &.{pkgs.microzig}, }; const cpu_pkg = Pkg{ .name = "cpu", - .path = .{ .path = chip.cpu.path }, + .source = .{ .path = chip.cpu.path }, .dependencies = &.{pkgs.microzig}, }; @@ -148,7 +148,7 @@ pub fn addEmbeddedExecutable( break :blk std.build.Pkg{ .name = "app", - .path = .{ .path = source }, + .source = .{ .path = source }, .dependencies = app_pkgs.items, }; }; @@ -163,7 +163,7 @@ pub fn addEmbeddedExecutable( if (options.hal_package_path) |hal_package_path| exe.addPackage(.{ .name = "hal", - .path = hal_package_path, + .source = hal_package_path, .dependencies = &.{pkgs.microzig}, }); @@ -171,7 +171,7 @@ pub fn addEmbeddedExecutable( .board => |board| { exe.addPackage(std.build.Pkg{ .name = "board", - .path = .{ .path = board.path }, + .source = .{ .path = board.path }, .dependencies = &.{pkgs.microzig}, }); }, @@ -184,12 +184,12 @@ pub fn addEmbeddedExecutable( const pkgs = struct { const mmio = std.build.Pkg{ .name = "microzig-mmio", - .path = .{ .path = root_path ++ "core/mmio.zig" }, + .source = .{ .path = root_path ++ "core/mmio.zig" }, }; const microzig = std.build.Pkg{ .name = "microzig", - .path = .{ .path = root_path ++ "core/import-package.zig" }, + .source = .{ .path = root_path ++ "core/import-package.zig" }, }; }; @@ -197,13 +197,13 @@ const pkgs = struct { pub const drivers = struct { pub const quadrature = std.build.Pkg{ .name = "microzig.quadrature", - .path = .{ .path = root_path ++ "drivers/quadrature.zig" }, + .source = .{ .path = root_path ++ "drivers/quadrature.zig" }, .dependencies = &.{pkgs.microzig}, }; pub const button = std.build.Pkg{ .name = "microzig.button", - .path = .{ .path = root_path ++ "drivers/button.zig" }, + .source = .{ .path = root_path ++ "drivers/button.zig" }, .dependencies = &.{pkgs.microzig}, }; };