Skip to content
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

Merge release into master #10

Merged
merged 26 commits into from Apr 12, 2019

Conversation

Projects
None yet
4 participants
@florianhumblot
Copy link
Contributor

florianhumblot commented Apr 6, 2019

Currently the release branch consists of a buffered and an unbuffered driver for the SSD1306 display.

florianhumblot added some commits Mar 21, 2019

Merge pull request #4 from R2D2-2019/feature-ssd1306_base_driver
base interface of the ssd1306 with commands and an unbuffered instance
Merge pull request #6 from R2D2-2019/patch-remove_couts
remove couts from the module
Merge pull request #7 from R2D2-2019/feature-ssd1306_buffered_driver
Buffered interface of the SSD1306 is working
Merge pull request #9 from R2D2-2019/feature-ssd1306_buffered_driver
Use the internal buffer for all the operations
Merge pull request #8 from R2D2-2019/feature-ssd1306_base_driver
Removed cout's and added a buffered interface
Show resolved Hide resolved code/headers/ssd1306.hpp Outdated
@@ -1,9 +1,31 @@
#include "hwlib.hpp"

#include <hwlib.hpp>

This comment has been minimized.

Copy link
@itzandroidtab

itzandroidtab Apr 6, 2019

Contributor

Maybe we should move this file to an examples directory. Otherwise this file will change every time we want to push a different screen.

florianhumblot added some commits Apr 9, 2019

florianhumblot added some commits Apr 9, 2019

Show resolved Hide resolved code/headers/ssd1306.hpp
Show resolved Hide resolved code/headers/ssd1306.hpp
Show resolved Hide resolved code/headers/ssd1306_oled_buffered.hpp
Show resolved Hide resolved code/src/ssd1306.cpp
Show resolved Hide resolved code/headers/ssd1306.hpp
@LRstudentHU

This comment has been minimized.

Copy link
Contributor

LRstudentHU commented Apr 9, 2019

A couple of nitpicks, after a little cleanup this is ready for merging!

@gerritvanos
Copy link
Contributor

gerritvanos left a comment

Looks fine, maybe for later you should add @param and @return to your documentation

@LRstudentHU LRstudentHU merged commit da01cc6 into master Apr 12, 2019

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.