summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md8
-rw-r--r--artifacts/meson.build23
-rw-r--r--fw/sim/meson.build1
-rw-r--r--meson.build36
-rw-r--r--pcb/ethernet.kicad_sch186
-rw-r--r--pcb/iot-contact.kicad_sch455
-rw-r--r--pcb/meson.build2
-rw-r--r--pcb/power.kicad_sch383
-rw-r--r--pcb/processor.kicad_sch321
-rwxr-xr-xtools/deploy.py.in (renamed from tools/deploy.py)11
-rw-r--r--tools/meson.build8
-rw-r--r--web/.gitignore2
-rw-r--r--web/index.html12
-rw-r--r--web/meson.build1
14 files changed, 1296 insertions, 153 deletions
diff --git a/README.md b/README.md
index a6dfe0a..356feeb 100644
--- a/README.md
+++ b/README.md
@@ -28,14 +28,14 @@ meson setup build
ninja -C build
```
-The resulting artifacts can be listed with `tree`.
+All artifacts of the build are bundled in a tar archive file.
```
-tree build/artifacts
+tar -tf build/iot-contact-v*.tar.zst
```
-These artifacts are organized as static website. It can be opened with Firefox.
+This archive file can be deployed with the `deploy.py` script.
```
-firefox build/artifacts/index.html
+./build/tools/deploy.py
```
diff --git a/artifacts/meson.build b/artifacts/meson.build
deleted file mode 100644
index ac15661..0000000
--- a/artifacts/meson.build
+++ /dev/null
@@ -1,23 +0,0 @@
-artifacts = [
- index_html,
- css,
- schematic,
- bom,
- simulation,
- update_image,
- factory_image,
- kicad_pcb,
-]
-
-foreach artifact : artifacts
- custom_target(
- output: [fs.name(artifact.full_path())],
- command: [
- cp,
- artifact.full_path(),
- meson.current_build_dir(),
- ],
- depends: artifact,
- build_by_default: true,
- )
-endforeach
diff --git a/fw/sim/meson.build b/fw/sim/meson.build
index 5edcad9..2e0b4fa 100644
--- a/fw/sim/meson.build
+++ b/fw/sim/meson.build
@@ -20,5 +20,4 @@ simulation = custom_target(
'--binary-name', 'zephyr.exe',
'--target-name', 'simulation-linux-amd64.exe',
],
- build_by_default: true,
)
diff --git a/meson.build b/meson.build
index 9b7d7c1..7549940 100644
--- a/meson.build
+++ b/meson.build
@@ -1,13 +1,41 @@
-project('iot-contact')
+project(
+ 'iot-contact',
+ version : '0.0.0-dev',
+)
-cp = find_program('cp', required : true)
+tar = find_program('tar', required : true)
fs = import('fs')
+project_version_string = meson.project_name() + '-v' + meson.project_version()
+
+html = fs.copyfile(meson.current_source_dir() / 'web' / 'index.html')
css = fs.copyfile(meson.current_source_dir() / 'simple.css' / 'simple.css')
subdir('tools')
subdir('fw')
subdir('pcb')
-subdir('web')
-subdir('artifacts')
+
+artifacts = [
+ html,
+ css,
+ schematic,
+ bom,
+ simulation,
+ update_image,
+ factory_image,
+ kicad_pcb,
+]
+
+custom_target(
+ output: project_version_string + '.tar.zst',
+ command: [
+ tar,
+ '--zstd',
+ '--transform=s|^|' + project_version_string + '/|',
+ '-cf', '@OUTPUT@',
+ artifacts,
+ ],
+ depends: artifacts,
+ build_by_default: true,
+)
diff --git a/pcb/ethernet.kicad_sch b/pcb/ethernet.kicad_sch
index 3c8fe9f..80e9d42 100644
--- a/pcb/ethernet.kicad_sch
+++ b/pcb/ethernet.kicad_sch
@@ -1475,6 +1475,107 @@
)
(embedded_fonts no)
)
+ (symbol "power:PWR_FLAG"
+ (power)
+ (pin_numbers
+ (hide yes)
+ )
+ (pin_names
+ (offset 0)
+ (hide yes)
+ )
+ (exclude_from_sim no)
+ (in_bom yes)
+ (on_board yes)
+ (property "Reference" "#FLG"
+ (at 0 1.905 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Value" "PWR_FLAG"
+ (at 0 3.81 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ )
+ )
+ (property "Footprint" ""
+ (at 0 0 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Datasheet" "~"
+ (at 0 0 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Description" "Special symbol for telling ERC where power comes from"
+ (at 0 0 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "ki_keywords" "flag power"
+ (at 0 0 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (symbol "PWR_FLAG_0_0"
+ (pin power_out line
+ (at 0 0 90)
+ (length 0)
+ (name "~"
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ )
+ )
+ (number "1"
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ )
+ )
+ )
+ )
+ (symbol "PWR_FLAG_0_1"
+ (polyline
+ (pts
+ (xy 0 0) (xy 0 1.27) (xy -1.016 1.905) (xy 0 2.54) (xy 1.016 1.905) (xy 0 1.27)
+ )
+ (stroke
+ (width 0)
+ (type default)
+ )
+ (fill
+ (type none)
+ )
+ )
+ )
+ (embedded_fonts no)
+ )
)
(junction
(at 165.1 63.5)
@@ -1495,6 +1596,12 @@
(uuid "5fe26455-8889-46cf-97de-5513a83176ea")
)
(junction
+ (at 165.1 54.61)
+ (diameter 0)
+ (color 0 0 0 0)
+ (uuid "63a517ab-094f-4a1c-a136-b9886163f790")
+ )
+ (junction
(at 134.62 44.45)
(diameter 0)
(color 0 0 0 0)
@@ -1914,6 +2021,16 @@
)
(wire
(pts
+ (xy 165.1 54.61) (xy 165.1 63.5)
+ )
+ (stroke
+ (width 0)
+ (type default)
+ )
+ (uuid "89c3767a-88ae-479f-9da2-8f4a5edd3ff7")
+ )
+ (wire
+ (pts
(xy 165.1 45.72) (xy 165.1 39.37)
)
(stroke
@@ -2054,7 +2171,7 @@
)
(wire
(pts
- (xy 165.1 53.34) (xy 165.1 63.5)
+ (xy 165.1 53.34) (xy 165.1 54.61)
)
(stroke
(width 0)
@@ -4069,6 +4186,73 @@
)
)
(symbol
+ (lib_id "power:PWR_FLAG")
+ (at 165.1 54.61 270)
+ (unit 1)
+ (exclude_from_sim no)
+ (in_bom yes)
+ (on_board yes)
+ (dnp no)
+ (fields_autoplaced yes)
+ (uuid "d291b17e-be56-4027-b4c3-40d2fef1c814")
+ (property "Reference" "#FLG02"
+ (at 167.005 54.61 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Value" "PWR_FLAG"
+ (at 168.91 54.6099 90)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (justify left)
+ )
+ )
+ (property "Footprint" ""
+ (at 165.1 54.61 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Datasheet" "~"
+ (at 165.1 54.61 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Description" "Special symbol for telling ERC where power comes from"
+ (at 165.1 54.61 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (pin "1"
+ (uuid "cedc59c7-ce07-4a4b-999b-6b61984b054e")
+ )
+ (instances
+ (project ""
+ (path "/5defd195-0277-4d04-9f5f-69e505c9845c/3f49bcfb-bae6-46ff-af40-a6657170aa94"
+ (reference "#FLG02")
+ (unit 1)
+ )
+ )
+ )
+ )
+ (symbol
(lib_id "power:GND")
(at 104.14 55.88 0)
(unit 1)
diff --git a/pcb/iot-contact.kicad_sch b/pcb/iot-contact.kicad_sch
index c4414c0..7536bd6 100644
--- a/pcb/iot-contact.kicad_sch
+++ b/pcb/iot-contact.kicad_sch
@@ -4702,6 +4702,107 @@
)
(embedded_fonts no)
)
+ (symbol "power:PWR_FLAG"
+ (power)
+ (pin_numbers
+ (hide yes)
+ )
+ (pin_names
+ (offset 0)
+ (hide yes)
+ )
+ (exclude_from_sim no)
+ (in_bom yes)
+ (on_board yes)
+ (property "Reference" "#FLG"
+ (at 0 1.905 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Value" "PWR_FLAG"
+ (at 0 3.81 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ )
+ )
+ (property "Footprint" ""
+ (at 0 0 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Datasheet" "~"
+ (at 0 0 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Description" "Special symbol for telling ERC where power comes from"
+ (at 0 0 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "ki_keywords" "flag power"
+ (at 0 0 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (symbol "PWR_FLAG_0_0"
+ (pin power_out line
+ (at 0 0 90)
+ (length 0)
+ (name "~"
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ )
+ )
+ (number "1"
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ )
+ )
+ )
+ )
+ (symbol "PWR_FLAG_0_1"
+ (polyline
+ (pts
+ (xy 0 0) (xy 0 1.27) (xy -1.016 1.905) (xy 0 2.54) (xy 1.016 1.905) (xy 0 1.27)
+ )
+ (stroke
+ (width 0)
+ (type default)
+ )
+ (fill
+ (type none)
+ )
+ )
+ )
+ (embedded_fonts no)
+ )
)
(junction
(at 120.65 148.59)
@@ -4710,7 +4811,7 @@
(uuid "189c037d-87e6-4632-a2b6-8730223eefc5")
)
(junction
- (at 250.19 104.14)
+ (at 250.19 111.76)
(diameter 0)
(color 0 0 0 0)
(uuid "19b572eb-ee9d-489a-ab3a-d4c263778301")
@@ -4722,19 +4823,37 @@
(uuid "312e89d2-fdb5-496d-bf16-ed926f9db3fb")
)
(junction
+ (at 242.57 78.74)
+ (diameter 0)
+ (color 0 0 0 0)
+ (uuid "33b356df-d048-4df0-96e4-8c1ea206c9dc")
+ )
+ (junction
+ (at 250.19 114.3)
+ (diameter 0)
+ (color 0 0 0 0)
+ (uuid "470e8419-e3be-4ba0-aea1-7189d12831dc")
+ )
+ (junction
(at 158.75 139.7)
(diameter 0)
(color 0 0 0 0)
(uuid "724f0699-6e99-4c5f-a95b-4fb06bb9adc0")
)
(junction
+ (at 252.73 88.9)
+ (diameter 0)
+ (color 0 0 0 0)
+ (uuid "c1071eb4-1ac7-4082-ba94-41a2f34f1aad")
+ )
+ (junction
(at 241.3 135.89)
(diameter 0)
(color 0 0 0 0)
(uuid "c9c17fd6-022b-441f-ad8f-c18a54dfa220")
)
(junction
- (at 252.73 85.09)
+ (at 252.73 93.98)
(diameter 0)
(color 0 0 0 0)
(uuid "dc9dc98c-eb87-4c30-bd09-122472ac71d5")
@@ -4803,7 +4922,7 @@
)
(wire
(pts
- (xy 234.95 99.06) (xy 257.81 99.06)
+ (xy 234.95 106.68) (xy 257.81 106.68)
)
(stroke
(width 0)
@@ -4813,7 +4932,7 @@
)
(wire
(pts
- (xy 257.81 96.52) (xy 252.73 96.52)
+ (xy 257.81 104.14) (xy 252.73 104.14)
)
(stroke
(width 0)
@@ -4833,16 +4952,6 @@
)
(wire
(pts
- (xy 250.19 104.14) (xy 248.92 104.14)
- )
- (stroke
- (width 0)
- (type default)
- )
- (uuid "18548be9-8fe1-4d59-bdf5-2a0966b584fa")
- )
- (wire
- (pts
(xy 234.95 67.31) (xy 257.81 67.31)
)
(stroke
@@ -5153,7 +5262,7 @@
)
(wire
(pts
- (xy 252.73 85.09) (xy 257.81 85.09)
+ (xy 252.73 93.98) (xy 257.81 93.98)
)
(stroke
(width 0)
@@ -5183,6 +5292,16 @@
)
(wire
(pts
+ (xy 250.19 114.3) (xy 250.19 111.76)
+ )
+ (stroke
+ (width 0)
+ (type default)
+ )
+ (uuid "6d9599c1-6469-4896-a45c-4c8840a6714c")
+ )
+ (wire
+ (pts
(xy 63.5 92.71) (xy 87.63 92.71)
)
(stroke
@@ -5203,7 +5322,7 @@
)
(wire
(pts
- (xy 250.19 104.14) (xy 250.19 90.17)
+ (xy 250.19 111.76) (xy 250.19 99.06)
)
(stroke
(width 0)
@@ -5223,7 +5342,7 @@
)
(wire
(pts
- (xy 252.73 85.09) (xy 252.73 96.52)
+ (xy 252.73 93.98) (xy 252.73 104.14)
)
(stroke
(width 0)
@@ -5373,7 +5492,7 @@
)
(wire
(pts
- (xy 250.19 104.14) (xy 257.81 104.14)
+ (xy 250.19 111.76) (xy 257.81 111.76)
)
(stroke
(width 0)
@@ -5383,7 +5502,7 @@
)
(wire
(pts
- (xy 250.19 107.95) (xy 250.19 104.14)
+ (xy 250.19 115.57) (xy 250.19 114.3)
)
(stroke
(width 0)
@@ -5423,7 +5542,7 @@
)
(wire
(pts
- (xy 250.19 90.17) (xy 257.81 90.17)
+ (xy 250.19 99.06) (xy 257.81 99.06)
)
(stroke
(width 0)
@@ -5433,7 +5552,7 @@
)
(wire
(pts
- (xy 252.73 77.47) (xy 252.73 85.09)
+ (xy 252.73 87.63) (xy 252.73 88.9)
)
(stroke
(width 0)
@@ -5453,7 +5572,7 @@
)
(wire
(pts
- (xy 242.57 86.36) (xy 242.57 87.63)
+ (xy 242.57 95.25) (xy 242.57 96.52)
)
(stroke
(width 0)
@@ -5523,7 +5642,7 @@
)
(wire
(pts
- (xy 234.95 101.6) (xy 257.81 101.6)
+ (xy 234.95 109.22) (xy 257.81 109.22)
)
(stroke
(width 0)
@@ -5573,7 +5692,17 @@
)
(wire
(pts
- (xy 242.57 87.63) (xy 257.81 87.63)
+ (xy 242.57 78.74) (xy 242.57 87.63)
+ )
+ (stroke
+ (width 0)
+ (type default)
+ )
+ (uuid "eadf392b-a0a3-4f13-8af7-e892c3f05d9d")
+ )
+ (wire
+ (pts
+ (xy 242.57 96.52) (xy 257.81 96.52)
)
(stroke
(width 0)
@@ -5613,6 +5742,16 @@
)
(wire
(pts
+ (xy 252.73 88.9) (xy 252.73 93.98)
+ )
+ (stroke
+ (width 0)
+ (type default)
+ )
+ (uuid "f9f4d83f-33ca-4e7c-b480-a28225361a0d")
+ )
+ (wire
+ (pts
(xy 63.5 85.09) (xy 87.63 85.09)
)
(stroke
@@ -5820,7 +5959,7 @@
)
(symbol
(lib_id "Connector:Conn_01x04_Socket")
- (at 262.89 99.06 0)
+ (at 262.89 106.68 0)
(unit 1)
(exclude_from_sim no)
(in_bom yes)
@@ -5829,7 +5968,7 @@
(fields_autoplaced yes)
(uuid "2d769173-ff82-40e1-951a-2dc5224e05e0")
(property "Reference" "J7"
- (at 264.16 99.0599 0)
+ (at 264.16 106.6799 0)
(effects
(font
(size 1.27 1.27)
@@ -5838,7 +5977,7 @@
)
)
(property "Value" "Conn_01x04_Socket"
- (at 264.16 101.5999 0)
+ (at 264.16 109.2199 0)
(effects
(font
(size 1.27 1.27)
@@ -5847,7 +5986,7 @@
)
)
(property "Footprint" "TerminalBlock_WAGO:TerminalBlock_WAGO_236-404_1x04_P5.00mm_45Degree"
- (at 262.89 99.06 0)
+ (at 262.89 106.68 0)
(effects
(font
(size 1.27 1.27)
@@ -5856,7 +5995,7 @@
)
)
(property "Datasheet" "~"
- (at 262.89 99.06 0)
+ (at 262.89 106.68 0)
(effects
(font
(size 1.27 1.27)
@@ -5865,7 +6004,7 @@
)
)
(property "Description" "Generic connector, single row, 01x04, script generated"
- (at 262.89 99.06 0)
+ (at 262.89 106.68 0)
(effects
(font
(size 1.27 1.27)
@@ -6136,7 +6275,7 @@
)
(symbol
(lib_id "Connector:Conn_01x03_Socket")
- (at 262.89 87.63 0)
+ (at 262.89 96.52 0)
(unit 1)
(exclude_from_sim no)
(in_bom yes)
@@ -6145,7 +6284,7 @@
(fields_autoplaced yes)
(uuid "5f046492-30cd-4464-8b76-48d4e3598436")
(property "Reference" "J6"
- (at 264.16 86.3599 0)
+ (at 264.16 95.2499 0)
(effects
(font
(size 1.27 1.27)
@@ -6154,7 +6293,7 @@
)
)
(property "Value" "Conn_01x03_Socket"
- (at 264.16 88.8999 0)
+ (at 264.16 97.7899 0)
(effects
(font
(size 1.27 1.27)
@@ -6163,7 +6302,7 @@
)
)
(property "Footprint" "TerminalBlock_WAGO:TerminalBlock_WAGO_236-403_1x03_P5.00mm_45Degree"
- (at 262.89 87.63 0)
+ (at 262.89 96.52 0)
(effects
(font
(size 1.27 1.27)
@@ -6172,7 +6311,7 @@
)
)
(property "Datasheet" "~"
- (at 262.89 87.63 0)
+ (at 262.89 96.52 0)
(effects
(font
(size 1.27 1.27)
@@ -6181,7 +6320,7 @@
)
)
(property "Description" "Generic connector, single row, 01x03, script generated"
- (at 262.89 87.63 0)
+ (at 262.89 96.52 0)
(effects
(font
(size 1.27 1.27)
@@ -6208,17 +6347,83 @@
)
)
(symbol
- (lib_id "power:NEUT")
- (at 252.73 77.47 0)
+ (lib_id "power:PWR_FLAG")
+ (at 250.19 114.3 270)
(unit 1)
(exclude_from_sim no)
(in_bom yes)
(on_board yes)
(dnp no)
(fields_autoplaced yes)
+ (uuid "6710a893-5db1-4a58-925d-b3198a3c412d")
+ (property "Reference" "#FLG05"
+ (at 252.095 114.3 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Value" "PWR_FLAG"
+ (at 254 114.2999 90)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (justify left)
+ )
+ )
+ (property "Footprint" ""
+ (at 250.19 114.3 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Datasheet" "~"
+ (at 250.19 114.3 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Description" "Special symbol for telling ERC where power comes from"
+ (at 250.19 114.3 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (pin "1"
+ (uuid "f1b3e437-1a13-4a59-a248-fbb182d33a55")
+ )
+ (instances
+ (project ""
+ (path "/5defd195-0277-4d04-9f5f-69e505c9845c"
+ (reference "#FLG05")
+ (unit 1)
+ )
+ )
+ )
+ )
+ (symbol
+ (lib_id "power:NEUT")
+ (at 252.73 87.63 0)
+ (unit 1)
+ (exclude_from_sim no)
+ (in_bom yes)
+ (on_board yes)
+ (dnp no)
(uuid "790d613d-7305-444d-b47e-55f972800e63")
(property "Reference" "#PWR011"
- (at 252.73 81.28 0)
+ (at 252.73 91.44 0)
(effects
(font
(size 1.27 1.27)
@@ -6227,7 +6432,7 @@
)
)
(property "Value" "NEUT"
- (at 252.73 72.39 0)
+ (at 252.73 82.55 0)
(effects
(font
(size 1.27 1.27)
@@ -6235,7 +6440,7 @@
)
)
(property "Footprint" ""
- (at 252.73 77.47 0)
+ (at 252.73 87.63 0)
(effects
(font
(size 1.27 1.27)
@@ -6244,7 +6449,7 @@
)
)
(property "Datasheet" ""
- (at 252.73 77.47 0)
+ (at 252.73 87.63 0)
(effects
(font
(size 1.27 1.27)
@@ -6253,7 +6458,7 @@
)
)
(property "Description" "Power symbol creates a global label with name \"NEUT\""
- (at 252.73 77.47 0)
+ (at 252.73 87.63 0)
(effects
(font
(size 1.27 1.27)
@@ -6384,8 +6589,75 @@
)
)
(symbol
+ (lib_id "power:PWR_FLAG")
+ (at 252.73 88.9 270)
+ (unit 1)
+ (exclude_from_sim no)
+ (in_bom yes)
+ (on_board yes)
+ (dnp no)
+ (fields_autoplaced yes)
+ (uuid "7bc18d21-1fe3-4c78-9861-a1c74420544b")
+ (property "Reference" "#FLG07"
+ (at 254.635 88.9 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Value" "PWR_FLAG"
+ (at 256.54 88.8999 90)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (justify left)
+ )
+ )
+ (property "Footprint" ""
+ (at 252.73 88.9 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Datasheet" "~"
+ (at 252.73 88.9 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Description" "Special symbol for telling ERC where power comes from"
+ (at 252.73 88.9 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (pin "1"
+ (uuid "1e9dd68b-292b-4bb8-8082-d9799361d0be")
+ )
+ (instances
+ (project "iot-contact"
+ (path "/5defd195-0277-4d04-9f5f-69e505c9845c"
+ (reference "#FLG07")
+ (unit 1)
+ )
+ )
+ )
+ )
+ (symbol
(lib_id "Device:Fuse")
- (at 242.57 82.55 0)
+ (at 242.57 91.44 0)
(unit 1)
(exclude_from_sim no)
(in_bom yes)
@@ -6394,7 +6666,7 @@
(fields_autoplaced yes)
(uuid "7faf9e26-85e6-4c7d-924c-1e0049cc6e52")
(property "Reference" "F1"
- (at 245.11 81.2799 0)
+ (at 245.11 90.1699 0)
(effects
(font
(size 1.27 1.27)
@@ -6403,7 +6675,7 @@
)
)
(property "Value" "Fuse"
- (at 245.11 83.8199 0)
+ (at 245.11 92.7099 0)
(effects
(font
(size 1.27 1.27)
@@ -6411,8 +6683,8 @@
(justify left)
)
)
- (property "Footprint" ""
- (at 240.792 82.55 90)
+ (property "Footprint" "Fuse:Fuseholder_Cylinder-5x20mm_Schurter_OGN-SMD_Horizontal_Open"
+ (at 240.792 91.44 90)
(effects
(font
(size 1.27 1.27)
@@ -6421,7 +6693,7 @@
)
)
(property "Datasheet" "~"
- (at 242.57 82.55 0)
+ (at 242.57 91.44 0)
(effects
(font
(size 1.27 1.27)
@@ -6430,7 +6702,7 @@
)
)
(property "Description" "Fuse"
- (at 242.57 82.55 0)
+ (at 242.57 91.44 0)
(effects
(font
(size 1.27 1.27)
@@ -6521,6 +6793,73 @@
)
)
(symbol
+ (lib_id "power:PWR_FLAG")
+ (at 242.57 78.74 270)
+ (unit 1)
+ (exclude_from_sim no)
+ (in_bom yes)
+ (on_board yes)
+ (dnp no)
+ (fields_autoplaced yes)
+ (uuid "877e63d9-ddaa-468b-b366-3162330a49e1")
+ (property "Reference" "#FLG06"
+ (at 244.475 78.74 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Value" "PWR_FLAG"
+ (at 246.38 78.7399 90)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (justify left)
+ )
+ )
+ (property "Footprint" ""
+ (at 242.57 78.74 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Datasheet" "~"
+ (at 242.57 78.74 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Description" "Special symbol for telling ERC where power comes from"
+ (at 242.57 78.74 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (pin "1"
+ (uuid "ba4cccc6-25c1-4411-9a53-05ab52210588")
+ )
+ (instances
+ (project "iot-contact"
+ (path "/5defd195-0277-4d04-9f5f-69e505c9845c"
+ (reference "#FLG06")
+ (unit 1)
+ )
+ )
+ )
+ )
+ (symbol
(lib_id "power:GND")
(at 120.65 154.94 0)
(unit 1)
@@ -6855,7 +7194,7 @@
)
(symbol
(lib_id "power:Earth_Protective")
- (at 250.19 107.95 0)
+ (at 250.19 115.57 0)
(unit 1)
(exclude_from_sim no)
(in_bom yes)
@@ -6864,7 +7203,7 @@
(fields_autoplaced yes)
(uuid "c2da697b-255a-4bcc-aae8-d7ba232f44aa")
(property "Reference" "#PWR010"
- (at 250.19 118.11 0)
+ (at 250.19 125.73 0)
(effects
(font
(size 1.27 1.27)
@@ -6873,7 +7212,7 @@
)
)
(property "Value" "Earth_Protective"
- (at 250.19 116.84 0)
+ (at 250.19 124.46 0)
(effects
(font
(size 1.27 1.27)
@@ -6881,7 +7220,7 @@
)
)
(property "Footprint" ""
- (at 250.19 110.49 0)
+ (at 250.19 118.11 0)
(effects
(font
(size 1.27 1.27)
@@ -6890,7 +7229,7 @@
)
)
(property "Datasheet" "~"
- (at 250.19 110.49 0)
+ (at 250.19 118.11 0)
(effects
(font
(size 1.27 1.27)
@@ -6899,7 +7238,7 @@
)
)
(property "Description" "Power symbol creates a global label with name \"Earth_Protective\""
- (at 250.19 107.95 0)
+ (at 250.19 115.57 0)
(effects
(font
(size 1.27 1.27)
@@ -7738,7 +8077,7 @@
)
)
(pin "MOT_LINE_DOWN" bidirectional
- (at 234.95 101.6 0)
+ (at 234.95 109.22 0)
(uuid "24c4fdf7-d176-4e0b-9566-7f88a8ec3649")
(effects
(font
@@ -7748,7 +8087,7 @@
)
)
(pin "MOT_LINE_UP" bidirectional
- (at 234.95 99.06 0)
+ (at 234.95 106.68 0)
(uuid "09e616f6-b885-40bf-9b2d-86e536d32432")
(effects
(font
diff --git a/pcb/meson.build b/pcb/meson.build
index 4feecce..7483cd0 100644
--- a/pcb/meson.build
+++ b/pcb/meson.build
@@ -18,7 +18,6 @@ schematic = custom_target(
meson.current_source_dir() / 'iot-contact.kicad_sch',
],
depend_files: schematic_files,
- build_by_default: true,
)
bom = custom_target(
@@ -34,7 +33,6 @@ bom = custom_target(
meson.current_source_dir() / 'iot-contact.kicad_sch',
],
depend_files: schematic_files,
- build_by_default: true,
)
fs = import('fs')
diff --git a/pcb/power.kicad_sch b/pcb/power.kicad_sch
index 7cc1049..a66427d 100644
--- a/pcb/power.kicad_sch
+++ b/pcb/power.kicad_sch
@@ -1602,10 +1602,111 @@
)
(embedded_fonts no)
)
+ (symbol "power:PWR_FLAG"
+ (power)
+ (pin_numbers
+ (hide yes)
+ )
+ (pin_names
+ (offset 0)
+ (hide yes)
+ )
+ (exclude_from_sim no)
+ (in_bom yes)
+ (on_board yes)
+ (property "Reference" "#FLG"
+ (at 0 1.905 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Value" "PWR_FLAG"
+ (at 0 3.81 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ )
+ )
+ (property "Footprint" ""
+ (at 0 0 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Datasheet" "~"
+ (at 0 0 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Description" "Special symbol for telling ERC where power comes from"
+ (at 0 0 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "ki_keywords" "flag power"
+ (at 0 0 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (symbol "PWR_FLAG_0_0"
+ (pin power_out line
+ (at 0 0 90)
+ (length 0)
+ (name "~"
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ )
+ )
+ (number "1"
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ )
+ )
+ )
+ )
+ (symbol "PWR_FLAG_0_1"
+ (polyline
+ (pts
+ (xy 0 0) (xy 0 1.27) (xy -1.016 1.905) (xy 0 2.54) (xy 1.016 1.905) (xy 0 1.27)
+ )
+ (stroke
+ (width 0)
+ (type default)
+ )
+ (fill
+ (type none)
+ )
+ )
+ )
+ (embedded_fonts no)
+ )
)
(text "Never use PoE and external power supply together!\nSignificant hardware damage will be the result.\n\nThus two assembly options:\n\n- default: R30, R31, R32 placed, R33, R34, R35 not placed\n- development: R33, R34, R35 placed, R30, R31, R32 not placed"
(exclude_from_sim no)
- (at 70.104 56.896 0)
+ (at 62.738 48.514 0)
(effects
(font
(size 1.27 1.27)
@@ -1663,6 +1764,12 @@
(uuid "29362c3a-c846-4531-b01a-5bdfbd673195")
)
(junction
+ (at 138.43 101.6)
+ (diameter 0)
+ (color 0 0 0 0)
+ (uuid "2a97fb98-87ab-4fd8-a718-540b4e51809f")
+ )
+ (junction
(at 36.83 78.74)
(diameter 0)
(color 0 0 0 0)
@@ -1729,6 +1836,12 @@
(uuid "67e360cf-3991-4cb6-8a4e-379e5b51ba5a")
)
(junction
+ (at 255.27 81.28)
+ (diameter 0)
+ (color 0 0 0 0)
+ (uuid "68ea739e-e5e4-4ada-83d9-95ace5db468d")
+ )
+ (junction
(at 189.23 101.6)
(diameter 0)
(color 0 0 0 0)
@@ -1747,6 +1860,12 @@
(uuid "8bfe5d0a-942d-40f8-b5d8-afd551a1e76e")
)
(junction
+ (at 138.43 78.74)
+ (diameter 0)
+ (color 0 0 0 0)
+ (uuid "8d60e40b-82a7-4cdb-95f8-4bccb3dfceb0")
+ )
+ (junction
(at 147.32 78.74)
(diameter 0)
(color 0 0 0 0)
@@ -1934,6 +2053,16 @@
)
(wire
(pts
+ (xy 255.27 81.28) (xy 262.89 81.28)
+ )
+ (stroke
+ (width 0)
+ (type default)
+ )
+ (uuid "1e3031fe-fdb6-43e9-bbef-0cb64e98ee08")
+ )
+ (wire
+ (pts
(xy 232.41 78.74) (xy 236.22 78.74)
)
(stroke
@@ -1944,7 +2073,7 @@
)
(wire
(pts
- (xy 139.7 101.6) (xy 143.51 101.6)
+ (xy 134.62 101.6) (xy 138.43 101.6)
)
(stroke
(width 0)
@@ -2004,7 +2133,7 @@
)
(wire
(pts
- (xy 251.46 81.28) (xy 262.89 81.28)
+ (xy 251.46 81.28) (xy 255.27 81.28)
)
(stroke
(width 0)
@@ -2034,7 +2163,7 @@
)
(wire
(pts
- (xy 123.19 78.74) (xy 132.08 78.74)
+ (xy 123.19 78.74) (xy 127 78.74)
)
(stroke
(width 0)
@@ -2074,7 +2203,7 @@
)
(wire
(pts
- (xy 123.19 101.6) (xy 132.08 101.6)
+ (xy 123.19 101.6) (xy 127 101.6)
)
(stroke
(width 0)
@@ -2324,6 +2453,16 @@
)
(wire
(pts
+ (xy 138.43 78.74) (xy 147.32 78.74)
+ )
+ (stroke
+ (width 0)
+ (type default)
+ )
+ (uuid "71e5c87f-63c0-4e8a-991a-3ced8d5a8f3d")
+ )
+ (wire
+ (pts
(xy 96.52 165.1) (xy 96.52 166.37)
)
(stroke
@@ -2614,6 +2753,16 @@
)
(wire
(pts
+ (xy 138.43 101.6) (xy 143.51 101.6)
+ )
+ (stroke
+ (width 0)
+ (type default)
+ )
+ (uuid "c2db3c74-a377-465a-af84-5c8ddcd0edd7")
+ )
+ (wire
+ (pts
(xy 151.13 96.52) (xy 151.13 83.82)
)
(stroke
@@ -2794,7 +2943,7 @@
)
(wire
(pts
- (xy 139.7 78.74) (xy 147.32 78.74)
+ (xy 134.62 78.74) (xy 138.43 78.74)
)
(stroke
(width 0)
@@ -3180,7 +3329,7 @@
)
(symbol
(lib_id "Device:R")
- (at 135.89 101.6 90)
+ (at 130.81 101.6 90)
(mirror x)
(unit 1)
(exclude_from_sim no)
@@ -3189,7 +3338,7 @@
(dnp no)
(uuid "160e8e48-d0f9-4e1f-b61e-098598438757")
(property "Reference" "R22"
- (at 135.89 107.95 90)
+ (at 130.81 107.95 90)
(effects
(font
(size 1.27 1.27)
@@ -3197,7 +3346,7 @@
)
)
(property "Value" "0R"
- (at 135.89 105.41 90)
+ (at 130.81 105.41 90)
(effects
(font
(size 1.27 1.27)
@@ -3205,7 +3354,7 @@
)
)
(property "Footprint" ""
- (at 135.89 99.822 90)
+ (at 130.81 99.822 90)
(effects
(font
(size 1.27 1.27)
@@ -3214,7 +3363,7 @@
)
)
(property "Datasheet" "~"
- (at 135.89 101.6 0)
+ (at 130.81 101.6 0)
(effects
(font
(size 1.27 1.27)
@@ -3223,7 +3372,7 @@
)
)
(property "Description" "Resistor"
- (at 135.89 101.6 0)
+ (at 130.81 101.6 0)
(effects
(font
(size 1.27 1.27)
@@ -3816,6 +3965,72 @@
)
)
(symbol
+ (lib_id "power:PWR_FLAG")
+ (at 138.43 101.6 0)
+ (mirror x)
+ (unit 1)
+ (exclude_from_sim no)
+ (in_bom yes)
+ (on_board yes)
+ (dnp no)
+ (uuid "75a3a5e2-039e-4e7c-962c-6cbc637c9c18")
+ (property "Reference" "#FLG09"
+ (at 138.43 103.505 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Value" "PWR_FLAG"
+ (at 138.43 106.68 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ )
+ )
+ (property "Footprint" ""
+ (at 138.43 101.6 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Datasheet" "~"
+ (at 138.43 101.6 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Description" "Special symbol for telling ERC where power comes from"
+ (at 138.43 101.6 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (pin "1"
+ (uuid "312c0921-4bb0-4409-b1e9-0e83044b621a")
+ )
+ (instances
+ (project "iot-contact"
+ (path "/5defd195-0277-4d04-9f5f-69e505c9845c/beb75790-f0de-47e4-906f-fee3b6a2625b"
+ (reference "#FLG09")
+ (unit 1)
+ )
+ )
+ )
+ )
+ (symbol
(lib_id "Device:C")
(at 175.26 93.98 0)
(unit 1)
@@ -4020,6 +4235,72 @@
)
)
(symbol
+ (lib_id "power:PWR_FLAG")
+ (at 138.43 78.74 0)
+ (unit 1)
+ (exclude_from_sim no)
+ (in_bom yes)
+ (on_board yes)
+ (dnp no)
+ (fields_autoplaced yes)
+ (uuid "894379ad-7194-44f6-835d-a385eba7c5ae")
+ (property "Reference" "#FLG01"
+ (at 138.43 76.835 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Value" "PWR_FLAG"
+ (at 138.43 73.66 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ )
+ )
+ (property "Footprint" ""
+ (at 138.43 78.74 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Datasheet" "~"
+ (at 138.43 78.74 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Description" "Special symbol for telling ERC where power comes from"
+ (at 138.43 78.74 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (pin "1"
+ (uuid "c180f568-43f8-448b-b45c-bb609324935e")
+ )
+ (instances
+ (project ""
+ (path "/5defd195-0277-4d04-9f5f-69e505c9845c/beb75790-f0de-47e4-906f-fee3b6a2625b"
+ (reference "#FLG01")
+ (unit 1)
+ )
+ )
+ )
+ )
+ (symbol
(lib_id "power:+5V")
(at 64.77 154.94 0)
(unit 1)
@@ -4293,7 +4574,7 @@
)
(symbol
(lib_id "Device:R")
- (at 135.89 78.74 90)
+ (at 130.81 78.74 90)
(unit 1)
(exclude_from_sim no)
(in_bom yes)
@@ -4302,7 +4583,7 @@
(fields_autoplaced yes)
(uuid "c8d62377-5749-4ffa-ac60-d1361327b078")
(property "Reference" "R20"
- (at 135.89 72.39 90)
+ (at 130.81 72.39 90)
(effects
(font
(size 1.27 1.27)
@@ -4310,7 +4591,7 @@
)
)
(property "Value" "0R"
- (at 135.89 74.93 90)
+ (at 130.81 74.93 90)
(effects
(font
(size 1.27 1.27)
@@ -4318,7 +4599,7 @@
)
)
(property "Footprint" ""
- (at 135.89 80.518 90)
+ (at 130.81 80.518 90)
(effects
(font
(size 1.27 1.27)
@@ -4327,7 +4608,7 @@
)
)
(property "Datasheet" "~"
- (at 135.89 78.74 0)
+ (at 130.81 78.74 0)
(effects
(font
(size 1.27 1.27)
@@ -4336,7 +4617,7 @@
)
)
(property "Description" "Resistor"
- (at 135.89 78.74 0)
+ (at 130.81 78.74 0)
(effects
(font
(size 1.27 1.27)
@@ -5144,4 +5425,70 @@
)
)
)
+ (symbol
+ (lib_id "power:PWR_FLAG")
+ (at 255.27 81.28 0)
+ (unit 1)
+ (exclude_from_sim no)
+ (in_bom yes)
+ (on_board yes)
+ (dnp no)
+ (fields_autoplaced yes)
+ (uuid "ff82c7f7-d06c-45ad-8b1c-2ab90e1e3cad")
+ (property "Reference" "#FLG08"
+ (at 255.27 79.375 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Value" "PWR_FLAG"
+ (at 255.27 76.2 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ )
+ )
+ (property "Footprint" ""
+ (at 255.27 81.28 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Datasheet" "~"
+ (at 255.27 81.28 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Description" "Special symbol for telling ERC where power comes from"
+ (at 255.27 81.28 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (pin "1"
+ (uuid "5741653e-d2a1-4447-897d-a006f0f63705")
+ )
+ (instances
+ (project ""
+ (path "/5defd195-0277-4d04-9f5f-69e505c9845c/beb75790-f0de-47e4-906f-fee3b6a2625b"
+ (reference "#FLG08")
+ (unit 1)
+ )
+ )
+ )
+ )
)
diff --git a/pcb/processor.kicad_sch b/pcb/processor.kicad_sch
index 58e8ddb..49a48e9 100644
--- a/pcb/processor.kicad_sch
+++ b/pcb/processor.kicad_sch
@@ -3438,6 +3438,107 @@
)
(embedded_fonts no)
)
+ (symbol "power:PWR_FLAG"
+ (power)
+ (pin_numbers
+ (hide yes)
+ )
+ (pin_names
+ (offset 0)
+ (hide yes)
+ )
+ (exclude_from_sim no)
+ (in_bom yes)
+ (on_board yes)
+ (property "Reference" "#FLG"
+ (at 0 1.905 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Value" "PWR_FLAG"
+ (at 0 3.81 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ )
+ )
+ (property "Footprint" ""
+ (at 0 0 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Datasheet" "~"
+ (at 0 0 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Description" "Special symbol for telling ERC where power comes from"
+ (at 0 0 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "ki_keywords" "flag power"
+ (at 0 0 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (symbol "PWR_FLAG_0_0"
+ (pin power_out line
+ (at 0 0 90)
+ (length 0)
+ (name "~"
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ )
+ )
+ (number "1"
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ )
+ )
+ )
+ )
+ (symbol "PWR_FLAG_0_1"
+ (polyline
+ (pts
+ (xy 0 0) (xy 0 1.27) (xy -1.016 1.905) (xy 0 2.54) (xy 1.016 1.905) (xy 0 1.27)
+ )
+ (stroke
+ (width 0)
+ (type default)
+ )
+ (fill
+ (type none)
+ )
+ )
+ )
+ (embedded_fonts no)
+ )
)
(text "PCB versioning"
(exclude_from_sim no)
@@ -3470,7 +3571,7 @@
(uuid "82f61e74-c865-4393-826a-066e2a341f3e")
)
(junction
- (at 130.81 26.67)
+ (at 130.81 24.13)
(diameter 0)
(color 0 0 0 0)
(uuid "027312a6-6cab-47d4-bd6c-3a7958898883")
@@ -3488,6 +3589,12 @@
(uuid "0de39592-ff68-44b8-aafc-a2211b0f3c5c")
)
(junction
+ (at 139.7 34.29)
+ (diameter 0)
+ (color 0 0 0 0)
+ (uuid "25b748ce-2cf9-4105-916b-450d58335e69")
+ )
+ (junction
(at 76.2 68.58)
(diameter 0)
(color 0 0 0 0)
@@ -3524,6 +3631,12 @@
(uuid "966c75b3-b696-4276-9e1c-6478e86f90fc")
)
(junction
+ (at 121.92 34.29)
+ (diameter 0)
+ (color 0 0 0 0)
+ (uuid "978aa3f6-80f0-4157-86e2-21aa91854f37")
+ )
+ (junction
(at 182.88 58.42)
(diameter 0)
(color 0 0 0 0)
@@ -3845,6 +3958,16 @@
)
(wire
(pts
+ (xy 139.7 34.29) (xy 139.7 36.83)
+ )
+ (stroke
+ (width 0)
+ (type default)
+ )
+ (uuid "16e365c0-2181-4267-84b5-cd72b8f25694")
+ )
+ (wire
+ (pts
(xy 175.26 152.4) (xy 175.26 172.72)
)
(stroke
@@ -3915,6 +4038,16 @@
)
(wire
(pts
+ (xy 121.92 34.29) (xy 121.92 38.1)
+ )
+ (stroke
+ (width 0)
+ (type default)
+ )
+ (uuid "27a2acf1-169c-4783-8b35-474dccc469c4")
+ )
+ (wire
+ (pts
(xy 182.88 57.15) (xy 182.88 58.42)
)
(stroke
@@ -4035,7 +4168,7 @@
)
(wire
(pts
- (xy 130.81 26.67) (xy 130.81 25.4)
+ (xy 130.81 24.13) (xy 130.81 22.86)
)
(stroke
(width 0)
@@ -4135,7 +4268,7 @@
)
(wire
(pts
- (xy 139.7 27.94) (xy 139.7 26.67)
+ (xy 139.7 25.4) (xy 139.7 24.13)
)
(stroke
(width 0)
@@ -4195,7 +4328,7 @@
)
(wire
(pts
- (xy 139.7 35.56) (xy 139.7 36.83)
+ (xy 139.7 33.02) (xy 139.7 34.29)
)
(stroke
(width 0)
@@ -4345,7 +4478,7 @@
)
(wire
(pts
- (xy 121.92 27.94) (xy 121.92 26.67)
+ (xy 121.92 25.4) (xy 121.92 24.13)
)
(stroke
(width 0)
@@ -4355,7 +4488,7 @@
)
(wire
(pts
- (xy 139.7 26.67) (xy 130.81 26.67)
+ (xy 139.7 24.13) (xy 130.81 24.13)
)
(stroke
(width 0)
@@ -4385,7 +4518,7 @@
)
(wire
(pts
- (xy 121.92 26.67) (xy 130.81 26.67)
+ (xy 121.92 24.13) (xy 130.81 24.13)
)
(stroke
(width 0)
@@ -4495,7 +4628,7 @@
)
(wire
(pts
- (xy 130.81 36.83) (xy 130.81 26.67)
+ (xy 130.81 36.83) (xy 130.81 24.13)
)
(stroke
(width 0)
@@ -4555,7 +4688,7 @@
)
(wire
(pts
- (xy 121.92 35.56) (xy 121.92 38.1)
+ (xy 121.92 33.02) (xy 121.92 34.29)
)
(stroke
(width 0)
@@ -5410,7 +5543,7 @@
)
(symbol
(lib_id "power:+3V3")
- (at 130.81 25.4 0)
+ (at 130.81 22.86 0)
(unit 1)
(exclude_from_sim no)
(in_bom yes)
@@ -5419,7 +5552,7 @@
(fields_autoplaced yes)
(uuid "46e43b91-7745-4b1f-9749-181cf5d6767c")
(property "Reference" "#PWR026"
- (at 130.81 29.21 0)
+ (at 130.81 26.67 0)
(effects
(font
(size 1.27 1.27)
@@ -5428,7 +5561,7 @@
)
)
(property "Value" "+3V3"
- (at 130.81 20.32 0)
+ (at 130.81 17.78 0)
(effects
(font
(size 1.27 1.27)
@@ -5436,7 +5569,7 @@
)
)
(property "Footprint" ""
- (at 130.81 25.4 0)
+ (at 130.81 22.86 0)
(effects
(font
(size 1.27 1.27)
@@ -5445,7 +5578,7 @@
)
)
(property "Datasheet" ""
- (at 130.81 25.4 0)
+ (at 130.81 22.86 0)
(effects
(font
(size 1.27 1.27)
@@ -5454,7 +5587,7 @@
)
)
(property "Description" "Power symbol creates a global label with name \"+3V3\""
- (at 130.81 25.4 0)
+ (at 130.81 22.86 0)
(effects
(font
(size 1.27 1.27)
@@ -6011,6 +6144,73 @@
)
)
(symbol
+ (lib_id "power:PWR_FLAG")
+ (at 121.92 34.29 90)
+ (mirror x)
+ (unit 1)
+ (exclude_from_sim no)
+ (in_bom yes)
+ (on_board yes)
+ (dnp no)
+ (uuid "87be38d6-7d03-46bb-9030-af8e2a39827e")
+ (property "Reference" "#FLG04"
+ (at 120.015 34.29 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Value" "PWR_FLAG"
+ (at 118.11 34.2899 90)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (justify left)
+ )
+ )
+ (property "Footprint" ""
+ (at 121.92 34.29 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Datasheet" "~"
+ (at 121.92 34.29 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Description" "Special symbol for telling ERC where power comes from"
+ (at 121.92 34.29 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (pin "1"
+ (uuid "1c2e8fb1-c0b0-4280-a008-24a014c14dbf")
+ )
+ (instances
+ (project "iot-contact"
+ (path "/5defd195-0277-4d04-9f5f-69e505c9845c/9e600826-010a-409d-9a37-ea8e6fbe6058"
+ (reference "#FLG04")
+ (unit 1)
+ )
+ )
+ )
+ )
+ (symbol
(lib_id "Device:Crystal")
(at 214.63 148.59 90)
(unit 1)
@@ -6148,7 +6348,7 @@
)
(symbol
(lib_id "Device:R")
- (at 121.92 31.75 0)
+ (at 121.92 29.21 0)
(mirror y)
(unit 1)
(exclude_from_sim no)
@@ -6157,7 +6357,7 @@
(dnp no)
(uuid "a57e0fa7-64d4-48d7-9aab-9c4fe5e63580")
(property "Reference" "R12"
- (at 119.38 30.4799 0)
+ (at 119.38 27.9399 0)
(effects
(font
(size 1.27 1.27)
@@ -6166,7 +6366,7 @@
)
)
(property "Value" "0"
- (at 119.38 33.0199 0)
+ (at 119.38 30.4799 0)
(effects
(font
(size 1.27 1.27)
@@ -6175,7 +6375,7 @@
)
)
(property "Footprint" ""
- (at 123.698 31.75 90)
+ (at 123.698 29.21 90)
(effects
(font
(size 1.27 1.27)
@@ -6184,7 +6384,7 @@
)
)
(property "Datasheet" "~"
- (at 121.92 31.75 0)
+ (at 121.92 29.21 0)
(effects
(font
(size 1.27 1.27)
@@ -6193,7 +6393,7 @@
)
)
(property "Description" "Resistor"
- (at 121.92 31.75 0)
+ (at 121.92 29.21 0)
(effects
(font
(size 1.27 1.27)
@@ -6420,7 +6620,7 @@
)
(symbol
(lib_id "Device:FerriteBead")
- (at 139.7 31.75 180)
+ (at 139.7 29.21 180)
(unit 1)
(exclude_from_sim no)
(in_bom yes)
@@ -6429,7 +6629,7 @@
(fields_autoplaced yes)
(uuid "cc42b4c5-0560-461f-bff3-be69aab4985d")
(property "Reference" "FB2"
- (at 143.51 30.5307 0)
+ (at 143.51 27.9907 0)
(effects
(font
(size 1.27 1.27)
@@ -6438,7 +6638,7 @@
)
)
(property "Value" "FerriteBead"
- (at 143.51 33.0707 0)
+ (at 143.51 30.5307 0)
(effects
(font
(size 1.27 1.27)
@@ -6447,7 +6647,7 @@
)
)
(property "Footprint" ""
- (at 141.478 31.75 90)
+ (at 141.478 29.21 90)
(effects
(font
(size 1.27 1.27)
@@ -6456,7 +6656,7 @@
)
)
(property "Datasheet" "~"
- (at 139.7 31.75 0)
+ (at 139.7 29.21 0)
(effects
(font
(size 1.27 1.27)
@@ -6465,7 +6665,7 @@
)
)
(property "Description" "Ferrite bead"
- (at 139.7 31.75 0)
+ (at 139.7 29.21 0)
(effects
(font
(size 1.27 1.27)
@@ -6559,6 +6759,73 @@
)
)
(symbol
+ (lib_id "power:PWR_FLAG")
+ (at 139.7 34.29 270)
+ (unit 1)
+ (exclude_from_sim no)
+ (in_bom yes)
+ (on_board yes)
+ (dnp no)
+ (fields_autoplaced yes)
+ (uuid "d864acc2-8140-460a-93b1-bf9d43fe0e3b")
+ (property "Reference" "#FLG03"
+ (at 141.605 34.29 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Value" "PWR_FLAG"
+ (at 143.51 34.2899 90)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (justify left)
+ )
+ )
+ (property "Footprint" ""
+ (at 139.7 34.29 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Datasheet" "~"
+ (at 139.7 34.29 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (property "Description" "Special symbol for telling ERC where power comes from"
+ (at 139.7 34.29 0)
+ (effects
+ (font
+ (size 1.27 1.27)
+ )
+ (hide yes)
+ )
+ )
+ (pin "1"
+ (uuid "1cfd15c4-9e9b-459c-a353-fdd7da1985d2")
+ )
+ (instances
+ (project ""
+ (path "/5defd195-0277-4d04-9f5f-69e505c9845c/9e600826-010a-409d-9a37-ea8e6fbe6058"
+ (reference "#FLG03")
+ (unit 1)
+ )
+ )
+ )
+ )
+ (symbol
(lib_id "power:GND")
(at 182.88 68.58 0)
(unit 1)
diff --git a/tools/deploy.py b/tools/deploy.py.in
index 26048e8..8eeecda 100755
--- a/tools/deploy.py
+++ b/tools/deploy.py.in
@@ -7,8 +7,8 @@ import pathlib
SCRIPT = pathlib.Path(__file__)
-SOURCE_ROOT = SCRIPT.parent.parent.resolve()
-ARTIFACTS_DEFAULT = SOURCE_ROOT / "build" / "artifacts"
+BUILD_ROOT = SCRIPT.parent.parent.resolve()
+ARTIFACTS_DEFAULT = BUILD_ROOT / "@PROJECT_VERSION_STRING@.tar.zst"
def main() -> None:
@@ -20,7 +20,7 @@ def main() -> None:
"-a",
"--artifacts",
default=ARTIFACTS_DEFAULT,
- help="local path to artifacts folder",
+ help="local path to artifacts archive file",
)
parser.add_argument(
"-H", "--host", default="cloud", help="target `Host` name from ~/.ssh/config"
@@ -28,7 +28,7 @@ def main() -> None:
parser.add_argument(
"-p",
"--path",
- default="/srv/http/deploy.xengineering.eu/public/git/iot-contact/main/",
+ default="/srv/http/deploy.xengineering.eu/public/git/iot-contact/",
help="remote path to destination folder on server",
)
parser.add_argument(
@@ -43,8 +43,7 @@ def main() -> None:
command = [
"rsync",
"-av",
- "--delete",
- f"{str(pathlib.Path(args.artifacts).resolve())}/",
+ f"{str(pathlib.Path(args.artifacts).resolve())}",
f"{args.host}:{args.path}",
]
diff --git a/tools/meson.build b/tools/meson.build
index f58c54b..2a33d0e 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -1,3 +1,11 @@
configure_zephyr = meson.current_source_dir() / 'configure_zephyr.py'
build_zephyr = meson.current_source_dir() / 'build_zephyr.py'
make_factory_image = meson.current_source_dir() / 'make_factory_image.py'
+
+configure_file(
+ configuration : {
+ 'PROJECT_VERSION_STRING': project_version_string,
+ },
+ input : 'deploy.py.in',
+ output : 'deploy.py',
+)
diff --git a/web/.gitignore b/web/.gitignore
deleted file mode 100644
index 07b5637..0000000
--- a/web/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-public
-.hugo_build.lock
diff --git a/web/index.html b/web/index.html
index f8d76ed..d353cb7 100644
--- a/web/index.html
+++ b/web/index.html
@@ -12,16 +12,16 @@
<h4>Printed circuit board</h4>
<ul>
- <li><a href="iot-contact.kicad_pcb">iot-contact.kicad_pcb</a></li>
- <li><a href="schematic.pdf">schematic.pdf</a></li>
- <li><a href="bill-of-materials.csv">bill-of-materials.csv</a></li>
+ <li><a href="pcb/iot-contact.kicad_pcb">iot-contact.kicad_pcb</a></li>
+ <li><a href="pcb/schematic.pdf">schematic.pdf</a></li>
+ <li><a href="pcb/bill-of-materials.csv">bill-of-materials.csv</a></li>
</ul>
<h4>Firmware</h4>
<ul>
- <li><a href="factory-image.bin">factory-image.bin</a></li>
- <li><a href="update-image.bin">update-image.bin</a></li>
- <li><a href="simulation-linux-amd64.exe">simulation-linux-amd64.exe</a></li>
+ <li><a href="fw/factory-image.bin">factory-image.bin</a></li>
+ <li><a href="fw/app/update-image.bin">update-image.bin</a></li>
+ <li><a href="fw/sim/simulation-linux-amd64.exe">simulation-linux-amd64.exe</a></li>
</ul>
</main>
</body>
diff --git a/web/meson.build b/web/meson.build
deleted file mode 100644
index 19551a5..0000000
--- a/web/meson.build
+++ /dev/null
@@ -1 +0,0 @@
-index_html = fs.copyfile(meson.current_source_dir() / 'index.html')
generated by cgit v1.2.3-70-g09d2 (git 2.50.0) at 2025-07-26 18:36:22 +0000