release 4.0 and small fixes

Author: dave

xmlPlugins/core-display/ArduinoTouchLibraryIntegration.xml

@@ -32,18 +32,15 @@
                   desc="The library level touch rotation as provided to setRotation - XPT only" whenProperty="TOUCH_LIBRARY" isValue="XPT2046_Touchscreen"/>
 
         <Property id="ORIENTATION_SEPARATOR" name="%core.touch.orientation" initial="" desc="%core.touch.orientation.desc" type="separator"/>
-        <Property id="LIB_TOUCH_SWAP_XY" name="%core.touch.swap.xy" initial="false" whenProperty="TOUCH_SCREEN_REQUIRED" isValue="true"
-                  desc="%core.touch.swap.xy.desc" type="boolean" />
-        <Property id="LIB_TOUCH_X_INVERTED" name="%core.touch.x.inverted" initial="false" whenProperty="TOUCH_SCREEN_REQUIRED" isValue="true"
-                  type="boolean" desc="%core.touch.x.inverted.desc"/>
-        <Property id="LIB_TOUCH_Y_INVERTED" name="%core.touch.y.inverted" initial="false" whenProperty="TOUCH_SCREEN_REQUIRED" isValue="true"
-                  type="boolean" desc="%core.touch.y.inverted.desc"/>
+        <Property id="LIB_TOUCH_SWAP_XY" name="%core.touch.swap.xy" initial="false" desc="%core.touch.swap.xy.desc" type="boolean" />
+        <Property id="LIB_TOUCH_X_INVERTED" name="%core.touch.x.inverted" initial="false" type="boolean" desc="%core.touch.x.inverted.desc"/>
+        <Property id="LIB_TOUCH_Y_INVERTED" name="%core.touch.y.inverted" initial="false" type="boolean" desc="%core.touch.y.inverted.desc"/>
 
         <Property id="CALIB_SEPARATOR" name="%core.touch.calibration" initial="" desc="%core.touch.calibration.desc" type="separator"/>
         <Property id="TOUCH_SCREEN_CALIBRATE" name="%core.enable.touch.calib" initial="true"
-                  desc="%core.enable.touch.calib.desc" type="boolean" whenProperty="TOUCH_SCREEN_REQUIRED" isValue="true"  />
+                  desc="%core.enable.touch.calib.desc" type="boolean" />
         <Property id="TOUCH_CALIBRATION_STORAGE_LOC" name="%core.touch.calib.addr" initial="400" type="int"
-                  desc="%core.touch.calib.addr.desc"  min="4" max="65535" whenProperty="TOUCH_SCREEN_REQUIRED" isValue="true" />
+                  desc="%core.touch.calib.addr.desc"  min="4" max="65535"  />
     </Properties>
 
     <ApplicabilityDefs/>

xmlPlugins/core-display/adaGfxDisplay.xml

@@ -31,6 +31,7 @@
     <SourceFiles>
         <Replacement find="#define DISPLAY_HAS_MEMBUFFER (true|false)" replace="#define DISPLAY_HAS_MEMBUFFER ${DISPLAY_BUFFERED}"/>
         <Replacement find="Adafruit_ILI9341" replace="${DISPLAY_TYPE}"/>
+        <Replacement find="Adafruit_ILI9341" replace="${DISPLAY_TYPE}"/>
         <SourceFile name="adaGfxDriver/tcMenuAdaFruitGfxMono.cpp" whenProperty="DISPLAY_BUFFERED" isValue="true"/>
         <SourceFile name="adaGfxDriver/tcMenuAdaFruitGfxMono.h" whenProperty="DISPLAY_BUFFERED" isValue="true"/>
         <SourceFile name="adaGfxDriver/tcMenuAdaFruitGfx.cpp" whenProperty="DISPLAY_BUFFERED" isValue="false"/>

xmlPlugins/core-display/adaGfxDriver/tcMenuAdaFruitGfxMono.cpp

@@ -21,7 +21,7 @@ using namespace tcgfx;
 
 void AdafruitDrawable::transaction(bool isStarting, bool redrawNeeded) {
     if(!isStarting && redrawNeeded) {
-        reinterpret_cast<Adafruit_PCD8544*>(graphics)->display();
+        reinterpret_cast<Adafruit_ILI9341*>(graphics)->display();
     }
 }