Skip to content

Commit e6c8f3f

Browse files
committed
remove name collision
1 parent 32573d2 commit e6c8f3f

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

examples/lolin32/lolin32/lolin32.ino

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ using namespace Menu;
3434
#define U8_Height 64
3535
#define USE_HWI2C
3636
#define fontMarginX 1
37-
#define fontMarginY 2
37+
#define fontMarginY 1
3838
// U8G2_SSD1306_128X64_NONAME_F_HW_I2C u8g2(U8G2_R0, U8X8_PIN_NONE, SCL, SDA);
39-
U8G2_SSD1306_128X64_VCOMH0_F_HW_I2C u8g2(U8G2_R2, U8X8_PIN_NONE, SCL, SDA);//allow contrast change
39+
U8G2_SSD1306_128X64_VCOMH0_F_HW_I2C u8g2(U8G2_R0, U8X8_PIN_NONE, SCL, SDA);//allow contrast change
4040
// U8G2_SSD1306_128X64_NONAME_1_HW_I2C u8g2(U8G2_R0, U8X8_PIN_NONE, SCL, SDA);
4141

4242

@@ -109,7 +109,7 @@ uint16_t mins=0;
109109

110110
//define a pad style menu (single line menu)
111111
//here with a set of fields to enter a date in YYYY/MM/DD format
112-
altMENU(menu,time,"Time",doNothing,noEvent,noStyle,(systemStyles)(_asPad|Menu::_menuData|Menu::_canNav|_parentDraw)
112+
altMENU(menu,timeMenu,"Time",doNothing,noEvent,noStyle,(systemStyles)(_asPad|Menu::_menuData|Menu::_canNav|_parentDraw)
113113
,FIELD(hrs,"",":",0,11,1,0,doNothing,noEvent,noStyle)
114114
,FIELD(mins,"","",0,59,10,1,doNothing,noEvent,wrapStyle)
115115
);
@@ -127,7 +127,7 @@ MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle
127127
,OP("Op2",doNothing,noEvent)
128128
,FIELD(test,"Test","%",0,100,10,1,doNothing,noEvent,wrapStyle)
129129
,EDIT("Name",name,alphaNumMask,doNothing,noEvent,noStyle)
130-
,SUBMENU(time)
130+
,SUBMENU(timeMenu)
131131
,SUBMENU(subMenu)
132132
,SUBMENU(setLed)
133133
,OP("LED On",myLedOn,enterEvent)

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=ArduinoMenu library
2-
version=4.17.13
2+
version=4.17.14
33
author=Rui Azevedo, [email protected]
44
maintainer=neu-rah, [email protected]
55
sentence=Generic menu/interactivity system

0 commit comments

Comments
 (0)