Upgrade Dart and Flutter target, fix Termiox and bumped sigrok libserialport to latest main (jpnurmi#99)

lucafabbri · ajeeshklr · web-flow · commit b23ff3391de6 · 2024-02-21T12:15:10.000+01:00
* Update config.h

* merged 3.0 changes with branch

* Updated disabled termios support

* Changing the termiox definition as an experiment.

* Removed termiox support from android,

* resolved issue for android.

* Restored all .gitignore files which got removed during fork.

* feat: bumped serial port source code to latest master available on sigrok

---------

Co-authored-by: ajeeshklr &lt;ajeeshklr@gmail.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.0
+
+* Upgrade to Dart 2.17, Flutter 3.0, libserialport 0.3
+
 ## 0.2.3
 
 * Fix linux builds for newer kernels (thanks @sitic)
diff --git a/android/.gitignore b/android/.gitignore
@@ -5,4 +5,4 @@
 /.idea/libraries
 .DS_Store
 /build
-/captures
+/captures
diff --git a/android/libserialport/config.h b/android/libserialport/config.h
@@ -54,7 +54,7 @@
 /* #undef HAVE_STRUCT_TERMIOS_C_OSPEED */
 
 /* Define to 1 if the system has the type `struct termiox'. */
-#define HAVE_STRUCT_TERMIOX 1
+#undef HAVE_STRUCT_TERMIOX
 
 /* sys/file.h is available. */
 #define HAVE_SYS_FILE_H 1
diff --git a/example/.gitignore b/example/.gitignore
@@ -42,4 +42,4 @@ lib/generated_plugin_registrant.dart
 app.*.symbols
 
 # Obfuscation related
-app.*.map.json
+app.*.map.json
diff --git a/example/.metadata b/example/.metadata
@@ -7,4 +7,4 @@ version:
   revision: 707aa49e42db746a8f4528e4700fb9017c5969d8
   channel: master
 
-project_type: app
+project_type: app
diff --git a/example/android/.gitignore b/example/android/.gitignore
@@ -8,4 +8,4 @@ GeneratedPluginRegistrant.java
 
 # Remember to never publicly share your keystore.
 # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
-key.properties
+key.properties
diff --git a/example/linux/.gitignore b/example/linux/.gitignore
@@ -1 +1 @@
-flutter/ephemeral
+flutter/ephemeral
diff --git a/example/macos/.gitignore b/example/macos/.gitignore
@@ -3,4 +3,4 @@
 **/Pods/
 
 # Xcode-related
-**/xcuserdata/
+**/xcuserdata/
diff --git a/example/macos/Podfile b/example/macos/Podfile
@@ -1,4 +1,4 @@
-platform :osx, '10.11'
+platform :osx, '10.14'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/example/macos/Runner.xcodeproj/project.pbxproj b/example/macos/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXAggregateTarget section */
@@ -203,7 +203,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "The Flutter Authors";
 				TargetAttributes = {
 					33CC10EC2044A3C60003C045 = {
@@ -256,6 +256,7 @@
 /* Begin PBXShellScriptBuildPhase section */
 		3399D490228B24CF009A79C7 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -407,7 +408,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -490,7 +491,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -537,7 +538,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
diff --git a/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/example/windows/.gitignore b/example/windows/.gitignore
@@ -14,4 +14,4 @@ x86/
 # files ending in .cache can be ignored
 *.[Cc]ache
 # but keep track of directories ending in .cache
-!*.[Cc]ache/
+!*.[Cc]ache/
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,19 +1,19 @@
 name: flutter_libserialport
 description: A simple wrapper around libserialport utilizing Flutter's
   build system to build and deploy the C-library for the target platform.
-version: 0.2.3
+version: 0.4.0
 homepage: https://github.com/jpnurmi/flutter_libserialport
 repository: https://github.com/jpnurmi/flutter_libserialport
 issue_tracker: https://github.com/jpnurmi/flutter_libserialport/issues
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
-  flutter: '>=1.20.0'
+  sdk: ">=2.17.0 <4.0.0"
+  flutter: ">=3.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  libserialport: ^0.2.0+3
+  libserialport: ^0.3.0
 
 dev_dependencies:
   flutter_test:
diff --git a/third_party/libserialport/README b/third_party/libserialport/README
@@ -83,7 +83,7 @@ Mailing list
 IRC
 ===
 
-You can find the developers in the #sigrok IRC channel on Freenode.
+You can find the developers in the #sigrok IRC channel on Libera.Chat.
 
 Website
 =======
diff --git a/third_party/libserialport/configure.ac b/third_party/libserialport/configure.ac
@@ -112,7 +112,7 @@ AC_SYS_LARGEFILE
 AC_TYPE_SIZE_T
 
 # Check for specific termios structures.
-AC_CHECK_TYPES([struct termios2, struct termiox],,,
+AC_CHECK_TYPES([struct termios2],,,
 	[[#include <linux/termios.h>]])
 AC_CHECK_MEMBERS([struct termios.c_ispeed, struct termios.c_ospeed,
 		struct termios2.c_ispeed, struct termios2.c_ospeed],,,
diff --git a/third_party/libserialport/libserialport_internal.h b/third_party/libserialport/libserialport_internal.h
@@ -93,6 +93,9 @@
 #include <IOKit/serial/ioss.h>
 #include <sys/syslimits.h>
 #include <mach/mach_time.h>
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 120000 /* Before macOS 12 */
+#define kIOMainPortDefault kIOMasterPortDefault
+#endif
 #endif
 #ifdef __linux__
 #include <dirent.h>
diff --git a/third_party/libserialport/macosx.c b/third_party/libserialport/macosx.c
@@ -42,7 +42,7 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port)
 	if (!(classes = IOServiceMatching(kIOSerialBSDServiceValue)))
 		RETURN_FAIL("IOServiceMatching() failed");
 
-	if (IOServiceGetMatchingServices(kIOMasterPortDefault, classes,
+	if (IOServiceGetMatchingServices(kIOMainPortDefault, classes,
 	                                 &iter) != KERN_SUCCESS)
 		RETURN_FAIL("IOServiceGetMatchingServices() failed");
 
@@ -210,7 +210,7 @@ SP_PRIV enum sp_return list_ports(struct sp_port ***list)
 	}
 
 	DEBUG("Getting matching services");
-	if (IOServiceGetMatchingServices(kIOMasterPortDefault, classes,
+	if (IOServiceGetMatchingServices(kIOMainPortDefault, classes,
 	                                 &iter) != KERN_SUCCESS) {
 		SET_FAIL(ret, "IOServiceGetMatchingServices() failed");
 		goto out_done;
diff --git a/third_party/libserialport/serialport.c b/third_party/libserialport/serialport.c
@@ -590,6 +590,15 @@ SP_API enum sp_return sp_open(struct sp_port *port, enum sp_mode flags)
 		RETURN_CODEVAL(ret);
 	}
 
+	/*
+	 * Assume a default baudrate if the OS does not provide one.
+	 * Cannot assign -1 here since Windows holds the baudrate in
+	 * the DCB and does not configure the rate individually.
+	 */
+	if (config.baudrate == 0) {
+		config.baudrate = 9600;
+	}
+
 	/* Set sane port settings. */
 #ifdef _WIN32
 	data.dcb.fBinary = TRUE;
@@ -633,7 +642,8 @@ SP_API enum sp_return sp_open(struct sp_port *port, enum sp_mode flags)
 	data.term.c_cc[VTIME] = 0;
 
 	/* Ignore modem status lines; enable receiver; leave control lines alone on close. */
-	data.term.c_cflag |= (CLOCAL | CREAD | HUPCL);
+	data.term.c_cflag |= (CLOCAL | CREAD);
+	data.term.c_cflag &= ~(HUPCL);
 #endif
 
 #ifdef _WIN32
@@ -876,7 +886,7 @@ SP_API enum sp_return sp_blocking_write(struct sp_port *port, const void *buf,
 	unsigned char *ptr = (unsigned char *) buf;
 	struct timeout timeout;
 	fd_set fds;
-	int result;
+	ssize_t result;
 
 	timeout_start(&timeout, timeout_ms);
 
@@ -1081,7 +1091,7 @@ SP_API enum sp_return sp_blocking_read(struct sp_port *port, void *buf,
 	unsigned char *ptr = (unsigned char *) buf;
 	struct timeout timeout;
 	fd_set fds;
-	int result;
+	ssize_t result;
 
 	timeout_start(&timeout, timeout_ms);
 
@@ -1204,7 +1214,7 @@ SP_API enum sp_return sp_blocking_read_next(struct sp_port *port, void *buf,
 	size_t bytes_read = 0;
 	struct timeout timeout;
 	fd_set fds;
-	int result;
+	ssize_t result;
 
 	timeout_start(&timeout, timeout_ms);
 
diff --git a/windows/.gitignore b/windows/.gitignore
@@ -14,4 +14,4 @@ x86/
 # files ending in .cache can be ignored
 *.[Cc]ache
 # but keep track of directories ending in .cache
-!*.[Cc]ache/
+!*.[Cc]ache/

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-platform :osx, '10.11'`
	`1`	`+platform :osx, '10.14'`
`2`	`2`
`3`	`3`	`# CocoaPods analytics sends network stats synchronously affecting flutter build latency.`
`4`	`4`	`ENV['COCOAPODS_DISABLE_STATS'] = 'true'`