From c089e932da94b61a336de548596c01eb673d2dba Mon Sep 17 00:00:00 2001 From: Antonio Date: Thu, 7 May 2020 20:40:03 +0200 Subject: [PATCH] Neopixels: Fixed the number of bytes sent for animations. It was hardcoded and now depends on the board. Updated for Swift 5.2 and fixed new warnings about tuples --- BluefruitPlayground.xcodeproj/project.pbxproj | 12 +- .../Base.lproj/Main.storyboard | 80 +++++------ .../Base.lproj/Modules.storyboard | 132 +++++++++--------- .../AdafruitBoard+FlashNeopixels.swift | 18 +++ .../Model/AdafruitBoard/AdafruitBoard.swift | 22 +-- .../Model/AdafruitBoard/LightSequence.swift | 35 +++-- .../Home/HomeViewController.swift | 4 +- .../PixelsPreviewViewController.swift | 10 +- .../ViewControllers/ScreenFlowManager.swift | 13 +- 9 files changed, 178 insertions(+), 148 deletions(-) create mode 100644 BluefruitPlayground/Model/AdafruitBoard/AdafruitBoard+FlashNeopixels.swift diff --git a/BluefruitPlayground.xcodeproj/project.pbxproj b/BluefruitPlayground.xcodeproj/project.pbxproj index 8ea630a..8c9e3fc 100644 --- a/BluefruitPlayground.xcodeproj/project.pbxproj +++ b/BluefruitPlayground.xcodeproj/project.pbxproj @@ -75,6 +75,7 @@ A94AC1462363A59B0062AB11 /* TemperatureViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A94AC1452363A59B0062AB11 /* TemperatureViewController.swift */; }; A94AC1482363A7BD0062AB11 /* TemperaturePanelViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A94AC1472363A7BD0062AB11 /* TemperaturePanelViewController.swift */; }; A94AC14E2364A82B0062AB11 /* AdafruitBoard.swift in Sources */ = {isa = PBXBuildFile; fileRef = A94AC14D2364A82A0062AB11 /* AdafruitBoard.swift */; }; + A9573B372464891D00E15D28 /* AdafruitBoard+FlashNeopixels.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9573B362464891D00E15D28 /* AdafruitBoard+FlashNeopixels.swift */; }; A958E77C238AFA4E006A225A /* BlePeripheral+AdafruitNeoPixels.swift in Sources */ = {isa = PBXBuildFile; fileRef = A958E77B238AFA4E006A225A /* BlePeripheral+AdafruitNeoPixels.swift */; }; A958E77E238B7457006A225A /* NormalBrightnessSliderControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = A958E77D238B7457006A225A /* NormalBrightnessSliderControl.swift */; }; A958E780238B75D9006A225A /* NormalBrightnessColorPickerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A958E77F238B75D9006A225A /* NormalBrightnessColorPickerController.swift */; }; @@ -339,6 +340,7 @@ A94AC1452363A59B0062AB11 /* TemperatureViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TemperatureViewController.swift; sourceTree = ""; }; A94AC1472363A7BD0062AB11 /* TemperaturePanelViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TemperaturePanelViewController.swift; sourceTree = ""; }; A94AC14D2364A82A0062AB11 /* AdafruitBoard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdafruitBoard.swift; sourceTree = ""; }; + A9573B362464891D00E15D28 /* AdafruitBoard+FlashNeopixels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AdafruitBoard+FlashNeopixels.swift"; sourceTree = ""; }; A958E77923821EF8006A225A /* BlePeripheral+AdafruitToneGenerator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "BlePeripheral+AdafruitToneGenerator.swift"; sourceTree = ""; }; A958E77B238AFA4E006A225A /* BlePeripheral+AdafruitNeoPixels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "BlePeripheral+AdafruitNeoPixels.swift"; sourceTree = ""; }; A958E77D238B7457006A225A /* NormalBrightnessSliderControl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NormalBrightnessSliderControl.swift; sourceTree = ""; }; @@ -545,6 +547,7 @@ children = ( A92256942411D01100B8AB57 /* AdafruitBoardsManager.swift */, A94AC14D2364A82A0062AB11 /* AdafruitBoard.swift */, + A9573B362464891D00E15D28 /* AdafruitBoard+FlashNeopixels.swift */, A901EC4C237C47D800687BE6 /* SensorDataSeries.swift */, A9A08B2223A2841200498069 /* LightSequence.swift */, A9A08B2423A2CBCF00498069 /* LightSequenceAnimation.swift */, @@ -1206,6 +1209,7 @@ A9EAA19523514B2800FA615E /* CornerShadowButton.swift in Sources */, A96AA5D523635A89004A06BA /* NSLayoutConstraint+ChangeMultiplier.swift in Sources */, A93159DD241A5B6000218092 /* ActiveLabelUtils.swift in Sources */, + A9573B372464891D00E15D28 /* AdafruitBoard+FlashNeopixels.swift in Sources */, A96AA5C823633EB3004A06BA /* UIButton+BackgroundColorForState.swift in Sources */, A92256912411CEEA00B8AB57 /* BlePeripheral+AdafruitToneGenerator.swift in Sources */, A9A08B2523A2CBCF00498069 /* LightSequenceAnimation.swift in Sources */, @@ -1603,7 +1607,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 22; DEVELOPMENT_TEAM = 2X94RM7457; INFOPLIST_FILE = BluefruitPlayground/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -1628,7 +1632,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 22; DEVELOPMENT_TEAM = 2X94RM7457; INFOPLIST_FILE = BluefruitPlayground/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -1692,7 +1696,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 22; DEVELOPMENT_TEAM = 2X94RM7457; INFOPLIST_FILE = "BluefruitPlayground-SimulatedBluetooth-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -1718,7 +1722,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 22; DEVELOPMENT_TEAM = 2X94RM7457; INFOPLIST_FILE = "BluefruitPlayground-SimulatedBluetooth-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; diff --git a/BluefruitPlayground/Base.lproj/Main.storyboard b/BluefruitPlayground/Base.lproj/Main.storyboard index bcf467a..f5a6ffc 100644 --- a/BluefruitPlayground/Base.lproj/Main.storyboard +++ b/BluefruitPlayground/Base.lproj/Main.storyboard @@ -1,9 +1,9 @@ - + - + @@ -402,19 +402,19 @@ - + - + - + @@ -597,7 +597,7 @@ - + @@ -605,14 +605,14 @@ - + - + - + @@ -662,10 +662,10 @@ - + - + @@ -856,19 +856,19 @@ - + @@ -922,19 +922,19 @@ @@ -1064,19 +1064,19 @@ - + @@ -1204,19 +1204,19 @@ - + - + - + - + - + @@ -1570,24 +1570,24 @@ - + - + - +