ElicMagus
/
microzig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Master update (#51)

Browse Source 
* Adds logo

* Update to latest master.

Co-authored-by: Felix "xq" Queißner <git@masterq32.de>
wch-ch32v003
Felix Queißner 2 years ago committed by GitHub
parent d253056c71
commit 423c886d2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 241 additions and 10 deletions
Show Stats Download Patch File Download Diff File

64
design/logo-text-inkscape-variant-1.svg
Unescape Escape View File

@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="446mm"
height="120mm"
viewBox="0 0 446 120"
version="1.1"
id="svg5"
inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
sodipodi:docname="logo-text-inkscape-variant-1.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview7"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:document-units="mm"
showgrid="false"
inkscape:zoom="0.38689959"
inkscape:cx="829.67263"
inkscape:cy="85.293448"
inkscape:window-width="1920"
inkscape:window-height="1057"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="layer1" />
<defs
id="defs2" />
<g
inkscape:label="Ebene 1"
inkscape:groupmode="layer"
id="layer1">
<image
preserveAspectRatio="none"
inkscape:svg-dpi="96"
width="112.7125"
height="112.7125"
xlink:href="logo.svg"
id="image896"
x="4.4005466"
y="3.6437492" />
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:102.597px;line-height:1.25;font-family:'Dash Horizon';-inkscape-font-specification:'Dash Horizon, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.61326"
x="116.56063"
y="91.984642"
id="text1714"
transform="scale(0.97877737,1.0216828)"><tspan
sodipodi:role="line"
id="tspan1712"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:102.597px;font-family:'Dash Horizon';-inkscape-font-specification:'Dash Horizon, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:2.61326"
x="116.56063"
y="91.984642">MicroZig</tspan></text>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

64
design/logo-text-inkscape-variant-2.svg
Unescape Escape View File

@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="778mm"
height="120mm"
viewBox="0 0 778 120"
version="1.1"
id="svg5"
inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
sodipodi:docname="logo-text-inkscape-variant-2.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview7"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:document-units="mm"
showgrid="false"
inkscape:zoom="0.30448145"
inkscape:cx="1855.6139"
inkscape:cy="193.77207"
inkscape:window-width="1920"
inkscape:window-height="1057"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="layer1" />
<defs
id="defs2" />
<g
inkscape:label="Ebene 1"
inkscape:groupmode="layer"
id="layer1">
<image
preserveAspectRatio="none"
inkscape:svg-dpi="96"
width="112.7125"
height="112.7125"
xlink:href="logo.svg"
id="image896"
x="4.4005466"
y="3.6437492" />
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:128.17px;line-height:1.25;font-family:'8-bit Operator+ 8';-inkscape-font-specification:'8-bit Operator+ 8, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.26462"
x="115.5157"
y="97.499298"
id="text1714"
transform="scale(0.97877737,1.0216828)"><tspan
sodipodi:role="line"
id="tspan1712"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:128.17px;font-family:'8-bit Operator+ 8';-inkscape-font-specification:'8-bit Operator+ 8, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:3.26462"
x="115.5157"
y="97.499298">MicroZig</tspan></text>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

64
design/logo-text-inkscape.svg
Unescape Escape View File

@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="900mm"
height="120mm"
viewBox="0 0 900 120"
version="1.1"
id="svg5"
inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
sodipodi:docname="logo-text-inkscape.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview7"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:document-units="mm"
showgrid="false"
inkscape:zoom="0.38689959"
inkscape:cx="829.67263"
inkscape:cy="85.293448"
inkscape:window-width="1920"
inkscape:window-height="1057"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="layer1" />
<defs
id="defs2" />
<g
inkscape:label="Ebene 1"
inkscape:groupmode="layer"
id="layer1">
<image
preserveAspectRatio="none"
inkscape:svg-dpi="96"
width="112.7125"
height="112.7125"
xlink:href="logo.svg"
id="image896"
x="4.4005466"
y="3.6437492" />
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:102.597px;line-height:1.25;font-family:'Dash Horizon';-inkscape-font-specification:'Dash Horizon, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.61326"
x="116.56063"
y="91.984642"
id="text1714"
transform="scale(0.97877737,1.0216828)"><tspan
sodipodi:role="line"
id="tspan1712"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:102.597px;font-family:'Dash Horizon';-inkscape-font-specification:'Dash Horizon, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:2.61326"
x="116.56063"
y="91.984642">MicroZig</tspan></text>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

15
design/logo-text-variant-1.svg
Unescape Escape View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg width="446mm" height="120mm" version="1.1" viewBox="0 0 446 120" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<image x="4.4005" y="3.6437" width="112.71" height="112.71" preserveAspectRatio="none" xlink:href="file:///home/felix/projects/zeg/microzig/design/logo.svg"/>
<g transform="scale(.97878 1.0217)" stroke-width="2.6133" aria-label="MicroZig">
<path d="m156.68 58.333-2.7701-39.089h-21.545l7.0792 8.6181-21.648 82.898 17.852-18.775 8.8233-33.96 2.5649 27.701h5.335l16.723-26.573-8.413 32.831h12.927l19.083-72.741h-12.209z"/>
<path d="m194.33 43.661h12.517l3.0779-11.696h-12.517zm-12.619 48.836h11.901l12.106-44.937h-12.106z"/>
<path d="m238.55 47.56h-17.441c-4.4117 0-8.5156 1.6416-9.5415 6.361-1.6416 5.335-8.2078 28.214-8.2078 32.113 0 4.4117 3.3857 5.848 7.1818 5.848h17.441c11.08 0 11.183-12.209 13.44-20.417l-13.851 6.5662-1.026 4.4117h-10.465l6.6688-25.547h10.465l-1.026 3.6935 10.773 5.1298c0.92337-3.6935 3.0779-8.8233 3.0779-12.722 0-4.1039-4.0013-5.4376-7.4896-5.4376z"/>
<path d="m280.2 47.458c-4.0013 0-8.1052 0.51298-11.799 0.71818l0.20519-0.61558h-20.93l6.4636 8.1052-9.0285 36.217h11.593l9.2337-34.575h8.6182l-2.5649 9.5415 13.543-5.2324c0.61559-2.8727 2.2571-6.0532 2.2571-8.8233 0-4.3091-4.1039-5.335-7.5922-5.335z"/>
<path d="m319.7 47.56h-18.57c-4.4117 0-8.413 1.6416-9.5415 6.361-1.539 5.7454-8.2078 28.317-8.2078 32.728 0 4.1039 3.6935 5.2324 7.2844 5.2324h18.467c4.5143 0 8.413-1.7441 9.7467-6.361 1.2312-4.8221 8.413-29.138 8.413-32.523 0-4.1039-4.0013-5.4376-7.5922-5.4376zm-5.5402 9.3363-6.6688 25.547h-11.286l6.6688-25.547z"/>
<path d="m384.24 19.243h-53.863l12.927 10.362h21.648l-39.192 55.608-1.3338 6.7714h52.427l-9.5415-10.362h-24.418l39.5-55.71z"/>
<path d="m392.34 43.661h12.517l3.0779-11.696h-12.517zm-12.619 48.836h11.901l12.106-44.937h-12.106z"/>
<path d="m432.35 48.278c-3.6935-0.30779-7.387-0.82078-11.183-0.82078-6.1558 0-12.927 3.4883-14.774 9.8493-1.8468 6.6688-6.361 18.878-6.361 25.752 0 10.26 13.953 8.8233 20.519 8.8233l-1.4364 5.5402h-14.569l-9.6441 9.3363h25.854c3.6935 0 8.8233-2.1545 9.7467-6.1558l14.158-53.043h-12.106zm-9.2337 34.165h-8.413c-0.51298 0-2.3597 0-2.6675-0.61558 2.1545-7.387 3.8987-14.979 5.848-22.161 0.61558-2.3597 3.0779-2.8727 5.0272-2.8727 2.2571 0 4.8221 0.1026 7.0792 0.30779z"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

15
design/logo-text-variant-2.svg
Unescape Escape View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg width="778mm" height="120mm" version="1.1" viewBox="0 0 778 120" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<image x="4.4005" y="3.6437" width="112.71" height="112.71" preserveAspectRatio="none" xlink:href="file:///home/felix/projects/zeg/microzig/design/logo.svg"/>
<g transform="scale(.97878 1.0217)" stroke-width="3.2646" aria-label="MicroZig">
<path d="m126.64 97.499v-77.881h11.126v11.126h11.126v11.126h11.126v11.126h11.126v-11.126h11.126v-11.126h11.126v-11.126h11.126v77.881h-22.252v-33.378h-11.126v11.126h-11.126v-11.126h-11.126v33.378z"/>
<path d="m237.9 52.996h-11.126v-11.126h33.378v44.503h11.126v11.126h-44.503v-11.126h11.126zm22.252-33.378v11.126h-22.252v-11.126z"/>
<path d="m338.03 86.373v-11.126h22.252v11.126h-11.126v11.126h-44.503v-11.126h-11.126v-33.378h11.126v-11.126h44.503v11.126h11.126v11.126h-22.252v-11.126h-22.252v33.378z"/>
<path d="m404.79 52.996v44.503h-22.252v-55.629h55.629v11.126h11.126v22.252h-22.252v-22.252z"/>
<path d="m493.8 86.373h22.252v-33.378h-22.252zm33.378 0v11.126h-44.503v-11.126h-11.126v-33.378h11.126v-11.126h44.503v11.126h11.126v33.378z"/>
<path d="m605.05 30.744h-44.503v-11.126h66.755v22.252h-11.126v11.126h-11.126v11.126h-11.126v11.126h-11.126v11.126h44.503v11.126h-66.755v-22.252h11.126v-11.126h11.126v-11.126h11.126v-11.126h11.126z"/>
<path d="m660.68 52.996h-11.126v-11.126h33.378v44.503h11.126v11.126h-44.503v-11.126h11.126zm22.252-33.378v11.126h-22.252v-11.126z"/>
<path d="m727.44 52.996v-11.126h55.629v55.629h-11.126v11.126h-44.503v-11.126h33.378v-11.126h-33.378v-11.126h-11.126v-22.252zm33.378 0h-22.252v22.252h22.252z"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

9
design/logo.svg
Unescape Escape View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg enable-background="new 0 0 426 426" version="1.1" viewBox="0 0 426 426" xmlns="http://www.w3.org/2000/svg">
<g>
<path d="m110.24 10v49.152h20v-49.152zm46.381 0v49.152h20v-49.152zm46.381 0v49.152h20v-49.152zm46.381 0v49.152h20v-49.152zm46.381 0v49.152h20v-49.152zm-285.76 100.24v20h49.152c2e-5 -5.5231-1.6e-5 -14.377 0-20zm356.85 0c-1e-5 7.1146 0 13.71 0 20h49.152v-20zm-356.85 46.381v20h49.152c2.2e-5 -5.6032-2.3e-5 -14.485 0-20zm356.85 0c-1e-5 5.5031 1e-5 14.865 0 20h49.152v-20zm-356.85 46.381v20h49.152c1.4e-5 -6.1178-1.9e-5 -14.157 0-20zm356.85 0c-2e-5 4.9502 2e-5 14.962 0 20h49.152v-20zm-356.85 46.381v20h49.152c-4e-6 -7.0669-5e-6 -13.396 0-20zm356.85 0c-3e-5 5.4558 3e-5 14 0 20h49.152v-20zm-356.85 46.381v20h49.152c-3.4e-5 -8.4505 1.9e-5 -12.199 0-20zm356.85 0c-5e-5 7.0199 5e-5 11.979 0 20h49.152v-20zm-256.61 71.086v49.152h20v-49.152zm46.381 0v49.152h20v-49.152zm46.381 0v49.152h20v-49.152zm46.381 0v49.152h20v-49.152zm46.381 0v49.152h20v-49.152z" fill="#acacac"/>
<path d="m366.85 69.152c0-5.523-4.477-10-10-10h-287.7c-5.523 0-10 4.477-10 10 0 87.467-9.83e-4 143.29 0 287.7 0 5.523 4.477 10 10 10h287.7c5.523 0 10-4.477 10-10 1e-3 -153.85 1e-3 -152.1 1e-3 -287.7z" fill="#262626"/>
<path d="m307.5 202.77c-0.88451-2.3688-3.1503-3.944-5.6827-3.944h-73.154l42.196-82.042c1.3268-2.5808 0.64218-5.7372-1.6418-7.5305-1.1026-0.8724-2.4294-1.3025-3.7501-1.3025-1.4116 0-2.8232 0.49678-3.9561 1.4722l-133.28 115.11c-1.9144 1.6539-2.6051 4.3256-1.7206 6.6944 0.88452 2.3688 3.1443 3.95 5.6766 3.95h73.154l-42.196 82.042c-1.3268 2.5808-0.64218 5.7372 1.6418 7.5305 1.1026 0.87239 2.4294 1.3025 3.7501 1.3025 1.4116 0 2.8232-0.49678 3.9561-1.4722l133.28-115.11c1.9205-1.6539 2.6051-4.3256 1.7266-6.7005z" fill="#393939" stroke-width="6.0583"/>
</g>
<path d="m303.5 198.77c-0.88451-2.3688-3.1503-3.944-5.6827-3.944h-73.154l42.196-82.042c1.3268-2.5808 0.64218-5.7372-1.6418-7.5305-1.1026-0.8724-2.4294-1.3025-3.7501-1.3025-1.4116 0-2.8232 0.49678-3.9561 1.4722l-133.28 115.11c-1.9144 1.6539-2.6051 4.3256-1.7206 6.6944 0.88452 2.3688 3.1443 3.95 5.6766 3.95h73.154l-42.196 82.042c-1.3268 2.5808-0.64218 5.7372 1.6418 7.5305 1.1026 0.87239 2.4294 1.3025 3.7501 1.3025 1.4116 0 2.8232-0.49678 3.9561-1.4722l133.28-115.11c1.9205-1.6539 2.6051-4.3256 1.7266-6.7005z" fill="#ffac33" stroke-width="6.0583"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

20
src/main.zig
Unescape Escape View File

@ -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},
};
};

Write Preview
Loading…
Cancel
Save