Skip to content

Commit e5be656

Browse files
neu-rahneu-rah
committed
remove name collision
with adafruit feather nrf52
1 parent 821d496 commit e5be656

File tree

16 files changed

+71
-63
lines changed

16 files changed

+71
-63
lines changed

‎examples/CustomPrompt/CustomPrompt/CustomPrompt.ino‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ using namespace Menu;
1515

1616
#define LEDPIN LED_BUILTIN
1717

18-
result ledOn() {
18+
result myLedOn() {
1919
digitalWrite(LEDPIN, HIGH);
2020
return proceed;
2121
}
22-
result ledOff() {
22+
result myLedOff() {
2323
digitalWrite(LEDPIN, LOW);
2424
return proceed;
2525
}
@@ -45,8 +45,8 @@ public:
4545

4646
MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle
4747
,altOP(altPrompt,"",doNothing,noEvent)
48-
,OP("LED On",ledOn,enterEvent)
49-
,OP("LED Off",ledOff,enterEvent)
48+
,OP("LED On",myLedOn,enterEvent)
49+
,OP("LED Off",myLedOff,enterEvent)
5050
,EXIT("<Back")
5151
);
5252

‎examples/LCDs/LiquidCrystal/LiquidCrystal/LiquidCrystal.ino‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ result action2(eventMask e,navNode& nav, prompt &item) {
7373

7474
int ledCtrl=LOW;
7575

76-
result ledOn() {
76+
result myLedOn() {
7777
ledCtrl=HIGH;
7878
return proceed;
7979
}
80-
result ledOff() {
80+
result myLedOff() {
8181
ledCtrl=LOW;
8282
return proceed;
8383
}
@@ -137,8 +137,8 @@ MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle
137137
,FIELD(test,"Test","%",0,100,10,1,doNothing,noEvent,wrapStyle)
138138
,SUBMENU(subMenu)
139139
,SUBMENU(setLed)
140-
,OP("LED On",ledOn,enterEvent)
141-
,OP("LED Off",ledOff,enterEvent)
140+
,OP("LED On",myLedOn,enterEvent)
141+
,OP("LED Off",myLedOff,enterEvent)
142142
,SUBMENU(selMenu)
143143
,SUBMENU(chooseMenu)
144144
,OP("Alert test",doAlert,enterEvent)

‎examples/LCDs/Malpartida/I2C/I2C/I2C.ino‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ http://playground.arduino.cc/Code/LCD3wires
7777

7878
int ledCtrl=LOW;
7979

80-
result ledOn() {
80+
result myLedOn() {
8181
ledCtrl=HIGH;
8282
return proceed;
8383
}
84-
result ledOff() {
84+
result myLedOff() {
8585
ledCtrl=LOW;
8686
return proceed;
8787
}
@@ -141,8 +141,8 @@ http://playground.arduino.cc/Code/LCD3wires
141141
,FIELD(test,"Test","%",0,100,10,1,doNothing,noEvent,wrapStyle)
142142
,SUBMENU(subMenu)
143143
,SUBMENU(setLed)
144-
,OP("LED On",ledOn,enterEvent)
145-
,OP("LED Off",ledOff,enterEvent)
144+
,OP("LED On",myLedOn,enterEvent)
145+
,OP("LED Off",myLedOff,enterEvent)
146146
,SUBMENU(selMenu)
147147
,SUBMENU(chooseMenu)
148148
,OP("Alert test",doAlert,enterEvent)

‎examples/LCDs/PCF8574/PCF8574/PCF8574.ino‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ result action2(eventMask e,navNode& nav, prompt &item) {
7474

7575
int ledCtrl=LOW;
7676

77-
result ledOn() {
77+
result myLedOn() {
7878
ledCtrl=HIGH;
7979
return proceed;
8080
}
81-
result ledOff() {
81+
result myLedOff() {
8282
ledCtrl=LOW;
8383
return proceed;
8484
}
@@ -138,8 +138,8 @@ MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle
138138
,FIELD(test,"Test","%",0,100,10,1,doNothing,noEvent,wrapStyle)
139139
,SUBMENU(subMenu)
140140
,SUBMENU(setLed)
141-
,OP("LED On",ledOn,enterEvent)
142-
,OP("LED Off",ledOff,enterEvent)
141+
,OP("LED On",myLedOn,enterEvent)
142+
,OP("LED Off",myLedOff,enterEvent)
143143
,SUBMENU(selMenu)
144144
,SUBMENU(chooseMenu)
145145
,OP("Alert test",doAlert,enterEvent)

‎examples/SSD1306Ascii/SSD1306Ascii/SSD1306Ascii.ino‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ result action2(eventMask e,navNode& nav, prompt &item) {
3838

3939
int ledCtrl=LOW;
4040

41-
result ledOn() {
41+
result myLedOn() {
4242
ledCtrl=HIGH;
4343
return proceed;
4444
}
45-
result ledOff() {
45+
result myLedOff() {
4646
ledCtrl=LOW;
4747
return proceed;
4848
}
@@ -91,8 +91,8 @@ MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle
9191
,FIELD(test,"Test","%",0,100,10,1,doNothing,noEvent,wrapStyle)
9292
,SUBMENU(subMenu)
9393
,SUBMENU(setLed)
94-
,OP("LED On",ledOn,enterEvent)
95-
,OP("LED Off",ledOff,enterEvent)
94+
,OP("LED On",myLedOn,enterEvent)
95+
,OP("LED Off",myLedOff,enterEvent)
9696
,SUBMENU(selMenu)
9797
,SUBMENU(chooseMenu)
9898
,OP("Alert test",doAlert,enterEvent)
@@ -109,7 +109,7 @@ MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle
109109
constMEM panel panels[] MEMMODE={{0,0,128/fontW,64/fontH}};
110110
navNode* nodes[sizeof(panels)/sizeof(panel)];//navNodes to store navigation status
111111
panelsList pList(panels,nodes,1);//a list of panels and nodes
112-
idx_t tops[MAX_DEPTH];//store cursor positions for each level
112+
idx_t tops[MAX_DEPTH]={0,0};//store cursor positions for each level
113113
SSD1306AsciiOut outOLED(&oled,tops,pList);//oled output device menu driver
114114
menuOut* outputs[]={&outOLED};//list of output devices
115115
outputsList out(outputs,1);//outputs list

‎examples/Serial/ansiSerial/ansiSerial/ansiSerial.ino‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,11 @@ result action2(eventMask e,navNode& nav, prompt &item);
151151

152152
int ledCtrl=LOW;
153153

154-
result ledOn() {
154+
result myLedOn() {
155155
ledCtrl=HIGH;
156156
return proceed;
157157
}
158-
result ledOff() {
158+
result myLedOff() {
159159
ledCtrl=LOW;
160160
return proceed;
161161
}
@@ -250,8 +250,8 @@ MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle
250250
,SUBMENU(birthDate)
251251
,SUBMENU(subMenu)
252252
,SUBMENU(setLed)
253-
,OP("LED On",ledOn,enterEvent)
254-
,OP("LED Off",ledOff,enterEvent)
253+
,OP("LED On",myLedOn,enterEvent)
254+
,OP("LED Off",myLedOff,enterEvent)
255255
,SUBMENU(selMenu)
256256
,SUBMENU(chooseMenu)
257257
,OP("Show colors",showOutColors,enterEvent)

‎examples/Serial/serialio/serialio/serialio.ino‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ result action2(eventMask e, prompt &item) {
4040

4141
int ledCtrl=LOW;
4242

43-
result ledOn() {
43+
result myLedOn() {
4444
ledCtrl=HIGH;
4545
return proceed;
4646
}
47-
result ledOff() {
47+
result myLedOff() {
4848
ledCtrl=LOW;
4949
return proceed;
5050
}
@@ -110,8 +110,8 @@ MENU(mainMenu,"Main menu",zZz,noEvent,wrapStyle
110110
,FIELD(test,"Test","%",0,100,10,1,doNothing,noEvent,wrapStyle)
111111
,SUBMENU(subMenu)
112112
,SUBMENU(setLed)
113-
,OP("LED On",ledOn,enterEvent)
114-
,OP("LED Off",ledOff,enterEvent)
113+
,OP("LED On",myLedOn,enterEvent)
114+
,OP("LED Off",myLedOff,enterEvent)
115115
,SUBMENU(selMenu)
116116
,SUBMENU(chooseMenu)
117117
,OP("Alert test",doAlert,enterEvent)

‎examples/U8G2/U8G2/U8G2.ino‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ using namespace Menu;
4040
#define encB 3
4141
#define encBtn 4
4242

43-
#define U8G2OUT PCD8544
44-
// #define U8G2OUT SSD1306
43+
// #define U8G2OUT PCD8544
44+
#define U8G2OUT SSD1306
4545

4646
#ifndef U8G2OUT
4747
#error U8G2OUT not defined! edit the scketch to choose one.
@@ -70,7 +70,8 @@ using namespace Menu;
7070
#define offsetY 16
7171
#define U8_Width 64
7272
#define U8_Height 48
73-
U8G2_SSD1306_128X64_NONAME_F_SW_I2C u8g2(U8G2_R0, SCL, SDA);
73+
#define USE_HWI2C
74+
U8G2_SSD1306_128X64_NONAME_F_HW_I2C u8g2(U8G2_R0);//, SCL, SDA);
7475
#endif
7576

7677
// define menu colors --------------------------------------------------------
@@ -92,11 +93,11 @@ int test=55;
9293

9394
int ledCtrl=HIGH;
9495

95-
result ledOn() {
96+
result myLedOn() {
9697
ledCtrl=HIGH;
9798
return proceed;
9899
}
99-
result ledOff() {
100+
result myLedOff() {
100101
ledCtrl=LOW;
101102
return proceed;
102103
}
@@ -158,8 +159,8 @@ MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle
158159
,SUBMENU(time)
159160
,SUBMENU(subMenu)
160161
,SUBMENU(setLed)
161-
,OP("LED On",ledOn,enterEvent)
162-
,OP("LED Off",ledOff,enterEvent)
162+
,OP("LED On",myLedOn,enterEvent)
163+
,OP("LED Off",myLedOff,enterEvent)
163164
,SUBMENU(selMenu)
164165
,SUBMENU(chooseMenu)
165166
,OP("Alert test",doAlert,enterEvent)
@@ -226,17 +227,23 @@ void setup() {
226227
encoder.begin();
227228
#ifdef USE_HWSPI
228229
SPI.begin();
230+
u8g2.begin();
229231
#endif
230232
#ifdef USE_HWI2C
231-
u8g2_SetI2CAddress(u8g2.getU8g2(), 0x3d*2);
233+
Wire.begin();
234+
u8g2.setI2CAddress(0x3d<<1); // Set I2C address
235+
u8g2.begin();
236+
u8g2.setContrast(CONTRAST);
237+
// u8g2.setFlipMode(SCR_FLIP);
238+
// u8g2_SetI2CAddress(u8g2.getU8g2(), 0x3d*2);
232239
#endif
233-
u8g2.begin();
234240
u8g2.setFont(fontName);
235241
u8g2.setBitmapMode(0);
236242

237243
//disable second option
238244
mainMenu[1].enabled=disabledStatus;
239245
nav.idleTask=idle;//point a function to be used when menu is suspended
246+
Serial.println("setup done.");Serial.flush();
240247
}
241248

242249
void loop() {

‎examples/U8GLib/U8Glib/U8GLib.ino‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ result action2(eventMask e,navNode& nav, prompt &item) {
6969

7070
int ledCtrl=LOW;
7171

72-
result ledOn() {
72+
result myLedOn() {
7373
ledCtrl=HIGH;
7474
return proceed;
7575
}
76-
result ledOff() {
76+
result myLedOff() {
7777
ledCtrl=LOW;
7878
return proceed;
7979
}
@@ -127,8 +127,8 @@ MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle
127127
,EDIT("Hex",buf1,hexNr,doNothing,noEvent,noStyle)
128128
,SUBMENU(subMenu)
129129
,SUBMENU(setLed)
130-
,OP("LED On",ledOn,enterEvent)
131-
,OP("LED Off",ledOff,enterEvent)
130+
,OP("LED On",myLedOn,enterEvent)
131+
,OP("LED Off",myLedOff,enterEvent)
132132
,SUBMENU(selMenu)
133133
,SUBMENU(chooseMenu)
134134
,OP("Alert test",doAlert,enterEvent)

‎examples/UTFT/UTFT/UTFT.ino‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ result action2(eventMask e,navNode& nav, prompt &item) {
5454

5555
int ledCtrl=LOW;
5656

57-
result ledOn() {
57+
result myLedOn() {
5858
ledCtrl=HIGH;
5959
return proceed;
6060
}
61-
result ledOff() {
61+
result myLedOff() {
6262
ledCtrl=LOW;
6363
return proceed;
6464
}
@@ -107,8 +107,8 @@ MENU(mainMenu,"Main menu",doNothing,noEvent,noStyle
107107
,FIELD(test,"Test","%",0,100,10,1,doNothing,noEvent,noStyle)
108108
,SUBMENU(subMenu)
109109
,SUBMENU(setLed)
110-
,OP("LED On",ledOn,enterEvent)
111-
,OP("LED Off",ledOff,enterEvent)
110+
,OP("LED On",myLedOn,enterEvent)
111+
,OP("LED Off",myLedOff,enterEvent)
112112
,SUBMENU(selMenu)
113113
,SUBMENU(chooseMenu)
114114
,OP("Alert test",doAlert,enterEvent)

0 commit comments

Comments
 (0)