Skip to content

Commit

Permalink
Master update (#51)
Browse files Browse the repository at this point in the history
* Adds logo

* Update to latest master.

Co-authored-by: Felix "xq" Queißner <git@masterq32.de>
  • Loading branch information
ikskuh and Felix "xq" Queißner authored May 28, 2022
1 parent d253056 commit 423c886
Show file tree
Hide file tree
Showing 7 changed files with 241 additions and 10 deletions.
64 changes: 64 additions & 0 deletions design/logo-text-inkscape-variant-1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
64 changes: 64 additions & 0 deletions design/logo-text-inkscape-variant-2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
64 changes: 64 additions & 0 deletions design/logo-text-inkscape.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions design/logo-text-variant-1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions design/logo-text-variant-2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions design/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 10 additions & 10 deletions src/main.zig
Original file line number Diff line number Diff line change
Expand Up @@ -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},
};

Expand Down Expand Up @@ -148,7 +148,7 @@ pub fn addEmbeddedExecutable(

break :blk std.build.Pkg{
.name = "app",
.path = .{ .path = source },
.source = .{ .path = source },
.dependencies = app_pkgs.items,
};
};
Expand All @@ -163,15 +163,15 @@ 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},
});

switch (backing) {
.board => |board| {
exe.addPackage(std.build.Pkg{
.name = "board",
.path = .{ .path = board.path },
.source = .{ .path = board.path },
.dependencies = &.{pkgs.microzig},
});
},
Expand All @@ -184,26 +184,26 @@ 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" },
};
};

/// Generic purpose drivers shipped with microzig
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},
};
};

0 comments on commit 423c886

Please sign in to comment.