Skip to content

Commit

Permalink
Merge branch 'balena-io:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Iznogohul authored Oct 24, 2023
2 parents 6fe17f5 + 42e712d commit 4046038
Show file tree
Hide file tree
Showing 6 changed files with 156 additions and 4 deletions.
39 changes: 39 additions & 0 deletions .versionbot/CHANGELOG.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,42 @@
- commits:
- subject: "hw.device-type: Modify bluechiptechnology-tm3"
hash: 3d2002c5e35f4d20fc5ef5307f52f1cfbb91d6ab
body: ""
footer:
Change-type: patch
change-type: patch
Signed-off-by: Chris Richardson <[email protected]>
signed-off-by: Chris Richardson <[email protected]>
author: crichardson
version: 2.0.80
title: ""
date: 2023-10-20T05:40:17.796Z
- commits:
- subject: "device: Add Compulab UCM-iMX93"
hash: 2bbde3e92d6e1a6c3f9d63e9e79b14b70b755f80
body: ""
footer:
Change-type: patch
change-type: patch
Signed-off-by: Alexnadru Costache <[email protected]>
signed-off-by: Alexnadru Costache <[email protected]>
author: Alexandru Costache
version: 2.0.79
title: ""
date: 2023-10-19T12:44:49.999Z
- commits:
- subject: "hw.device-type: Modify bluechiptechnology-tm3"
hash: 744605ce53f5091f1661c301962dba44c439481a
body: ""
footer:
Change-type: patch
change-type: patch
Signed-off-by: Chris Richardson <[email protected]>
signed-off-by: Chris Richardson <[email protected]>
author: crichardson
version: 2.0.78
title: ""
date: 2023-10-19T07:29:25.960Z
- commits:
- subject: "hw.device-type: Add bluechiptechnology-tm3"
hash: 68790a8618f57524be7ea70b7502d65917de91ad
Expand Down
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,21 @@
* Device: Add new contract for Stem x86 32bit [Trong Nghia Nguyen]
* Qemu: Update qemu to v3.0.0+resin [Trong Nghia Nguyen]

# v2.0.80
## (2023-10-20)

* hw.device-type: Modify bluechiptechnology-tm3 [crichardson]

# v2.0.79
## (2023-10-19)

* device: Add Compulab UCM-iMX93 [Alexandru Costache]

# v2.0.78
## (2023-10-19)

* hw.device-type: Modify bluechiptechnology-tm3 [crichardson]

# v2.0.77
## (2023-10-09)

Expand Down
9 changes: 7 additions & 2 deletions contracts/hw.device-type/bluechiptechnology-tm3/contract.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,14 @@
"internal": true
},
"media": {
"defaultBoot": "sdcard",
"altBoot": ["internal"]
"defaultBoot": "internal",
"altBoot": ["sdcard"]
},
"is_private": false
},
"partials": {
"bootDeviceExternal": ["Connect power to the {{name}}"],
"flashIndicator": ["Screen and ethernet green LED are off"],
"bootDevice": ["Remove and re-connect power to the {{name}}"]
}
}
39 changes: 39 additions & 0 deletions contracts/hw.device-type/ucm-imx93/contract.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"slug": "ucm-imx93",
"version": "1",
"type": "hw.device-type",
"aliases": [],
"name": "Compulab UCM-iMX93 Devkit",
"assets": {
"logo": {
"url": "./ucm-imx93.svg",
"name": "logo"
}
},
"data": {
"arch": "aarch64",
"hdmi": false,
"led": false,
"connectivity": {
"bluetooth": true,
"wifi": true
},
"storage": {
"internal": true
},
"media": {
"defaultBoot": "internal",
"altBoot": ["sdcard"]
},
"is_private": false
},
"partials": {
"bootDeviceExternal": [
"Connect power to the {{name}}",
"Press and hold SW3 followed by SW4",
"Release SW3 followed by SW4"
],
"flashIndicator": ["ethernet LEDs are off for more than 5 seconds. An Ethernet cable needs pe plugged in for the LEDs to stay on during provisioning."],
"bootDevice": ["Remove and re-connect power to the {{name}}"]
}
}
54 changes: 54 additions & 0 deletions contracts/hw.device-type/ucm-imx93/ucm-imx93.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "contracts",
"version": "2.0.77",
"version": "2.0.80",
"description": "Balena Base Contracts",
"repository": {
"type": "git",
Expand All @@ -21,6 +21,6 @@
"eslint-plugin-standard": "^3.0.1"
},
"versionist": {
"publishedAt": "2023-10-09T06:33:18.479Z"
"publishedAt": "2023-10-20T05:40:18.416Z"
}
}

0 comments on commit 4046038

Please sign in to comment.