Cam update#5

Open

farrellw wants to merge 136 commits into

chi-bobolinks-2016:masterfrom

jwarshaw:cam-update

Commits on Nov 6, 2016

Commits on Nov 7, 2016

Commits on Nov 8, 2016

Add logic to only analyze picture if the picture is a valid image
Greg Garner
committed
Refactor around error statement. Change from getting greg to getting greg test on get image request from server
Greg Garner
committed
Delete unnecessary function, get image x times. That logic done in controller.
Greg Garner
committed
Fix merge conflict. Kept Henry's changes on driving server. Fixed indentations
Greg Garner
committed
Merge pull request #12 from jwarshaw/controller_branch
jwarshaw
authored
Move logic from analyze pic path to controller/controller
Greg Garner
committed
Merge pull request #13 from jwarshaw/controller_organization
hfyfe
authored
add verbosity to server
hfyfe
committed
Add psuedocode logic
Greg Garner
committed
Relocate view for easy accessiblility in ssh command from server.
farrellw
committed
Merge pull request #14 from jwarshaw/relocate_view_take_picture
farrellw
authored
Merge branch 'master' into start_organization
Greg Garner
committed
Add start camera function and controller psuedocode logic
Greg Garner
committed
Add start camera functionality to controller
Greg Garner
committed
Add exit logic
farrellw
committed
Merge pull request #15 from jwarshaw/relocate_view_take_picture
farrellw
authored
save
hfyfe
committed
resolving conflicts
hfyfe
committed
Remove dead files
Jonathan Warshaw
committed
Remove artifact file
Jonathan Warshaw
committed
cleaning up errors
hfyfe
committed
syntax error
hfyfe
committed
Start thread logic to start camera while async running program
Greg Garner
committed
Merge branch 'master' into start_organization
Greg Garner
committed
adding driver files
hfyfe
committed
Start thread for starting server. Needs work
Greg Garner
committed
Commented out
Greg Garner
committed
Merge branch 'master' into start_organization
Greg Garner
committed
removing driver code
hfyfe
committed
Merge pull request #17 from jwarshaw/start_organization
Garner412
authored
Run pictures, server, analyzation at the same time. Still need to implement finsihing out pictures, timing of processes.
Greg Garner
committed
Merge pull request #18 from jwarshaw/auto_start_server
Garner412
authored
Move psuedocode around for readability. Push server ending function to connect.py
Greg Garner
committed
Merge pull request #19 from jwarshaw/refactor_controller
Garner412
authored
Merge branch 'master' into detectLines
Jonathan Warshaw
committed
Add line detector file
Jonathan Warshaw
committed
Merge pull request #20 from jwarshaw/detectLines
farrellw
authored
Update analyze module
Jonathan Warshaw
committed
Merge pull request #21 from jwarshaw/detectLines
farrellw
authored
Change controller logic to implment John/Henry analyzeLine
Greg Garner
committed
Fix merge conflict in analyzeLine
Greg Garner
committed
Organize logic for first test run. Call run Analyze lines in controller.
Greg Garner
committed
Merge pull request #22 from jwarshaw/test_run_1
farrellw
authored
Flip cam vert and horiz
Greg Garner
committed
Merge pull request #23 from jwarshaw/camera
farrellw
authored

Commits on Nov 9, 2016

Remove views folder including artifact and duplicte files
Jonathan Warshaw
committed
Merge pull request #24 from jwarshaw/cleaner
farrellw
authored
Remove init file from controllers folder
Jonathan Warshaw
committed
Merge pull request #25 from jwarshaw/cleaner
farrellw
authored
Remove artifact files from models folder
Jonathan Warshaw
committed
Merge pull request #26 from jwarshaw/cleaner
farrellw
authored
Remove models folder and copy pertinent files to root directory
Jonathan Warshaw
committed
Merge pull request #27 from jwarshaw/cleaner
farrellw
authored
To merge
Greg Garner
committed
Merge branch 'master' of https://github.com/jwarshaw/RaspberryDrive
Greg Garner
committed
Change import path
Greg Garner
committed
Merge pull request #28 from jwarshaw/change_import_path
jwarshaw
authored
Add gitignore file
Jonathan Warshaw
committed
Add images folder to gitignore file
Jonathan Warshaw
committed
Merge pull request #29 from jwarshaw/cleaner
jwarshaw
authored
Remove artifact files from root directory and add library to readme
Jonathan Warshaw
committed
Merge pull request #30 from jwarshaw/cleaner
farrellw
authored
Remove dud pyc files
Jonathan Warshaw
committed
Remove artifact pyc files
Jonathan Warshaw
committed
Merge pull request #31 from jwarshaw/cleaner
farrellw
authored
Merge branch 'master' of https://github.com/jwarshaw/RaspberryDrive
Jonathan Warshaw
committed
Break driver code in controller into functions
farrellw
committed
Adjust psuedocode
farrellw
committed
Merge pull request #32 from jwarshaw/refactor_controller
farrellw
authored
Delete get image x times
Greg Garner
committed
Merge down to master
Greg Garner
committed
Delete unnecessary thread code
Greg Garner
committed
Merge pull request #33 from jwarshaw/oopd_python_controller
farrellw
authored
Create file to test image caching
Will Farrell
committed
Merge pull request #34 from jwarshaw/image_caching
farrellw
authored
add image caching capability. Images are saved as a zero index
Greg Garner
committed
Commented out code explaining
Greg Garner
committed
Reorganize driver code in controller into methods
Greg Garner
committed
Merge pull request #35 from jwarshaw/img_cache
Garner412
authored
add correct server files, again
Greg Garner & Henry Fyfe
committed
Take out unnecessary returns and semicolons in controller
Greg Garner
committed
Merge pull request #36 from jwarshaw/taking_out_returns_and_semicolons
farrellw
authored
Take out extra unneeded return
Greg Garner
committed
Merge pull request #37 from jwarshaw/taking_out_returns_and_semicolons
farrellw
authored
Remove unnecessary images in images folder
Greg Garner
committed
Merge pull request #38 from jwarshaw/remove_extra_images
farrellw
authored
Merge branch 'master' of https://github.com/jwarshaw/RaspberryDrive
Jonathan Warshaw
committed
fixing whitespace
Greg Garner & Henry Fyfe
committed
renaming files
Greg Garner & Henry Fyfe
committed
refactor of processing and blob recognition into classes
Greg Garner & Henry Fyfe
committed
resolving merge conflicts
Greg Garner & Henry Fyfe
committed
Merge pull request #39 from jwarshaw/pair-garner412,hfyfe
jwarshaw
authored
Add temp file sequence to take picture file
Jonathan Warshaw
committed
Add logic to test pictures
Greg Garner
committed
Merge pull request #40 from jwarshaw/takePicture
Garner412
authored
Merge branch 'master' into color_testing
Greg Garner
committed
Add easy driver code to driver_code_test for getting and testing images
Greg Garner
committed
Merge pull request #41 from jwarshaw/color_testing
jwarshaw
authored
Reduce picture loop to 15 pictures
farrellw
committed
Merge pull request #42 from jwarshaw/pictureloop
jwarshaw
authored
Remove temp file code
farrellw
committed
Merge pull request #43 from jwarshaw/pictureloop
jwarshaw
authored
Add temp pic file sequence to takepicture file
farrellw
committed