-
Notifications
You must be signed in to change notification settings - Fork 16
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ping360 update #161
Open
jaxxzer
wants to merge
2
commits into
bluerobotics:master
Choose a base branch
from
jaxxzer:ping360
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
ping360 update #161
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 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 |
---|---|---|
|
@@ -8,12 +8,16 @@ | |
{ | ||
"name": "id", | ||
"type": "u8", | ||
"description": "Device ID (1-254). 0 and 255 are reserved." | ||
"description": "Device ID (1-254). 0 and 255 are reserved.", | ||
"minimum": "1", | ||
"maximum": "254", | ||
"default": "2" | ||
}, | ||
{ | ||
"name": "reserved", | ||
"type": "u8", | ||
"description": "reserved" | ||
"description": "reserved, value shall be zero", | ||
"default": "0" | ||
} | ||
] | ||
} | ||
|
@@ -24,42 +28,61 @@ | |
"description": "This message is used to communicate the current sonar state. If the data field is populated, the other fields indicate the sonar state when the data was captured. The time taken before the response to the command is sent depends on the difference between the last angle scanned and the new angle in the parameters as well as the number of samples and sample interval (range). To allow for the worst case reponse time the command timeout should be set to 4000 msec.", | ||
"payload": [ | ||
{ | ||
"name": "mode", | ||
"name": "reserved", | ||
"type": "u8", | ||
"description": "Operating mode (1 for Ping360)" | ||
"description": "reserved, value shall be zero", | ||
"default": "0" | ||
}, | ||
{ | ||
"name": "gain_setting", | ||
"type": "u8", | ||
"description": "Analog gain setting (0 = low, 1 = normal, 2 = high)" | ||
"description": "Analog gain setting (0 = low, 1 = normal, 2 = high)", | ||
"minimum": "0", | ||
"maximum": "2", | ||
"default": "0" | ||
}, | ||
{ | ||
"name": "angle", | ||
"type": "u16", | ||
"description": "Head angle", | ||
"units": "gradian" | ||
"units": "gradian", | ||
"minimum": "0", | ||
"maximum": "399", | ||
"default": "0" | ||
}, | ||
{ | ||
"name": "transmit_duration", | ||
"type": "u16", | ||
"description": "Acoustic transmission duration (1~1000 microseconds)", | ||
"units": "microsecond" | ||
"units": "microsecond", | ||
"minimum": "1", | ||
"maximum": "1000", | ||
"default": "32" | ||
}, | ||
{ | ||
"name": "sample_period", | ||
"type": "u16", | ||
"description": "Time interval between individual signal intensity samples in 25nsec increments (80 to 40000 == 2 microseconds to 1000 microseconds)" | ||
"description": "Time interval between individual signal intensity samples in 25nsec increments (80 to 40000 == 2 microseconds to 1000 microseconds)", | ||
"minimum": "80", | ||
"maximum": "40000", | ||
"default": "80" | ||
}, | ||
{ | ||
"name": "transmit_frequency", | ||
"type": "u16", | ||
"description": "Acoustic operating frequency. Frequency range is 500kHz to 1000kHz, however it is only practical to use say 650kHz to 850kHz due to the narrow bandwidth of the acoustic receiver.", | ||
"units": "kHz" | ||
"units": "kHz", | ||
"minimum": "500", | ||
"maximum": "1000", | ||
"default": "740" | ||
}, | ||
{ | ||
"name": "number_of_samples", | ||
"type": "u16", | ||
"description": "Number of samples per reflected signal" | ||
"description": "Number of samples per reflected signal", | ||
"minimum": "200", | ||
"maximum": "1200", | ||
"default": "1024" | ||
}, | ||
{ | ||
"name": "data", | ||
|
@@ -82,12 +105,14 @@ | |
{ | ||
"name": "bootloader", | ||
"type": "u8", | ||
"description": "0 = skip bootloader; 1 = run bootloader" | ||
"description": "0 = skip bootloader; 1 = run bootloader", | ||
"default": "0" | ||
}, | ||
{ | ||
"name": "reserved", | ||
"type": "u8", | ||
"description": "reserved" | ||
"description": "reserved, value shall be zero", | ||
"default": "0" | ||
} | ||
] | ||
}, | ||
|
@@ -96,52 +121,73 @@ | |
"description": "The transducer will apply the commanded settings. The sonar will reply with a `ping360_data` message. If the `transmit` field is 0, the sonar will not transmit after locating the transducer, and the `data` field in the `ping360_data` message reply will be empty. If the `transmit` field is 1, the sonar will make an acoustic transmission after locating the transducer, and the resulting data will be uploaded in the `data` field of the `ping360_data` message reply. To allow for the worst case reponse time the command timeout should be set to 4000 msec.", | ||
"payload": [ | ||
{ | ||
"name": "mode", | ||
"name": "reserved", | ||
"type": "u8", | ||
"description": "Operating mode (1 for Ping360)" | ||
"description": "reserved, value shall be zero", | ||
"default": "0" | ||
}, | ||
{ | ||
"name": "gain_setting", | ||
"type": "u8", | ||
"description": "Analog gain setting (0 = low, 1 = normal, 2 = high)" | ||
"description": "Analog gain setting (0 = low, 1 = normal, 2 = high)", | ||
"minimum": "0", | ||
"maximum": "2", | ||
"default": "0" | ||
}, | ||
{ | ||
"name": "angle", | ||
"type": "u16", | ||
"description": "Head angle", | ||
"units": "gradian" | ||
"units": "gradian", | ||
"minimum": "0", | ||
"maximum": "399", | ||
"default": "0" | ||
}, | ||
{ | ||
"name": "transmit_duration", | ||
"type": "u16", | ||
"description": "Acoustic transmission duration (1~1000 microseconds)", | ||
"units": "microsecond" | ||
"units": "microsecond", | ||
"minimum": "1", | ||
"maximum": "1000", | ||
"default": "32" | ||
}, | ||
{ | ||
"name": "sample_period", | ||
"type": "u16", | ||
"description": "Time interval between individual signal intensity samples in 25nsec increments (80 to 40000 == 2 microseconds to 1000 microseconds)" | ||
"description": "Time interval between individual signal intensity samples in 25nsec increments (80 to 40000 == 2 microseconds to 1000 microseconds)", | ||
"minimum": "80", | ||
"maximum": "40000", | ||
"default": "80" | ||
}, | ||
{ | ||
"name": "transmit_frequency", | ||
"type": "u16", | ||
"description": "Acoustic operating frequency. Frequency range is 500kHz to 1000kHz, however it is only practical to use say 650kHz to 850kHz due to the narrow bandwidth of the acoustic receiver.", | ||
"units": "kHz" | ||
"units": "kHz", | ||
"minimum": "500", | ||
"maximum": "1000", | ||
"default": "740" | ||
}, | ||
{ | ||
"name": "number_of_samples", | ||
"type": "u16", | ||
"description": "Number of samples per reflected signal" | ||
"description": "Number of samples per reflected signal", | ||
"minimum": "200", | ||
"maximum": "1200", | ||
"default": "1024" | ||
}, | ||
{ | ||
"name": "transmit", | ||
"type": "u8", | ||
"description": "0 = do not transmit; 1 = transmit after the transducer has reached the specified angle" | ||
"description": "0 = do not transmit; 1 = transmit after the transducer has reached the specified angle", | ||
"default": "0" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. missing maximum and minimum. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is not a range value. It is an enumeration. I think range does not make sense here. |
||
}, | ||
{ | ||
"name": "reserved", | ||
"type": "u8", | ||
"description": "reserved" | ||
"description": "reserved, value shall be zero", | ||
"default": "0" | ||
} | ||
] | ||
} | ||
|
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.
minimum and maximum are missing here.
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.
This is not a range value. It is an enumeration. I think range does not make sense here.
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.
if it's an enum, it's better to use identifiers instead of integers in the json