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

Bugfix #19280 lcd LED menu showing channel 3 for both channels when neopixel2 separate is enabled #19303

Merged
merged 74 commits into from
Sep 10, 2020

Conversation

Bacon-Fixation
Copy link
Contributor

@Bacon-Fixation Bacon-Fixation commented Sep 8, 2020

Description

Fixing a display error that happens when you go to the custom LED controls where both channels say "Channel 3"

noticed the STATIC_ITEM_N macro was missing something
in lcd_item.h #define STATIC_ITEM_N(LABEL, N, V...) STATIC_ITEM_N_P(GET_TEXT(LABEL), ##V) the N was missing on the other side and was displaying a 3 that was possibly from the SS_DEFAULT|SS_INVERT instead of the number rather than the number value in STATIC_ITEM_N(MSG_LED_CHANNEL_N, 1, SS_DEFAULT|SS_INVERT); in menu_led.h.
i could change it to STATIC_ITEM_N(MSG_LED_CHANNEL_N, 9, SS_DEFAULT|SS_INVERT); and still have a 3 on the lcd.

Related Issues

#19280 showing channel 3 on both labels on the lcd screen

Bacon-Fixation and others added 30 commits August 22, 2020 13:10
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 .
Originally labeled as DUET_SMART_EFFECTOR
but this is incorrect as MarlinCore looks for SMART_EFFECTOR and not DUET_SMART_EFFECTOR
for some reason NEOPIXEL_SEPERATE ended up missing in config
@Bacon-Fixation
Copy link
Contributor Author

Bacon-Fixation commented Sep 8, 2020

its the only menu to use STATIC_ITEM_N so i believe it would only effect this situation

@Bacon-Fixation Bacon-Fixation changed the title Bugfix #19280 lcd LED menu showing channel 3 Bugfix #19280 lcd LED menu showing channel 3 when neopixel2 separate is enabled Sep 8, 2020
@Bacon-Fixation Bacon-Fixation changed the title Bugfix #19280 lcd LED menu showing channel 3 when neopixel2 separate is enabled Bugfix #19280 lcd LED menu showing channel 3 for both channels when neopixel2 separate is enabled Sep 8, 2020
@Bacon-Fixation Bacon-Fixation reopened this Sep 9, 2020
@Bacon-Fixation
Copy link
Contributor Author

that was a whoopsy sorry about the closed and reopen i really dont know how i managed that

@thinkyhead thinkyhead merged commit 20ac0fa into MarlinFirmware:bugfix-2.0.x Sep 10, 2020
#define STATIC_ITEM(LABEL, V...) STATIC_ITEM_P(GET_TEXT(LABEL), ##V)
#define STATIC_ITEM_N(LABEL, N, V...) STATIC_ITEM_N_P(GET_TEXT(LABEL), N, ##V)
#define STATIC_ITEM(LABEL, V...) STATIC_ITEM_P(GET_TEXT(LABEL), ##V)
#define STATIC_ITEM_N(LABEL, V...) STATIC_ITEM_N_P(GET_TEXT(LABEL), ##V)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

im confused about the removal of the N in the #define STATIC_ITEM_N(LABEL, V...) STATIC_ITEM_N_P(GET_TEXT(LABEL), ##V) because its looking for it, right?

 #define STATIC_ITEM_N_P(PLABEL, N, V...) do{ \
  if (_menuLineNr == _thisItemNr) {          \
    MenuItemBase::init(N);                   \
    STATIC_ITEM_INNER_P(PLABEL, ##V);        \
  }                                          \
  NEXT_ITEM();                               \
}while(0)

@Bacon-Fixation Bacon-Fixation deleted the bugfix-2.0.x branch September 12, 2020 15:44
@Bacon-Fixation Bacon-Fixation restored the bugfix-2.0.x branch September 12, 2020 15:44
vgadreau pushed a commit to vgadreau/Marlin that referenced this pull request Dec 9, 2020
kageurufu pushed a commit to CR30-Users/Marlin-CR30 that referenced this pull request Apr 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants