Skip to content

Commit 082e4d1

Browse files
authored
feat: add ch340k support for android usb connection (#69)
* chore(macos): bump osx version to 10.15 * feat: add CH340K support for android USB connection * chore: v0.15.8
1 parent 25a9d39 commit 082e4d1

File tree

7 files changed

+13
-10
lines changed

7 files changed

+13
-10
lines changed

android/app/src/main/res/xml/device_filter.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,7 @@
2424
<!-- 0x1366 / 0x0105: CH340 JLink -->
2525
<usb-device vendor-id="1A86" product-id="7523" />
2626

27+
<!-- CH340K -->
28+
<usb-device vendor-id="1A86" product-id="7522" />
29+
2730
</resources>

macos/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
platform :osx, '10.14'
1+
platform :osx, '10.15'
22

33
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
44
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

macos/Runner.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@
206206
isa = PBXProject;
207207
attributes = {
208208
LastSwiftUpdateCheck = 0920;
209-
LastUpgradeCheck = 1430;
209+
LastUpgradeCheck = 1510;
210210
ORGANIZATIONNAME = "";
211211
TargetAttributes = {
212212
33CC10EC2044A3C60003C045 = {

macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

macos/Runner/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Cocoa
22
import FlutterMacOS
33

4-
@NSApplicationMain
4+
@main
55
class AppDelegate: FlutterAppDelegate {
66
override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
77
return true

pubspec.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1279,9 +1279,9 @@ packages:
12791279
dependency: "direct main"
12801280
description:
12811281
path: "."
1282-
ref: master
1283-
resolved-ref: f67142be60261d59736af9fcdab21c44d32352a4
1284-
url: "https://github.com/jymden/usbserial.git"
1282+
ref: "feat/ch340k_support"
1283+
resolved-ref: c3261d608d2730b58d41eadc99cb7bd50d18e43f
1284+
url: "https://github.com/radomir9720/usbserial_flutter.git"
12851285
source: git
12861286
version: "0.5.1"
12871287
uuid:

pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: pixel_app_flutter
22
description: App, that manages the functions of the StarPixel car. Also considered to be used as an on-board computer.
3-
version: 0.15.7+38
3+
version: 0.15.8+39
44
publish_to: none
55

66
environment:
@@ -52,8 +52,8 @@ dependencies:
5252
share_plus: ^7.2.1
5353
usb_serial:
5454
git:
55-
url: https://github.com/jymden/usbserial.git
56-
ref: master
55+
url: https://github.com/radomir9720/usbserial_flutter.git
56+
ref: "feat/ch340k_support"
5757
bg_launcher: ^0.0.1
5858
app_settings: ^5.1.1
5959
wakelock_plus: ^1.1.3

0 commit comments

Comments
 (0)