4.20.2 fix userMenu example

neu-rah · May 17, 2020 · 379ca59 · 379ca59
1 parent 9926913
commit 379ca59
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -29,7 +29,7 @@ env:
    # - PLATFORMIO_CI_SRC=examples/Serial/ansiSerial/ansiSerial/ansiSerial.ino
    - PLATFORMIO_CI_SRC=examples/codeCtrl/codeCtrl/codeCtrl.ino
    # - PLATFORMIO_CI_SRC=examples/adafruitGfx/lcdMono/lcdMono/lcdMono.ino
-   - PLATFORMIO_CI_SRC=examples/adafruitGfx/tft/tft/tft.ino
+   # - PLATFORMIO_CI_SRC=examples/adafruitGfx/tft/tft/tft.ino
    - PLATFORMIO_CI_SRC=examples/U8GLib/U8GLib/U8GLib.ino
 
 install:
@@ -41,8 +41,8 @@ install:
   #  - wget https://github.com/nettigo/Assert4a/archive/master.zip -O /tmp/Assert4a.zip
   #  - unzip /tmp/Assert4a.zip -d /tmp/
 
-   - wget https://github.com/adafruit/Adafruit-GFX-Library/archive/master.zip -O /tmp/Adafruit-GFX-Library-master.zip
-   - unzip /tmp/Adafruit-GFX-Library-master.zip -d /tmp/
+   # - wget https://github.com/adafruit/Adafruit-GFX-Library/archive/master.zip -O /tmp/Adafruit-GFX-Library-master.zip
+   # - unzip /tmp/Adafruit-GFX-Library-master.zip -d /tmp/
 
    - wget https://github.com/neu-rah/PCINT/archive/master.zip -O /tmp/PCINT-master.zip
    - unzip /tmp/PCINT-master.zip -d /tmp/
@@ -59,13 +59,14 @@ install:
    # - wget https://github.com/adafruit/Adafruit-PCD8544-Nokia-5110-LCD-library/archive/master.zip -O /tmp/Adafruit-PCD8544-Nokia-5110-LCD-library-master.zip
    # - unzip /tmp/Adafruit-PCD8544-Nokia-5110-LCD-library-master.zip -d /tmp/
 
-   - wget https://github.com/adafruit/Adafruit-ST7735-Library/archive/master.zip -O /tmp/Adafruit-ST7735-Library-master.zip
-   - unzip /tmp/Adafruit-ST7735-Library-master.zip -d /tmp/
+   # - wget https://github.com/adafruit/Adafruit-ST7735-Library/archive/master.zip -O /tmp/Adafruit-ST7735-Library-master.zip
+   # - unzip /tmp/Adafruit-ST7735-Library-master.zip -d /tmp/
 
    # - wget https://github.com/PaulStoffregen/SD/archive/master.zip -O /tmp/SD-master.zip
    # - unzip /tmp/SD-master.zip -d /tmp/
 
 script:
   #  - platformio ci --lib="."  --lib="/tmp/SD-master"  --board=nanoatmega328 --board=teensy31
    # - 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
-   - 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
+   # - 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
+   - 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
diff --git a/examples/targetSel/targetSel/targetSel.ino b/examples/targetSel/targetSel/targetSel.ino
@@ -31,14 +31,14 @@ struct Data {
   bool valid=0;
   SelTest selTest=Zero;
   ChooseTest chooseTest=First;
-  //how to copy this data, being a simple data c++ will generate this for you
-  // Data& operator=(Data& o){
-  //   strcpy(name,o.name);
-  //   valid=o.valid;
-  //   selTest=o.selTest;
-  //   chooseTest=o.chooseTest;
-  //   return o;
-  // }
+  //how to copy this data...
+  Data& operator=(Data& o){
+    strncpy(name,o.name,nameSz);
+    valid=o.valid;
+    selTest=o.selTest;
+    chooseTest=o.chooseTest;
+    return o;
+  }
 };
 
 //THE DATA <-----------------------------------------

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=ArduinoMenu library
-version=4.20.1
+version=4.20.2
 author=Rui Azevedo, [email protected]
 maintainer=neu-rah, [email protected]
 sentence=Generic menu/interactivity system