Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7698a00652 |
24 changed files with 920 additions and 245441 deletions
|
|
@ -98,8 +98,7 @@ Additional features are available through feature flags:
|
|||
|
||||
Officially supported feature combinations are:
|
||||
- `esp,spat,gnss_ubx,screen` (default features, "standalone")
|
||||
- `esp,spat,gnss_ubx,screen,ble` ("standalone with BLE")
|
||||
- `esp,spat,gnss_ubx,screen,cam_tx,ble` ("standalone with CAM")
|
||||
- `esp,spat,gnss_ubx,screen,cam_tx` ("standalone with CAM")
|
||||
- `esp,spat,gnss_ubx,screen,cam_tx,cam,denm`
|
||||
- `esp,uart,cam,denm` ("smartphone companion with UART")
|
||||
- `esp,ble,cam,denm,cam_tx` ("smartphone companion with BLE")
|
||||
|
|
@ -133,6 +132,7 @@ Additional hardware:
|
|||
The housing is a FreeCAD model at [hardware/housing/c_its-companion-housing.FCStd](./hardware/housing/c_its-companion-housing.FCStd), but the same folder also contains finished 3mf models that can be loaded into a 3D printer slicer.
|
||||
Exports are available for:
|
||||
|
||||
- 2mm: no battery (just display standoffs)
|
||||
- 7mm: EREMIT 654060 (6.5x40x60 mm) LiPo battery
|
||||
- 9mm: Some 9x40x60 mm LiPo battery, e.g. LP803860 (2000 mAh)
|
||||
|
||||
|
|
|
|||
22
build.rs
22
build.rs
|
|
@ -9,7 +9,6 @@ fn main() -> std::io::Result<()> {
|
|||
println!("cargo:rustc-link-arg=-Tlinkall.x");
|
||||
}
|
||||
|
||||
// compile protobuf definition to rust code
|
||||
let descriptor_path =
|
||||
std::path::PathBuf::from(env::var("OUT_DIR").unwrap()).join("proto_descriptor.bin");
|
||||
|
||||
|
|
@ -18,27 +17,6 @@ fn main() -> std::io::Result<()> {
|
|||
.compile_well_known_types()
|
||||
.compile_protos(&["docs/c_its-messages.proto"], &["docs/"])?;
|
||||
|
||||
// get git revision
|
||||
println!("cargo:rustc-rerun-if-changed=.git/HEAD");
|
||||
|
||||
// length:
|
||||
// - tag name: 6-8 chars (v0.1.0 to v1.23.42)
|
||||
// - offset+hash: 0-12 chars (up to 99 commits from tag + 8 char hash)
|
||||
// - SUM: 6-20
|
||||
let git_output = std::process::Command::new("git")
|
||||
.args(["describe", "--tags", "--match", "v*", "--always"])
|
||||
.output()
|
||||
.unwrap();
|
||||
assert!(
|
||||
git_output.stderr.is_empty(),
|
||||
"{}",
|
||||
String::from_utf8(git_output.stderr).unwrap()
|
||||
);
|
||||
println!(
|
||||
"cargo:rustc-env=GIT_REVISION={}",
|
||||
String::from_utf8(git_output.stdout).unwrap()
|
||||
);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,16 +7,15 @@ extended=${2:-false}
|
|||
|
||||
|
||||
features_base=(
|
||||
spat,gnss_ubx,screen # "standalone" simple
|
||||
spat,gnss_ubx,screen,ble # "standalone" with BLE
|
||||
spat,gnss_ubx,screen,ble,cam_tx # "standalone" with CAM
|
||||
spat,gnss_ubx,screen,cam_tx,cam,denm
|
||||
uart,cam,denm # "smartphone companion with UART"
|
||||
ble,cam,denm,cam_tx # "smartphone companion with BLE"
|
||||
uart,cam,denm
|
||||
ble,cam,denm,cam_tx
|
||||
uart,ble,cam,denm
|
||||
spat,gnss_ubx,screen
|
||||
spat,gnss_ubx,screen,cam_tx
|
||||
)
|
||||
features_more=(
|
||||
uart,ble,cam,denm
|
||||
spat,gnss_ubx,screen,cam_tx
|
||||
spat,gnss_ubx,screen,ble
|
||||
spat,gnss_ubx,screen,ble,cam_tx
|
||||
spat,gnss_ubx,screen,cam,denm
|
||||
spat,gnss_ubx,screen,cam_tx,cam,denm
|
||||
gnss_ubx,screen,cam_tx,cam,denm
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"board": {
|
||||
"active_layer": 0,
|
||||
"active_layer": 25,
|
||||
"active_layer_preset": "",
|
||||
"auto_track_width": true,
|
||||
"hidden_netclasses": [],
|
||||
|
|
|
|||
|
|
@ -236,7 +236,6 @@
|
|||
{
|
||||
"td_allow_use_two_tracks": true,
|
||||
"td_curve_segcount": 0,
|
||||
"td_enabled": false,
|
||||
"td_height_ratio": 1.0,
|
||||
"td_length_ratio": 0.5,
|
||||
"td_maxheight": 2.0,
|
||||
|
|
@ -248,7 +247,6 @@
|
|||
{
|
||||
"td_allow_use_two_tracks": true,
|
||||
"td_curve_segcount": 0,
|
||||
"td_enabled": false,
|
||||
"td_height_ratio": 1.0,
|
||||
"td_length_ratio": 0.5,
|
||||
"td_maxheight": 2.0,
|
||||
|
|
@ -260,7 +258,6 @@
|
|||
{
|
||||
"td_allow_use_two_tracks": true,
|
||||
"td_curve_segcount": 0,
|
||||
"td_enabled": false,
|
||||
"td_height_ratio": 1.0,
|
||||
"td_length_ratio": 0.5,
|
||||
"td_maxheight": 2.0,
|
||||
|
|
@ -314,7 +311,7 @@
|
|||
"internal_id": "",
|
||||
"mfg": "",
|
||||
"mpn": "",
|
||||
"sch_revision": "v1.1"
|
||||
"sch_revision": "v1.0"
|
||||
},
|
||||
"layer_pairs": [],
|
||||
"layer_presets": [],
|
||||
|
|
@ -543,7 +540,6 @@
|
|||
"pin_to_pin": "warning",
|
||||
"power_pin_not_driven": "error",
|
||||
"same_local_global_label": "warning",
|
||||
"same_local_global_power": "warning",
|
||||
"similar_label_and_power": "warning",
|
||||
"similar_labels": "warning",
|
||||
"similar_power": "warning",
|
||||
|
|
@ -599,8 +595,8 @@
|
|||
"meta": {
|
||||
"version": 5
|
||||
},
|
||||
"net_colors": {},
|
||||
"netclass_assignments": {},
|
||||
"net_colors": null,
|
||||
"netclass_assignments": null,
|
||||
"netclass_patterns": [
|
||||
{
|
||||
"netclass": "Power",
|
||||
|
|
@ -626,7 +622,7 @@
|
|||
"netlist": "",
|
||||
"plot": "",
|
||||
"specctra_dsn": "",
|
||||
"step": "../housing/c_its-companion-v1.1.step",
|
||||
"step": "../housing/c_its-companion-v1.0.step",
|
||||
"vrml": ""
|
||||
},
|
||||
"page_layout_descr_file": ""
|
||||
|
|
@ -761,7 +757,7 @@
|
|||
"uuid": "9ad468b0-d7e4-4d4a-b652-c4a81a952e30"
|
||||
}
|
||||
],
|
||||
"used_designators": "#FLG1-3,#PWR1-11,C1,H1-4,J1-2,SW1,TP1-5,U1-2",
|
||||
"used_designators": "H1-4,C1,#PWR1-11,J1-2,SW1,TP1-5,U1-2,#FLG1-3",
|
||||
"variants": []
|
||||
},
|
||||
"sheets": [
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
(paper "A4" portrait)
|
||||
(title_block
|
||||
(title "C-ITS Companion")
|
||||
(date "2026-11-02")
|
||||
(rev "v1.1")
|
||||
(date "2026-09-06")
|
||||
(rev "v1.0")
|
||||
(company "jtbx")
|
||||
)
|
||||
(lib_symbols
|
||||
|
|
@ -4682,8 +4682,7 @@
|
|||
)
|
||||
(symbol
|
||||
(lib_id "Connector:Conn_01x02_Socket")
|
||||
(at 38.1 165.1 0)
|
||||
(mirror y)
|
||||
(at 38.1 167.64 180)
|
||||
(unit 1)
|
||||
(body_style 1)
|
||||
(exclude_from_sim no)
|
||||
|
|
@ -4691,9 +4690,10 @@
|
|||
(on_board yes)
|
||||
(in_pos_files yes)
|
||||
(dnp no)
|
||||
(fields_autoplaced yes)
|
||||
(uuid "892402cc-04d7-4ef7-82b9-1d18ac58ae6e")
|
||||
(property "Reference" "J2"
|
||||
(at 38.735 172.72 0)
|
||||
(at 38.735 160.02 0)
|
||||
(show_name no)
|
||||
(do_not_autoplace no)
|
||||
(effects
|
||||
|
|
@ -4703,7 +4703,7 @@
|
|||
)
|
||||
)
|
||||
(property "Value" "Battery"
|
||||
(at 38.735 170.18 0)
|
||||
(at 38.735 162.56 0)
|
||||
(show_name no)
|
||||
(do_not_autoplace no)
|
||||
(effects
|
||||
|
|
@ -4712,8 +4712,8 @@
|
|||
)
|
||||
)
|
||||
)
|
||||
(property "Footprint" "Connector_JST:JST_PH_S2B-PH-K_1x02_P2.00mm_Horizontal"
|
||||
(at 38.1 165.1 0)
|
||||
(property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Horizontal"
|
||||
(at 38.1 167.64 0)
|
||||
(hide yes)
|
||||
(show_name no)
|
||||
(do_not_autoplace no)
|
||||
|
|
@ -4724,7 +4724,7 @@
|
|||
)
|
||||
)
|
||||
(property "Datasheet" ""
|
||||
(at 38.1 165.1 0)
|
||||
(at 38.1 167.64 0)
|
||||
(hide yes)
|
||||
(show_name no)
|
||||
(do_not_autoplace no)
|
||||
|
|
@ -4735,7 +4735,7 @@
|
|||
)
|
||||
)
|
||||
(property "Description" "Generic connector, single row, 01x02, script generated"
|
||||
(at 38.1 165.1 0)
|
||||
(at 38.1 167.64 0)
|
||||
(hide yes)
|
||||
(show_name no)
|
||||
(do_not_autoplace no)
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
BIN
hardware/housing/c_its-companion-housing-bottom-2mm.3mf
Normal file
BIN
hardware/housing/c_its-companion-housing-bottom-2mm.3mf
Normal file
Binary file not shown.
BIN
hardware/housing/c_its-companion-housing-bottom-7mm.3mf
Normal file
BIN
hardware/housing/c_its-companion-housing-bottom-7mm.3mf
Normal file
Binary file not shown.
BIN
hardware/housing/c_its-companion-housing-bottom-9mm.3mf
Normal file
BIN
hardware/housing/c_its-companion-housing-bottom-9mm.3mf
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
hardware/housing/c_its-companion-housing-lid.3mf
Normal file
BIN
hardware/housing/c_its-companion-housing-lid.3mf
Normal file
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load diff
|
|
@ -1,6 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
## Builds common config for standalone device
|
||||
## -> enable SPAT/ GLOSA with GNSS and a screen + BLE
|
||||
|
||||
cargo run --release -F ble
|
||||
|
|
@ -3,4 +3,4 @@
|
|||
## Builds common config for standalone device with automatic CAM transmission
|
||||
## -> enable SPAT/ GLOSA with GNSS and a screen + CAM transmission
|
||||
|
||||
cargo run --release -F cam_tx,ble
|
||||
cargo run --release -F cam_tx
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue