Skip to content

Commit 3a8c239

Browse files
authored
Merge pull request #27 from sparkfun/release_candidate
MicroOLED: Version 1.3 - A New Hope
2 parents d0ed2b9 + adfccc1 commit 3a8c239

File tree

12 files changed

+1001
-733
lines changed

12 files changed

+1001
-733
lines changed

CONTRIBUTING.md

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# How to Contribute
2+
3+
Thank you so *much* for offering to help out. We truly appreciate it.
4+
5+
If you'd like to contribute, start by searching through the [issues](https://github.com/sparkfun/SparkFun_Micro_OLED_Arduino_Library/issues) and [pull requests](https://github.com/sparkfun/SparkFun_Micro_OLED_Arduino_Library/pulls) to see whether someone else has raised a similar idea or question.
6+
Please check the [closed issues](https://github.com/sparkfun/SparkFun_Micro_OLED_Arduino_Library/issues?q=is%3Aissue+is%3Aclosed)
7+
and [closed pull requests](https://github.com/sparkfun/SparkFun_Micro_OLED_Arduino_Library/pulls?q=is%3Apr+is%3Aclosed) too - you may find that your issue or feature has already been discussed.
8+
9+
If you decide to add a feature to this library, please create a PR and follow these best practices:
10+
11+
* Change as little as possible. Do not submit a PR that changes 100 lines of whitespace. Break up into multiple PRs if necessary.
12+
* If you've added a new feature document it with a simple example sketch. This serves both as a test of your PR and as a quick way for users to quickly learn how to use your new feature.
13+
* If you add new functions also add them to _keywords.txt_ so that they are properly highlighted in Arduino. [Read more](https://www.arduino.cc/en/Hacking/libraryTutorial).
14+
* **Important:** Please submit your PR using the [release_candidate branch](https://github.com/sparkfun/SparkFun_Micro_OLED_Arduino_Library/tree/release_candidate). That way, we can merge and test your PR quickly without changing the _master_ branch
15+
16+
![Contributing.JPG](./img/Contributing.JPG)
17+
18+
## Style guide
19+
20+
Please read and follow the [Arduino API style guide](https://www.arduino.cc/en/Reference/APIStyleGuide). Also read and consider the [Arduino style guide](https://www.arduino.cc/en/Reference/StyleGuide).

LICENSE.md

+39-658
Large diffs are not rendered by default.

README.md

+68-3
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,76 @@ Products that use this Library
3535
* [Micro OLED Breakout](https://www.sparkfun.com/products/13003)- A breakout for the monochrome 64x48 OLED.
3636
* [Micro OLED Breakout (Qwiic)](https://www.sparkfun.com/products/14532) - Qwiic version of the Micro OLED breakout with jumpers set for I2C
3737

38+
Contributing
39+
--------------
40+
41+
If you would like to contribute to this library: please do, we truly appreciate it, but please follow [these guidelines](./CONTRIBUTING.md). Thanks!
42+
43+
MicroOLED: Version 1.3 - A New Hope
44+
---------------
45+
46+
Prior to version 1.3, this library was hard-wired to the ```Wire``` I<sup>2</sup>C and ```SPI``` ports. Version 1.3
47+
allows alternate ports to be used, in a way which is backward-compatible with the previous versions.
48+
49+
We have of course tested the new code, but if you do notice any compatibility issues please
50+
[raise an issue](https://github.com/sparkfun/SparkFun_Micro_OLED_Arduino_Library/issues).
51+
52+
### I<sup>2</sup>C Example
53+
54+
Prior to v1.3, you would have used:
55+
```
56+
#define DC_JUMPER 1
57+
MicroOLED oled(PIN_RESET, DC_JUMPER); // I2C declaration
58+
```
59+
60+
followed by:
61+
```
62+
oled.begin(); // Initialize the OLED
63+
```
64+
65+
From v1.3.0, you can still do it that way, or can do it like this:
66+
```
67+
MicroOLED oled(PIN_RESET); // The TwoWire I2C port is passed to .begin instead
68+
```
69+
70+
followed by:
71+
```
72+
oled.begin(0x3D, Wire); // Initialize the OLED using address 0x3D and the Wire port
73+
```
74+
75+
To use a non-standard address or port, you can call:
76+
```
77+
oled.begin(0x3C, Qwiic); // Initialize the OLED using address 0x3C and the Qwiic port
78+
```
79+
80+
Please see [this example](./examples/Example10_MultiDemo_v13/Example10_MultiDemo_v13.ino) for more details.
81+
82+
### SPI Example
83+
84+
For SPI in v1.3, you still need to instantiate the oled using:
85+
```
86+
MicroOLED oled(PIN_RESET, PIN_DC, PIN_CS); //SPI declaration
87+
```
88+
89+
If you want to use _SPI_ as the SPIClass, then you can continue to call:
90+
```
91+
oled.begin(); // Initialize the OLED
92+
```
93+
94+
To use a non-standard port, call:
95+
```
96+
oled.begin(SPI1); // Initialize the OLED using SPI1
97+
```
98+
99+
Please see [this example](./examples/SPI/MicroOLED_Demo_v13/MicroOLED_Demo_v13.ino) for more details.
100+
38101
Version History
39102
---------------
103+
104+
* [v 1.3.0](https://github.com/sparkfun/SparkFun_Micro_OLED_Arduino_Library/releases/tag/v1.3.0) - adding support for non-standard I<sup>2</sup>C and SPI ports
40105
* [v 1.2.10](https://github.com/sparkfun/SparkFun_Micro_OLED_Arduino_Library/releases/tag/v1.2.10) - prevent-write-outside-buffer corrections; improved I2C transfer speeds; includes the missing scroll functions; ```line``` corrections; ```enableDebugging```.
41-
* [v 1.2.8](https://github.com/sparkfun/SparkFun_Micro_OLED_Arduino_Library/releases/tag/v1.2.9) - drawIcon() correction
42-
* [v 1.2.8](https://github.com/sparkfun/SparkFun_Micro_OLED_Arduino_Library/releases/tag/v1.2.8) - Add drawIcon() and resort examples with Qwiic as default.
106+
* [v 1.2.9](https://github.com/sparkfun/SparkFun_Micro_OLED_Arduino_Library/releases/tag/v1.2.9) - drawIcon() correction
107+
* [v 1.2.8](https://github.com/sparkfun/SparkFun_Micro_OLED_Arduino_Library/releases/tag/v1%2C2.8) - Add drawIcon() and resort examples with Qwiic as default.
43108
* [v 1.2.7](https://github.com/sparkfun/SparkFun_Micro_OLED_Arduino_Library/releases/tag/v1.2.7) - Add more comments and Wire.begin() to examples
44109
* [v 1.2.6](https://github.com/sparkfun/SparkFun_Micro_OLED_Arduino_Library/releases/tag/V_1.2.6) - Removes call of Wire.begin from library
45110
* [v 1.2.5](https://github.com/sparkfun/SparkFun_Micro_OLED_Arduino_Library/releases/tag/v1.2.5) - Adding Qwiic Examples for I2C
@@ -57,7 +122,7 @@ License Information
57122

58123
This product is _**open source**_!
59124

60-
The **code** is released under the GPL v3 license. See the included LICENSE.md for more information.
125+
Please see [LICENSE.md](./LICENSE.md) for more information.
61126

62127
Distributed as-is; no warranty is given.
63128

0 commit comments

Comments
 (0)