Open
Conversation
…module, updated readme
hjed
requested changes
Sep 13, 2018
| gnome-terminal --tab --command="bash -c '$openocd; $SHELL'" \ | ||
| --tab --command="bash -c '$serial; $SHELL'" \ | ||
| --tab --command="bash -c '$debug; $SHELL'" \ | ||
| --disable-factory |
Member
There was a problem hiding this comment.
would be better to use something more portable like tmux
| @@ -0,0 +1,12 @@ | |||
| Initialisation: | |||
Member
There was a problem hiding this comment.
for all files that are in common please address comments on #12 before merging this (all the adc stuff)
| @@ -0,0 +1,144 @@ | |||
| #include "i2c.h" | |||
| SysCtlPeripheralReset(sysctl_module_i2c[module]); | ||
| } | ||
|
|
||
| //GPIOIntRegister(i2c_module[module], i2cIntHandler) // might do interrupts later |
| } | ||
|
|
||
| /* | ||
| void i2c_write(i2cModule_t module, uint8_t msg[], size_t length) { |
| PUBLIC | ||
| ${science-mod_headers} | ||
| ) | ||
| endfunction() |
Member
There was a problem hiding this comment.
this is not the right place for this. Its not related to ros-echronos, probably belongs in the science-mod or /build-tools folder
| include(${BUILD_TOOLS_DIR}/module_template.cmake) | ||
|
|
||
| #set(CPP_FILES adc_test.cpp can_wait_task.cpp) | ||
| set(CPP_FILES adc_test.cpp) |
|
|
||
| /* Should never reach here, but if we do, an infinite loop is | ||
| easier to debug than returning somewhere random. */ | ||
| for (;;) ; |
| i2c_select(I2C0, module_num); // select multiplexer output | ||
| // UARTprintf("Initialising science servo to neutral position\n"); | ||
| // servo_init(SCIENCE_SERVO, SCIENCE_SERVO_PIN); | ||
| // servo_write(SCIENCE_SERVO, SCIENCE_SERVO_PIN, NEUTRAL_POS); |
src/modules/science/science.cpp
Outdated
| // Create the publisher | ||
| ros_echronos::ROS_INFO("Data pub init\n"); | ||
| owr_messages::science science_buffer_out[5]; | ||
| ros_echronos::Publisher<owr_messages::science> science_pub("science/data", science_buffer_out, 5, false); |
Member
There was a problem hiding this comment.
these should all have topics starting with / I'd actually try and match these with the voltmeter one in terms of naming as well
Member
|
Also this repo is BSB + AGPL license |
Member
|
@burrrrrr what's happening with this pr? |
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Science module lib