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

Dv2 working #53

Merged
merged 10 commits into from
Feb 15, 2019
Merged

Dv2 working #53

merged 10 commits into from
Feb 15, 2019

Conversation

Squatnet
Copy link
Owner

Merging to master at current state as Pjon and everything else code wise is working as intended.
@kieran-boyle I would at this point see if its possible to back-merge Master into your branch and pull again

This merge should open me up a couple more small issues, More as a reminder to fix the little bugs than anything else.

kieran-boyle and others added 10 commits February 7, 2019 19:59
@Squatnet have a ganders ref https://github.com/FastLED/FastLED/wiki/RGBSet-Reference
purpose is to create an array containing a pointer to each of the led strips (ie ledsA ledsB ect.) so that i can iterate through all the strips available to a device without having to break it down into multiple if/else statements.
…into DV2Working

Fixed conflicts in I2CtoFastLEDs and pjonToI2C code
Adds CRGBArrayDebug / LCDExamples NanoWith1LedStripExample1 from kiki branch
@todo
Copy link

todo bot commented Feb 15, 2019

I2CtoFastLEDs reset

Allow devices Running I2CtoFastLEDs code to be reset by their routers.


* @todo I2CtoFastLEDs reset
* @body Allow devices Running I2CtoFastLEDs code to be reset by their routers.
*/
// Varidaic Debug Macro
#define DEBUG //Comment this line to disable Debug output
#ifdef DEBUG // Debug is on


This comment was generated by todo based on a @todo comment in 2f9f995 in #53. cc @Squatnet.

@todo
Copy link

todo bot commented Feb 15, 2019

Fix regString Needs trailing space

regString should not need a trailing space, Possibly caused by setting to small an array in string.toCharArray()


* @todo Fix regString Needs trailing space
* @body regString should not need a trailing space, Possibly caused by setting to small an array in string.toCharArray()
*/
#include <Wire.h>
// PJON stuff //
#define PJON_INCLUDE_SWBB


This comment was generated by todo based on a @todo comment in 2f9f995 in #53. cc @Squatnet.

@Squatnet Squatnet merged commit 939a929 into master Feb 15, 2019
This was referenced Feb 15, 2019
@Squatnet Squatnet deleted the DV2Working branch February 15, 2019 15:46
@Squatnet
Copy link
Owner Author

Merged to master and DV2Working branch deleted.
@Riolaurenti - Pull from master branch
@kieran-boyle - Pull request with kiki as base branch and master as 2nd branch and hopefully it will update your branch to the latest DV2Working code.

This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants