Marlin 2.0.x bugfix on Wanhao D6 Compile Error

I have downloaded the 2.0.x version for the wanhao d6 for marlin 2.0.x bugfix and am receiving compile errors when using the example configuration.h and configuration.adv.h. The compile errors I'm getting are SanityCheck.h: error: #error "Please select no more than one LCD controller option." I have gone through the configuration file and have confirmed that there is only 1 LCD controller option uncommented. Any help would be appreciated.

EDIT, ok I see it does this on the official marlin. with the provided D6 configuration files.

Edited 1 time(s). Last edit at 10/22/2019 08:02PM by Dust.

It does have #define U8GLIB_SSD1306 is set in configuration.h
And it has ULTIPANEL

And removing either one stops the error... still looking

In Marlin/src/inc/Conditionals_LCD.h

At line 173 I changed from:

#if ENABLED(IS_U8GLIB_SSD1306)
#define U8GLIB_SSD1306
#endif

to:

#if ENABLED(U8GLIB_SSD1306)
#define IS_U8GLIB_SSD1306
#endif

It now compiles, but I cant test it, I don't have this hardware.

Edited 4 time(s). Last edit at 10/22/2019 09:27PM by Dust.

The config for 1.1.9 has both

line 1557
#define ULTIPANEL

and

line 1728
#define U8GLIB_SSD1306
#define LCD_WIDTH 22
#define LCD_HEIGHT 5
#define LCD_RESET_PIN 5

and it compiles.

I'll try and see if your fix works. Thanks.