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.

Sign up for GitHub

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

Jump to bottom

fix for #19224 for independent neopixel strip control option not being separated #19250

Merged
merged 52 commits into from
Sep 3, 2020
Merged

fix for #19224 for independent neopixel strip control option not being separated #19250

merged 52 commits into from
Sep 3, 2020

Commits on Aug 22, 2020

  1. Merge pull request #1 from MarlinFirmware/bugfix-2.0.x 

    Bugfix 2.0.x
    @Bacon-Fixation
    Bacon-Fixation authored Aug 22, 2020
    Configuration menu
    Copy the full SHA
    b4d329a View commit details
    Browse the repository at this point in the history

  2. seperate neopixel control with M151 

    sorry im not a programer but i did my best to get 2 seperated controls for extra  visual indiaction from the LEDS by keeping the Printer Events on the main channel .
    @Bacon-Fixation
    Bacon-Fixation committed Aug 22, 2020
    Configuration menu
    Copy the full SHA
    6a9442d View commit details
    Browse the repository at this point in the history

  3. Update Configuration.h

    @Bacon-Fixation
    Bacon-Fixation authored Aug 22, 2020
    Configuration menu
    Copy the full SHA
    5363276 View commit details
    Browse the repository at this point in the history

  4. further intergration

    @Bacon-Fixation
    Bacon-Fixation committed Aug 22, 2020
    Configuration menu
    Copy the full SHA
    bd39337 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'bugfix-2.0.x' of https://github.com/Bacon-Fixation/Marlin… 

    … into bugfix-2.0.x
    @Bacon-Fixation
    Bacon-Fixation committed Aug 22, 2020
    Configuration menu
    Copy the full SHA
    757ac62 View commit details
    Browse the repository at this point in the history

  6. -Fixed TYPO for the Smart effector 

    Originally labeled as DUET_SMART_EFFECTOR
but this is incorrect as MarlinCore looks for SMART_EFFECTOR and not DUET_SMART_EFFECTOR
    @Bacon-Fixation
    Bacon-Fixation committed Aug 22, 2020
    Configuration menu
    Copy the full SHA
    465092b View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2020

  1. better intergration

    @Bacon-Fixation
    Bacon-Fixation committed Aug 23, 2020
    Configuration menu
    Copy the full SHA
    970005f View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/19115

    @thinkyhead
    thinkyhead committed Aug 23, 2020
    Configuration menu
    Copy the full SHA
    7a2c6d5 View commit details
    Browse the repository at this point in the history

  3. Neo 2 initial cleanup

    @thinkyhead
    thinkyhead committed Aug 23, 2020
    Configuration menu
    Copy the full SHA
    7243dd1 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/19115

    @thinkyhead
    thinkyhead committed Aug 23, 2020
    Configuration menu
    Copy the full SHA
    1593471 View commit details
    Browse the repository at this point in the history

  5. Clean up, extend M150

    @thinkyhead
    thinkyhead committed Aug 23, 2020
    Configuration menu
    Copy the full SHA
    0a97a4c View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/19115

    @thinkyhead
    thinkyhead committed Aug 23, 2020
    Configuration menu
    Copy the full SHA
    5992942 View commit details
    Browse the repository at this point in the history

  7. Rename some pca9632 functions

    @thinkyhead
    thinkyhead committed Aug 23, 2020
    Configuration menu
    Copy the full SHA
    42150e3 View commit details
    Browse the repository at this point in the history

  8. Rename adaneo# and other vars

    @thinkyhead
    thinkyhead committed Aug 23, 2020
    Configuration menu
    Copy the full SHA
    356715d View commit details
    Browse the repository at this point in the history

  9. Re-use LEDColor

    @thinkyhead
    thinkyhead committed Aug 23, 2020
    Configuration menu
    Copy the full SHA
    cd9d80d View commit details
    Browse the repository at this point in the history

  10. Misc. cleanup

    @thinkyhead
    thinkyhead committed Aug 23, 2020
    Configuration menu
    Copy the full SHA
    0dbe7ff View commit details
    Browse the repository at this point in the history

  11. Fix set_color binding

    @thinkyhead
    thinkyhead committed Aug 23, 2020
    Configuration menu
    Copy the full SHA
    ffb781c View commit details
    Browse the repository at this point in the history

  12. Adding conflict protection with other neopixel features

    @Bacon-Fixation
    Bacon-Fixation committed Aug 23, 2020
    Configuration menu
    Copy the full SHA
    bdb4722 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'bugfix-2.0.x' of https://github.com/Bacon-Fixation/Marlin… 

    … into bugfix-2.0.x
    @Bacon-Fixation
    Bacon-Fixation committed Aug 23, 2020
    Configuration menu
    Copy the full SHA
    c8b9ec6 View commit details
    Browse the repository at this point in the history

  14. reverting change

    @Bacon-Fixation
    Bacon-Fixation committed Aug 23, 2020
    Configuration menu
    Copy the full SHA
    4434b88 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2020

  1. fixed compiling Error with the LPC1769

    @Bacon-Fixation
    Bacon-Fixation committed Aug 24, 2020
    Configuration menu
    Copy the full SHA
    1abbb8c View commit details
    Browse the repository at this point in the history

  2. second index to stop M150 from bleeding into the second neopixel channel

    @Bacon-Fixation
    Bacon-Fixation committed Aug 24, 2020
    Configuration menu
    Copy the full SHA
    3ffa4ca View commit details
    Browse the repository at this point in the history

  3. Who needs accessors?

    @thinkyhead
    thinkyhead committed Aug 24, 2020
    Configuration menu
    Copy the full SHA
    ca79f2b View commit details
    Browse the repository at this point in the history

  4. Thanks but no thanks for your configs

    @thinkyhead
    thinkyhead committed Aug 24, 2020
    Configuration menu
    Copy the full SHA
    c60bea4 View commit details
    Browse the repository at this point in the history

  5. Condition for conjoined strips

    @thinkyhead
    thinkyhead committed Aug 24, 2020
    Configuration menu
    Copy the full SHA
    b41a733 View commit details
    Browse the repository at this point in the history

  6. Fix M150 to fit current design

    @thinkyhead
    thinkyhead committed Aug 24, 2020
    Configuration menu
    Copy the full SHA
    85b0a48 View commit details
    Browse the repository at this point in the history

  7. Patch neoindex

    @thinkyhead
    thinkyhead committed Aug 24, 2020
    Configuration menu
    Copy the full SHA
    7d57af2 View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/19115

    @thinkyhead
    thinkyhead committed Aug 24, 2020
    Configuration menu
    Copy the full SHA
    d3624ad View commit details
    Browse the repository at this point in the history

  9. dont know how i lost this config 

    for some reason NEOPIXEL_SEPERATE ended up missing in config
    @Bacon-Fixation
    Bacon-Fixation committed Aug 24, 2020
    Configuration menu
    Copy the full SHA
    0cf88aa View commit details
    Browse the repository at this point in the history

  10. Update Configuration.h

    @thinkyhead
    thinkyhead authored Aug 24, 2020
    Configuration menu
    Copy the full SHA
    8a35574 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2020

  1. Update leds.h 

    trying out stuffs
    @Bacon-Fixation
    Bacon-Fixation committed Aug 25, 2020
    Configuration menu
    Copy the full SHA
    971e130 View commit details
    Browse the repository at this point in the history

  2. Update neopixel.h 

    with NeoPixel2_separate enabled there isnt a conflict if they are different Neo type
    @Bacon-Fixation
    Bacon-Fixation committed Aug 25, 2020
    Configuration menu
    Copy the full SHA
    563029d View commit details
    Browse the repository at this point in the history

  3. not needed 

    i dont know why i thought this was needed

if neopixel is't enabled then there wont be a neopixel2
    @Bacon-Fixation
    Bacon-Fixation committed Aug 25, 2020
    Configuration menu
    Copy the full SHA
    066ac3d View commit details
    Browse the repository at this point in the history

  4. add an extra example to M150 for Sn 

    M150 S1 I1 R    ; Set SEPARATE index 1 to red
    @Bacon-Fixation
    Bacon-Fixation committed Aug 25, 2020
    Configuration menu
    Copy the full SHA
    dfa25dc View commit details
    Browse the repository at this point in the history

  5. Fixed Typo for Neo2 color presets

    @Bacon-Fixation
    Bacon-Fixation committed Aug 25, 2020
    Configuration menu
    Copy the full SHA
    b540b00 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2020

  1. Merge branch 'bugfix-2.0.x' into bugfix-2.0.x

    @thinkyhead
    thinkyhead authored Aug 26, 2020
    Configuration menu
    Copy the full SHA
    4d7cd2c View commit details
    Browse the repository at this point in the history

  2. tinkering 

    I dont know why but in Conditionals_LCD.h

MULTIPLE_NEOPIXEL_TYPES  isn't carried over from its definition in neopixel.h
    @Bacon-Fixation
    Bacon-Fixation committed Aug 26, 2020
    Configuration menu
    Copy the full SHA
    9b3a4a1 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2020

  1. NEOPIXEL_SEPERATE to run diferent neopixel types 

    moved the CONJOINED_NEOPIXEL from Conditionals_LCD.h to neopixel.h

because MULTIPLE_NEOPIXEL_TYPE wouldnt trip the trigger in conditionals
    @Bacon-Fixation
    Bacon-Fixation committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    88f050d View commit details
    Browse the repository at this point in the history

  2. ffs

    @thinkyhead
    thinkyhead authored Aug 27, 2020
    Configuration menu
    Copy the full SHA
    8b12f7b View commit details
    Browse the repository at this point in the history

  3. Update neopixel.h

    @thinkyhead
    thinkyhead authored Aug 27, 2020
    Configuration menu
    Copy the full SHA
    dc7e169 View commit details
    Browse the repository at this point in the history

  4. Update leds.h

    @thinkyhead
    thinkyhead authored Aug 27, 2020
    Configuration menu
    Copy the full SHA
    5f0fd8c View commit details
    Browse the repository at this point in the history

  5. Update leds.h

    @thinkyhead
    thinkyhead authored Aug 27, 2020
    Configuration menu
    Copy the full SHA
    b201138 View commit details
    Browse the repository at this point in the history

  6. Update neopixel.h

    @thinkyhead
    thinkyhead authored Aug 27, 2020
    Configuration menu
    Copy the full SHA
    ceeea2f View commit details
    Browse the repository at this point in the history

  7. Update leds.cpp

    @thinkyhead
    thinkyhead authored Aug 27, 2020
    Configuration menu
    Copy the full SHA
    dd9bb52 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2020

  1. Bugfix for Neopixel_separate 

    adaneo1 still was set to NEOPIXEL2_PIN and was bleeding into the separated neopixel bank during start up and regular M150 commands

found that adaneo never set a pin once NEOPIXEL2_SEPARATE is enabled
    @Bacon-Fixation
    Bacon-Fixation committed Aug 28, 2020
    Configuration menu
    Copy the full SHA
    19a20df View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2020

  1. Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/19179

    @thinkyhead
    thinkyhead committed Aug 31, 2020
    Configuration menu
    Copy the full SHA
    584323d View commit details
    Browse the repository at this point in the history

  2. adjust

    @thinkyhead
    thinkyhead committed Aug 31, 2020
    Configuration menu
    Copy the full SHA
    2308030 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2020

  1. Update neopixel.h 

    TERN_(NEOPIXEL2_SEPARATE,,adaneo1.setPin(NEOPIXEL2_PIN)); dosent compile as is. i believe it has an extra comma in it
    @Bacon-Fixation
    Bacon-Fixation committed Sep 1, 2020
    Configuration menu
    Copy the full SHA
    654e6a9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'bugfix-2.0.x' into bugfix-2.0.x

    @thinkyhead
    thinkyhead authored Sep 1, 2020
    Configuration menu
    Copy the full SHA
    7e4ea41 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2020

  1. Update neopixel.h 

    TERN_(NEOPIXEL2_SEPARATE,adaneo1.setPin(NEOPIXEL2_PIN)); stops NEOPIXEL2_SEPARATE From working as intended it bleeds into the separate channel #if Disabled(NEOPIXEL2_SEPARATE) Works like its supposed to

is there a different macro than TERN_(NEOPIXEL2_SEPARATE,adaneo1.setPin(NEOPIXEL2_PIN)); becuase it dosnet have the desired effect
    @Bacon-Fixation
    Bacon-Fixation committed Sep 3, 2020
    Configuration menu
    Copy the full SHA
    435ef10 View commit details
    Browse the repository at this point in the history

  2. Update neopixel.h

    @thinkyhead
    thinkyhead authored Sep 3, 2020
    Configuration menu
    Copy the full SHA
    9880be5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'bugfix-2.0.x' into bugfix-2.0.x

    @thinkyhead
    thinkyhead authored Sep 3, 2020
    Configuration menu
    Copy the full SHA
    1868ba8 View commit details
    Browse the repository at this point in the history