diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
index e3859b24..2ab55f11 100644
--- a/.github/workflows/examples.yml
+++ b/.github/workflows/examples.yml
@@ -7,7 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-16.04, windows-latest, macos-latest]
+        os: [ubuntu-18.04, windows-latest, macos-latest]
         python-version: [3.7]
         example:
           - "examples/arduino-blink"
diff --git a/boards/adafruit_pyportal_m4_titano.json b/boards/adafruit_pyportal_m4_titano.json
index 4f504a3e..df6e60f7 100644
--- a/boards/adafruit_pyportal_m4_titano.json
+++ b/boards/adafruit_pyportal_m4_titano.json
@@ -7,6 +7,7 @@
     "cpu": "cortex-m4",
     "extra_flags": [
       "-DARDUINO_PYPORTAL_M4_TITANO",
+      "-DADAFRUIT_PYPORTAL_M4_TITANO",
       "-DADAFRUIT_PYPORTAL",
       "-D__SAMD51J20A__",
       "-D__SAMD51__",
diff --git a/builder/frameworks/arduino/arduino-samd.py b/builder/frameworks/arduino/arduino-samd.py
index 11161f59..529279f0 100644
--- a/builder/frameworks/arduino/arduino-samd.py
+++ b/builder/frameworks/arduino/arduino-samd.py
@@ -107,6 +107,9 @@
 
     if VENDOR_CORE == "adafruit":
         env.Append(
+            CPPDEFINES=[
+                "ARDUINO_SAMD_ADAFRUIT"
+            ],
             CPPPATH=[
                 os.path.join(
                     FRAMEWORK_DIR,
diff --git a/platform.json b/platform.json
index b7ed093d..8b7fb332 100644
--- a/platform.json
+++ b/platform.json
@@ -20,7 +20,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-atmelsam.git"
   },
-  "version": "6.3.1",
+  "version": "7.0.0",
   "frameworks": {
     "arduino": {
       "package": "framework-arduino-sam",
@@ -145,7 +145,7 @@
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~2.20600.0"
+      "version": "~2.20700.0"
     },
     "tool-avrdude": {
       "type": "uploader",
@@ -171,7 +171,7 @@
       "type": "uploader",
       "optional": true,
       "owner": "platformio",
-      "version": "~2.1000.0"
+      "version": "~2.1100.0"
     },
     "tool-jlink": {
       "type": "uploader",
@@ -182,7 +182,7 @@
     "tool-cmake": {
       "optional": true,
       "owner": "platformio",
-      "version": "~3.16.0"
+      "version": "~3.21.0"
     },
     "tool-dtc": {
       "optional": true,