Skip to content

Commit 379ca59

Browse files
committed
4.20.2 fix userMenu example
1 parent 9926913 commit 379ca59

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

.travis.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ env:
2929
# - PLATFORMIO_CI_SRC=examples/Serial/ansiSerial/ansiSerial/ansiSerial.ino
3030
- PLATFORMIO_CI_SRC=examples/codeCtrl/codeCtrl/codeCtrl.ino
3131
# - PLATFORMIO_CI_SRC=examples/adafruitGfx/lcdMono/lcdMono/lcdMono.ino
32-
- PLATFORMIO_CI_SRC=examples/adafruitGfx/tft/tft/tft.ino
32+
# - PLATFORMIO_CI_SRC=examples/adafruitGfx/tft/tft/tft.ino
3333
- PLATFORMIO_CI_SRC=examples/U8GLib/U8GLib/U8GLib.ino
3434

3535
install:
@@ -41,8 +41,8 @@ install:
4141
# - wget https://github.com/nettigo/Assert4a/archive/master.zip -O /tmp/Assert4a.zip
4242
# - unzip /tmp/Assert4a.zip -d /tmp/
4343

44-
- wget https://github.com/adafruit/Adafruit-GFX-Library/archive/master.zip -O /tmp/Adafruit-GFX-Library-master.zip
45-
- unzip /tmp/Adafruit-GFX-Library-master.zip -d /tmp/
44+
# - wget https://github.com/adafruit/Adafruit-GFX-Library/archive/master.zip -O /tmp/Adafruit-GFX-Library-master.zip
45+
# - unzip /tmp/Adafruit-GFX-Library-master.zip -d /tmp/
4646

4747
- wget https://github.com/neu-rah/PCINT/archive/master.zip -O /tmp/PCINT-master.zip
4848
- unzip /tmp/PCINT-master.zip -d /tmp/
@@ -59,13 +59,14 @@ install:
5959
# - wget https://github.com/adafruit/Adafruit-PCD8544-Nokia-5110-LCD-library/archive/master.zip -O /tmp/Adafruit-PCD8544-Nokia-5110-LCD-library-master.zip
6060
# - unzip /tmp/Adafruit-PCD8544-Nokia-5110-LCD-library-master.zip -d /tmp/
6161

62-
- wget https://github.com/adafruit/Adafruit-ST7735-Library/archive/master.zip -O /tmp/Adafruit-ST7735-Library-master.zip
63-
- unzip /tmp/Adafruit-ST7735-Library-master.zip -d /tmp/
62+
# - wget https://github.com/adafruit/Adafruit-ST7735-Library/archive/master.zip -O /tmp/Adafruit-ST7735-Library-master.zip
63+
# - unzip /tmp/Adafruit-ST7735-Library-master.zip -d /tmp/
6464

6565
# - wget https://github.com/PaulStoffregen/SD/archive/master.zip -O /tmp/SD-master.zip
6666
# - unzip /tmp/SD-master.zip -d /tmp/
6767

6868
script:
6969
# - platformio ci --lib="." --lib="/tmp/SD-master" --board=nanoatmega328 --board=teensy31
7070
# - platformio ci --lib="." --lib="/tmp/Streaming-master" --lib="/tmp/Adafruit-GFX-Library-master" --lib="/tmp/PCINT-master" --lib="/tmp/U8glib_Arduino-master" --lib="/tmp/AnsiStream-master" --lib="/tmp/NewliquidCrystal" --lib="/tmp/Adafruit-PCD8544-Nokia-5110-LCD-library-master" --lib="/tmp/Adafruit-ST7735-Library-master" --board=nanoatmega328 --board=teensy31 --board=due
71-
- platformio ci --lib="." --lib="/tmp/Streaming-master" --lib="/tmp/Adafruit-GFX-Library-master" --lib="/tmp/PCINT-master" --lib="/tmp/U8glib_Arduino-master" --lib="/tmp/AnsiStream-master" --lib="/tmp/NewliquidCrystal" --lib="/tmp/Adafruit-ST7735-Library-master" --board=nanoatmega328 --board=teensy31 --board=due
71+
# - platformio ci --lib="." --lib="/tmp/Streaming-master" --lib="/tmp/Adafruit-GFX-Library-master" --lib="/tmp/PCINT-master" --lib="/tmp/U8glib_Arduino-master" --lib="/tmp/AnsiStream-master" --lib="/tmp/NewliquidCrystal" --lib="/tmp/Adafruit-ST7735-Library-master" --board=nanoatmega328 --board=teensy31 --board=due
72+
- platformio ci --lib="." --lib="/tmp/Streaming-master" --lib="/tmp/PCINT-master" --lib="/tmp/U8glib_Arduino-master" --lib="/tmp/AnsiStream-master" --lib="/tmp/NewliquidCrystal" --board=nanoatmega328 --board=teensy31 --board=due

examples/targetSel/targetSel/targetSel.ino

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ struct Data {
3131
bool valid=0;
3232
SelTest selTest=Zero;
3333
ChooseTest chooseTest=First;
34-
//how to copy this data, being a simple data c++ will generate this for you
35-
// Data& operator=(Data& o){
36-
// strcpy(name,o.name);
37-
// valid=o.valid;
38-
// selTest=o.selTest;
39-
// chooseTest=o.chooseTest;
40-
// return o;
41-
// }
34+
//how to copy this data...
35+
Data& operator=(Data& o){
36+
strncpy(name,o.name,nameSz);
37+
valid=o.valid;
38+
selTest=o.selTest;
39+
chooseTest=o.chooseTest;
40+
return o;
41+
}
4242
};
4343

4444
//THE DATA <-----------------------------------------

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.20.1
2+
version=4.20.2
33
author=Rui Azevedo, [email protected]
44
maintainer=neu-rah, [email protected]
55
sentence=Generic menu/interactivity system

0 commit comments

Comments
 (0)