feature - take line follower out#306
Merged
RobertLucian merged 7 commits intoDexterInd:developfrom Apr 30, 2018
Merged
Conversation
CleoQc
approved these changes
Apr 28, 2018
| # no longer installing avr for arduino | ||
| # install_avr | ||
| install_line_follower | ||
| install_control_panel |
Member
There was a problem hiding this comment.
why is the control panel removed?
Contributor
Author
There was a problem hiding this comment.
Good call. I knew something was missing. Thanks.
Software/Python/easygopigo.py
Outdated
| except: | ||
| try: | ||
| sys.path.insert(0, '/home/pi/GoPiGo/Software/Python/line_follower') | ||
| sys.path.insert(0, '/home/pi/Dexter/DI_Sensors/Python/di_sensors/red_line_follower/line_follower') |
Member
There was a problem hiding this comment.
if line_follower is a system-wide package, then load it via an import.
This was a hack for when it wasn't a system-wide package.
Contributor
Author
There was a problem hiding this comment.
Okay. Then this second try/except block is going out, as well as the other one you mentioned.
Software/Scratch/GoPiGoScratch.py
Outdated
| try: | ||
| import sys | ||
| sys.path.insert(0, '/home/pi/Dexter/GoPiGo/Software/Python/line_follower') | ||
| sys.path.insert(0, '/home/pi/Dexter/DI_Sensors/Python/di_sensors/red_line_follower/line_follower') |
Member
There was a problem hiding this comment.
again, feel free to load it as a proper package.
RobertLucian
added a commit
that referenced
this pull request
Jun 1, 2018
* Remove i2c_mutex, it is now residing in script_tools (#287) * Feature/easygopigo refactoring (#288) * read_position_str() is also needed here to keep in sync with easygopigo3 * Add init_<sensor> methods to the easygopigo class so the two robots are kept in sync * add vscode to .gitignore * Feature/systemwide mutex (#290) * read_position_str() is also needed here to keep in sync with easygopigo3 * support systemwide mutex * Bug/line follower + overall mutex (#291) * read_position_str() is also needed here to keep in sync with easygopigo3 * support systemwide mutex * Fix import line to its more generic form * Fix/overallmutexcheck (#292) * read_position_str() is also needed here to keep in sync with easygopigo3 * Query overallmutex flag every single time * fix - remove arduino support (#293) * fix - IR receiver on Stretch (#295) fix - IR receiver on Stretch * make IR Receiver in easygopigo Python3 ready (#298) * Sync master into develop (#305) * Fix Mutex update (#303) * flip develop to master branch for DexterOS (#304) * Remove i2c_mutex, it is now residing in script_tools (#287) * Feature/easygopigo refactoring (#288) * read_position_str() is also needed here to keep in sync with easygopigo3 * Add init_<sensor> methods to the easygopigo class so the two robots are kept in sync * add vscode to .gitignore * Feature/systemwide mutex (#290) * read_position_str() is also needed here to keep in sync with easygopigo3 * support systemwide mutex * Bug/line follower + overall mutex (#291) * read_position_str() is also needed here to keep in sync with easygopigo3 * support systemwide mutex * Fix import line to its more generic form * Fix/overallmutexcheck (#292) * read_position_str() is also needed here to keep in sync with easygopigo3 * Query overallmutex flag every single time * fix - remove arduino support (#293) * fix - IR receiver on Stretch (#295) fix - IR receiver on Stretch * make IR Receiver in easygopigo Python3 ready (#298) * feature - take line follower out (#306) * feature - take the line follower install functions out * feature - remove line follower files * feature - make modifications to accomodate di_sensors instead * feature - change to di_sensors paths * feature - change path due to the presence of a new setup.py * feature - change paths to DI_Sensors * feature - add in a function and use regular imports for line_follower * feature - change the way the install script installs the robot (#308) * feature - add in bulk changes to the installer scripts * feature - redefining variables and procedures in install script * feature - add function for installing a python package and other stuff * feature - changing just a comment * feature - change when to exit based on what executable is present * feature - revert a check for git presence * feature - exit installer if script_tools fails * feature - go without using pip for installing large packages * feature - fix errors during installation phase * feature - uninstall python packages directly without pip * feature - fix syntax error in bash for if statement * feature - skipping the installation of Adafruit_DHT - too much time * feature - add avrdude & make temp file hidden * feature - make sure the Dexter folder can be created & add REAMDE * feature - make the same changes as on the grovepi * feature - make the same changes to install.sh as on the GrovePi * feature - fix lingering syntax issues * feature - correct bad path to setup folder on gopigo * feature - remove space echoes * feature - yet again remove space echoes in install script * feature - add source for 2 functions for avr installer * feature - replacing "aborting" with "exiting" * feature - check if script is run with pi user * feature - correct name of installer * feature - fix global variable issue * feature - change how the installation script goes * feature - slight grammatical change in readme * feature - change sources for install script (#309) * feature - add in bulk changes to the installer scripts * feature - redefining variables and procedures in install script * feature - add function for installing a python package and other stuff * feature - changing just a comment * feature - change when to exit based on what executable is present * feature - revert a check for git presence * feature - exit installer if script_tools fails * feature - go without using pip for installing large packages * feature - fix errors during installation phase * feature - uninstall python packages directly without pip * feature - fix syntax error in bash for if statement * feature - skipping the installation of Adafruit_DHT - too much time * feature - add avrdude & make temp file hidden * feature - make sure the Dexter folder can be created & add REAMDE * feature - make the same changes as on the grovepi * feature - make the same changes to install.sh as on the GrovePi * feature - fix lingering syntax issues * feature - correct bad path to setup folder on gopigo * feature - remove space echoes * feature - yet again remove space echoes in install script * feature - add source for 2 functions for avr installer * feature - replacing "aborting" with "exiting" * feature - check if script is run with pi user * feature - correct name of installer * feature - fix global variable issue * feature - change how the installation script goes * feature - slight grammatical change in readme * feature - change sources * rewrite Control Panel (#310) * write Control Panel * Fix GUI related to trimming * feature - change script_tools reference (#311) * write Control Panel * Fix GUI related to trimming * feature - change script_tools reference * use direct links instead of redirects
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
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.
Remove the line follower from the GoPiGo and also adjusts the paths accordingly. Tested with DexterInd/DI_Sensors#46 and it works fine.
Pay real attention to the paths as those have been a big pain so far! One bad path and we end with something non functional.
This goes hand in hand with DexterInd/DI_Sensors#46.