Skip to content

Conversation

@Harrier-SA
Copy link
Contributor

This pull request adds support for a new RTDE driver to the ACS service setup. The main changes include registering the RTDE driver, defining its configuration schema and presentation details, and assigning it a unique UUID.

RTDE Driver Integration:

  • Registered the ACS.Driver.RTDE object in edge.yaml to enable RTDE driver support.
  • Added a detailed configuration schema for ACS.Driver.RTDE in edge.yaml, including connection details (host, port), presentation fields (address, path), and descriptions for available metric addresses and JSONPath usage.

Identifiers and Metadata:

  • Assigned a unique UUID for ACS.Driver.RTDE in lib/uuids.js to ensure proper identification and referencing throughout the system.

amrc-benmorrow
amrc-benmorrow previously approved these changes Oct 22, 2025
@amrc-benmorrow
Copy link
Contributor

@Harrier-SA Are you able to set up commit signing? We have set this repo to require signed commits for better traceability.

We mostly use SSH keys for signing as it's easier. To set this up you need to do this:

  • Create a SSH keypair. Using an existing one is fine as long as it's only yours. You should have one per machine you work on; private keys should not be copied.
  • Upload the public part to GH as a 'signing key'. This is under your account settings, 'SSH and GPG keys'.
  • Run git config --global set user.signingkey <path to private key file>. This configures the key to use but doesn't activate signing.
  • Run git config --global set gpg.format ssh. This configures SSH rather than GPG signing. (This can be set per-repo if you'd rather.)
  • In each checkout where you want to sign commits, run git config set commit.gpgSign true.
  • If you have an existing branch open, git rebase -f <start of branch> will rewrite all the commits so they are signed.
  • git push -f to force-push the new commits to the PR.

@AlexGodbehere
Copy link
Contributor

@Harrier-SA Are you able to set up commit signing? We have set this repo to require signed commits for better traceability.

We mostly use SSH keys for signing as it's easier. To set this up you need to do this:

  • Create a SSH keypair. Using an existing one is fine as long as it's only yours. You should have one per machine you work on; private keys should not be copied.
  • Upload the public part to GH as a 'signing key'. This is under your account settings, 'SSH and GPG keys'.
  • Run git config --global set user.signingkey <path to private key file>. This configures the key to use but doesn't activate signing.
  • Run git config --global set gpg.format ssh. This configures SSH rather than GPG signing. (This can be set per-repo if you'd rather.)
  • In each checkout where you want to sign commits, run git config set commit.gpgSign true.
  • If you have an existing branch open, git rebase -f <start of branch> will rewrite all the commits so they are signed.
  • git push -f to force-push the new commits to the PR.

@Harrier-SA it also might be worth not pulling the latest changes from remote before you do this. I accidentally updated this branch, but if you git push -f with your local copy then it will undo my mistake. Ideally you would rebase from main locally before you push, but we can do that after if you'd prefer.

Harrier-SA and others added 12 commits October 22, 2025 10:16
This makes more sense given the behaviour of the underlying library.
…dling

- Added `driver-passwords` and `scripts/` to .gitignore
- Created LOCAL_DEVELOPMENT.md for Edge Agent setup instructions
- Refactored driver.js and rtde.js for improved connection handling and data parsing
- Updated async.js to enhance data logging logic
- Bumped edge-driver version to 0.0.5 in package-lock.json
-Tested with Factory+ instance and achieved succesful data flow.
Undo changes to lib/js-edge-driver/lib/driver.js and edge-rtde/lib/rtde.js.
@Harrier-SA
Copy link
Contributor Author

@amrc-benmorrow @AlexGodbehere Thanks for the advice on getting this set-up I believe I have now done it and rebased the changes to include the commit signing.

Copy link
Contributor

@amrc-benmorrow amrc-benmorrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes here are correct; the history is now a bit of a mess because I pressed the wrong button on the GH UI and I can't now undo it. Some of the commits are now duplicated in signed and unsigned versions, but it doesn't really matter.

@amrc-benmorrow amrc-benmorrow merged commit ad5e5b1 into AMRC-FactoryPlus:main Oct 22, 2025
1 check passed
@AlexGodbehere
Copy link
Contributor

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants