This repository was archived by the owner on Apr 17, 2025. It is now read-only.
Kp/add fastening robot schema#87
Merged
Merged
Conversation
AlexGodbehere
suggested changes
Apr 8, 2025
AlexGodbehere
suggested changes
Apr 8, 2025
Comment on lines
+36
to
+49
| "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"] | ||
| } | ||
| } |
Contributor
There was a problem hiding this comment.
Work out what this means and decide where it goes.
Comment on lines
+62
to
+73
| "Cell": { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Cell/Cell-v1.json" | ||
| }, | ||
| "E_Stop_Overall": { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Cell/Emergency_Stop-v1.json" | ||
| }, | ||
| "E_Stop_SW_External": { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Cell/Emergency_Stop-v1.json" | ||
| }, | ||
| "E_Stop_SW_Internal": { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Cell/Emergency_Stop-v1.json" | ||
| } |
Comment on lines
+53
to
+61
| "Correction_FastenerFind": { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Robot/Fastening_Robot/Correction_FastenerFind-v1.json" | ||
| }, | ||
| "Correction_HoleFind": { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Robot/Fastening_Robot/Correction_HoleFind-v1.json" | ||
| }, | ||
| "Correction_Laser": { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Robot/Fastening_Robot/Correction_Laser-v1.json" | ||
| }, |
Contributor
There was a problem hiding this comment.
Flatten and put on bespoke EE
| } | ||
| } | ||
| }, | ||
| "End_Effectors": { |
Contributor
There was a problem hiding this comment.
Suggested change
| "End_Effectors": { | |
| "Fastening_End_Effectors": { |
AlexGodbehere
suggested changes
Apr 9, 2025
Comment on lines
+35
to
+43
| "Axes": { | ||
| "type": "object", | ||
| "patternProperties": { | ||
| "^[a-zA-Z0-9_]*$": { | ||
| "$comment": "An axis name or identifier - can be any regular string", | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Common/Axis-v1.json" | ||
| } | ||
| } | ||
| }, |
Contributor
There was a problem hiding this comment.
This should be Base_Robot and be an instance of Robot-v1. Then we get all of the "robot properties" too.
AlexGodbehere
suggested changes
Apr 9, 2025
Comment on lines
-32
to
-34
| "Device_Information": { | ||
| "$ref": "https://raw.githubusercontent.com/AMRC-FactoryPlus/schemas/main/Common/Device_Information-v1.json" | ||
| }, |
…RC-FactoryPlus/schemas into kp/add-fastening-robot-schema
AlexGodbehere
approved these changes
Apr 9, 2025
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.
Add: