This repository was archived by the owner on Apr 17, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2
Kp/add fastening robot schema #87
Merged
Merged
Changes from 12 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
c572d24
Add fastening robot schema
KavanPrice c950ebc
Add fastening robot axis
KavanPrice 8305dac
Fix fastening axis UUID
KavanPrice 88aacf2
Add fastening vision system
KavanPrice 8bbd5ff
Add non-fastening axis
KavanPrice 137fde2
Add ctrl and status properties to fastening axis
KavanPrice 51baa54
Fix misnamed axis properties
KavanPrice 3e0ed29
Add missing property linear drive torque
KavanPrice 0c6bef5
Add ILD
KavanPrice 9ee1fe5
Add fastening end effector
KavanPrice ea746b5
Move cell information to cell schema
KavanPrice 6b1386f
Move axis information to axis schema
KavanPrice 20e75a5
Add cell doors
KavanPrice 412ee3d
Remove cell from robot
KavanPrice 8654dc5
Rename fastening robot end effectors
KavanPrice 6b4f013
Flatten correction objects and add to end effector
KavanPrice ef81dcf
Add base robot for fastening robot
KavanPrice 65c827a
Change to top-level vision schema
KavanPrice e6da02f
Merge branch 'main' into kp/add-fastening-robot-schema
AlexGodbehere 2913f0d
Add device information for fastening robot
KavanPrice 328053a
Merge branch 'kp/add-fastening-robot-schema' of https://github.com/AM…
KavanPrice File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,72 @@ | ||
| { | ||
| "$id": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Cell/Cell-v1.json", | ||
| "$schema": "https://json-schema.org/draft/2020-12/schema", | ||
| "title": "Cell", | ||
| "type": "object", | ||
| "properties": { | ||
| "Schema_UUID": { | ||
| "const": "aa8f98ad-2c6e-4fef-86d1-f01b576b35ed" | ||
| "$id": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Cell/Cell-v1.json", | ||
| "$schema": "https://json-schema.org/draft/2020-12/schema", | ||
| "title": "Cell", | ||
| "type": "object", | ||
| "properties": { | ||
| "Schema_UUID": { | ||
| "const": "aa8f98ad-2c6e-4fef-86d1-f01b576b35ed" | ||
| }, | ||
| "Instance_UUID": { | ||
| "description": "The unique identifier for this object. (A UUID specified by RFC4122).", | ||
| "type": "string", | ||
| "format": "uuid" | ||
| }, | ||
| "Safety": { | ||
| "type": "object", | ||
| "properties": { | ||
| "Emergency_Stops": { | ||
| "type": "object", | ||
| "patternProperties": { | ||
| "^[a-zA-Z0-9_]*$": { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Cell/Emergency_Stop-v1.json" | ||
| } | ||
| } | ||
| }, | ||
| "Instance_UUID": { | ||
| "description": "The unique identifier for this object. (A UUID specified by RFC4122).", | ||
| "type": "string", | ||
| "format": "uuid" | ||
| "Protective_Stops": { | ||
| "type": "object", | ||
| "patternProperties": { | ||
| "^[a-zA-Z0-9_]*$": { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Cell/Protective_Stop-v1.json" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "Cell_Connected": { | ||
| "allOf": [ | ||
| { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Common/Metric-v1.json" | ||
| }, | ||
| "Safety": { | ||
| "type": "object", | ||
| "properties": { | ||
| "Emergency_Stops": { | ||
| "type": "object", | ||
| "patternProperties": { | ||
| "^[a-zA-Z0-9_]*$": { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Cell/Emergency_Stop-v1.json" | ||
| } | ||
| } | ||
| }, | ||
| "Protective_Stops": { | ||
| "type": "object", | ||
| "patternProperties": { | ||
| "^[a-zA-Z0-9_]*$": { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Cell/Protective_Stop-v1.json" | ||
| } | ||
| } | ||
| } | ||
| { | ||
| "properties": { | ||
| "Documentation": { | ||
| "default": "" | ||
| }, | ||
| "Sparkplug_Type": { | ||
| "enum": ["Boolean"] | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "required": [ | ||
| "Schema_UUID", | ||
| "Instance_UUID" | ||
| ] | ||
| } | ||
| "Cell_Door_Secure": { | ||
|
AlexGodbehere marked this conversation as resolved.
Outdated
|
||
| "allOf": [ | ||
| { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Common/Metric-v1.json" | ||
| }, | ||
| { | ||
| "properties": { | ||
| "Documentation": { | ||
| "default": "" | ||
| }, | ||
| "Sparkplug_Type": { | ||
| "enum": ["Boolean"] | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "required": ["Schema_UUID", "Instance_UUID"] | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| { | ||
| "$id": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Robot/Fastening_Robot/Correction_FastenerFind-v1.json", | ||
| "$schema": "https://json-schema.org/draft/2020-12/schema", | ||
| "type": "object", | ||
| "properties": { | ||
| "Schema_UUID": { | ||
| "const": "6e3c45d4-b28d-4a64-8e03-a2c805bb04d9" | ||
| }, | ||
| "Instance_UUID": { | ||
| "description": "The unique identifier for this object. (A UUID specified by RFC4122).", | ||
| "type": "string", | ||
| "format": "uuid" | ||
| }, | ||
| "Fastener_Score": { | ||
| "allOf": [ | ||
| { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Common/Metric-v1.json" | ||
| }, | ||
| { | ||
| "properties": { | ||
| "Documentation": { | ||
| "default": "" | ||
| }, | ||
| "Sparkplug_Type": { | ||
| "enum": ["Int8"] | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "Fastener_Present": { | ||
| "allOf": [ | ||
| { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Common/Metric-v1.json" | ||
| }, | ||
| { | ||
| "properties": { | ||
| "Documentation": { | ||
| "default": "" | ||
| }, | ||
| "Sparkplug_Type": { | ||
| "enum": ["Boolean"] | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "Fastener_Head_Dia": { | ||
| "allOf": [ | ||
| { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Common/Metric-v1.json" | ||
| }, | ||
| { | ||
| "properties": { | ||
| "Documentation": { | ||
| "default": "" | ||
| }, | ||
| "Sparkplug_Type": { | ||
| "enum": ["FloatLE"] | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "Fastener_Whole_Dia": { | ||
| "allOf": [ | ||
| { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Common/Metric-v1.json" | ||
| }, | ||
| { | ||
| "properties": { | ||
| "Documentation": { | ||
| "default": "" | ||
| }, | ||
| "Sparkplug_Type": { | ||
| "enum": ["FloatLE"] | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "Pass": { | ||
| "allOf": [ | ||
| { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Common/Metric-v1.json" | ||
| }, | ||
| { | ||
| "properties": { | ||
| "Documentation": { | ||
| "default": "" | ||
| }, | ||
| "Sparkplug_Type": { | ||
| "enum": ["Boolean"] | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "X": { | ||
| "allOf": [ | ||
| { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Common/Metric-v1.json" | ||
| }, | ||
| { | ||
| "properties": { | ||
| "Documentation": { | ||
| "default": "" | ||
| }, | ||
| "Sparkplug_Type": { | ||
| "enum": ["FloatLE"] | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "Y": { | ||
| "allOf": [ | ||
| { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Common/Metric-v1.json" | ||
| }, | ||
| { | ||
| "properties": { | ||
| "Documentation": { | ||
| "default": "" | ||
| }, | ||
| "Sparkplug_Type": { | ||
| "enum": ["FloatLE"] | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "required": ["Schema_UUID", "Instance_UUID"] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| { | ||
| "$id": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Robot/Fastening_Robot/Correction_HoleFind-v1.json", | ||
| "$schema": "https://json-schema.org/draft/2020-12/schema", | ||
| "type": "object", | ||
| "properties": { | ||
| "Schema_UUID": { | ||
| "const": "1dd3e8f8-0b28-420e-bbf3-9e34c01b8bda" | ||
| }, | ||
| "Instance_UUID": { | ||
| "description": "The unique identifier for this object. (A UUID specified by RFC4122).", | ||
| "type": "string", | ||
| "format": "uuid" | ||
| }, | ||
| "Hole_Clear": { | ||
| "allOf": [ | ||
| { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Common/Metric-v1.json" | ||
| }, | ||
| { | ||
| "properties": { | ||
| "Documentation": { | ||
| "default": "" | ||
| }, | ||
| "Sparkplug_Type": { | ||
| "enum": ["Boolean"] | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "Hole_Score": { | ||
| "allOf": [ | ||
| { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Common/Metric-v1.json" | ||
| }, | ||
| { | ||
| "properties": { | ||
| "Documentation": { | ||
| "default": "" | ||
| }, | ||
| "Sparkplug_Type": { | ||
| "enum": ["Int8"] | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "Inner_Hole_Dia": { | ||
| "allOf": [ | ||
| { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Common/Metric-v1.json" | ||
| }, | ||
| { | ||
| "properties": { | ||
| "Documentation": { | ||
| "default": "" | ||
| }, | ||
| "Sparkplug_Type": { | ||
| "enum": ["FloatLE"] | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "Outer_Csnk_Dia": { | ||
| "allOf": [ | ||
| { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Common/Metric-v1.json" | ||
| }, | ||
| { | ||
| "properties": { | ||
| "Documentation": { | ||
| "default": "" | ||
| }, | ||
| "Sparkplug_Type": { | ||
| "enum": ["FloatLE"] | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "Pass": { | ||
| "allOf": [ | ||
| { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Common/Metric-v1.json" | ||
| }, | ||
| { | ||
| "properties": { | ||
| "Documentation": { | ||
| "default": "" | ||
| }, | ||
| "Sparkplug_Type": { | ||
| "enum": ["Boolean"] | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "X": { | ||
| "allOf": [ | ||
| { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Common/Metric-v1.json" | ||
| }, | ||
| { | ||
| "properties": { | ||
| "Documentation": { | ||
| "default": "" | ||
| }, | ||
| "Sparkplug_Type": { | ||
| "enum": ["FloatLE"] | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "Y": { | ||
| "allOf": [ | ||
| { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Common/Metric-v1.json" | ||
| }, | ||
| { | ||
| "properties": { | ||
| "Documentation": { | ||
| "default": "" | ||
| }, | ||
| "Sparkplug_Type": { | ||
| "enum": ["FloatLE"] | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "required": ["Schema_UUID", "Instance_UUID"] | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Work out what this means and decide where it goes.