minor changes to mobile app, added board support for desktop app

Protocentral · May 24, 2024 · 89e6e90 · 89e6e90
1 parent 4a7ba74
commit 89e6e90
Show file tree

Hide file tree

Showing 13 changed files with 809 additions and 174 deletions.
diff --git a/.idea/libraries/Dart_SDK.xml b/.idea/libraries/Dart_SDK.xml
diff --git a/.idea/libraries/Flutter_Plugins.xml b/.idea/libraries/Flutter_Plugins.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/protocentral_openview2.iml b/.idea/protocentral_openview2.iml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/android/akw-newkey b/android/akw-newkey
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -407,7 +407,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 65;
+				CURRENT_PROJECT_VERSION = 71;
 				DEVELOPMENT_TEAM = M86YWF3243;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -424,7 +424,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.0.10;
+				MARKETING_VERSION = 2.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.protocentral.openview;
 				PRODUCT_NAME = Runner;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
@@ -548,7 +548,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 65;
+				CURRENT_PROJECT_VERSION = 71;
 				DEVELOPMENT_TEAM = M86YWF3243;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -565,7 +565,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.0.10;
+				MARKETING_VERSION = 2.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.protocentral.openview;
 				PRODUCT_NAME = Runner;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -583,7 +583,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 65;
+				CURRENT_PROJECT_VERSION = 71;
 				DEVELOPMENT_TEAM = M86YWF3243;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -600,7 +600,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.0.10;
+				MARKETING_VERSION = 2.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.protocentral.openview;
 				PRODUCT_NAME = OpenView;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";

diff --git a/lib/home.dart b/lib/home.dart
@@ -33,9 +33,11 @@ bool connectedToDevice = false;
 
 String pcCurrentDeviceID = "";
 String pcCurrentDeviceName = "";
-String _selectedBoard = 'Select Board';
 
-String _selectedPort = 'Board';
+String _selectedBoard = 'Healthypi';
+
+String _selectedPort = 'Port';
+String selectedPortBoard = 'Healthypi';
 
 late SerialPort _serialPort;
 
@@ -71,6 +73,9 @@ var ces_pkt_ch1_buffer = new List.filled(4, 0, growable: false);
 var ces_pkt_ch2_buffer = new List.filled(4, 0, growable: false);
 var ces_pkt_ch3_buffer = new List.filled(4, 0, growable: false);
 
+int computed_val1 = 0;
+int computed_val2 = 0;
+
 class HomePage extends StatefulWidget {
   HomePage({Key? key, required this.title}) : super(key: key);
 
@@ -632,6 +637,51 @@ class _HomePageState extends State<HomePage> {
           SizedBox(
             width:20.0,
           ),
+          DropdownButton(
+            underline: SizedBox(),
+            dropdownColor: hPi4Global.hpi4Color,
+            hint: selectedPortBoard  == null
+                ? Text('Select Board')
+                : Text(selectedPortBoard,
+              style: TextStyle(color: hPi4Global.hpi4Color, fontSize: 16.0),
+            ),
+            //isExpanded: true,
+            iconSize: 50.0,
+            style: TextStyle(color: Colors.white, fontSize: 16.0),
+            items: [
+              'Healthypi',
+              'ADS1292R Breakout/Shield',
+              'ADS1293 Breakout/Shield',
+              'AFE4490 Breakout/Shield',
+              'MAX86150 Breakout',
+              'Pulse Express (MAX30102/MAX32664D)',
+              'tinyGSR Breakout',
+              'MAX30003 ECG Breakout',
+              'MAX30001 ECG & BioZ Breakout'
+            ].map(
+                  (val) {
+                return DropdownMenuItem<String>(
+                  value: val,
+                  child: Text(val),
+                );
+              },
+            ).toList(),
+            onChanged: (value) {
+              setState(
+                    () {
+                  selectedPortBoard = value as String;
+                },
+              );
+            },
+          ),
+          SizedBox(
+            width:50.0,
+          ),
+          Text("Select Port:",style:
+          TextStyle(color: Colors.black, fontSize: 16.0) ),
+          SizedBox(
+            width:20.0,
+          ),
           DropdownButton(
             underline: SizedBox(),
             dropdownColor: hPi4Global.hpi4Color,
@@ -696,6 +746,7 @@ class _HomePageState extends State<HomePage> {
                   => PlotSerialPage(
                     selectedPort:_serialPort,
                       selectedSerialPort: _selectedPort,
+                      selectedPortBoard: selectedPortBoard,
                   )));
 
             },