Skip to content

Commit c42dc34

Browse files
committed
added driving screen
1 parent a53bebe commit c42dc34

File tree

8 files changed

+657
-9
lines changed

8 files changed

+657
-9
lines changed

CanZE/CanZE.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
629204DE258BB05400288D1E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 629204DD258BB05400288D1E /* Assets.xcassets */; };
3535
629204E1258BB05400288D1E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 629204DF258BB05400288D1E /* LaunchScreen.storyboard */; };
3636
629D902725C31187007EF21A /* ChargingGraphViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 629D902625C31187007EF21A /* ChargingGraphViewController.swift */; };
37+
62A01DE825CD92CA00D69A01 /* DrivingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62A01DE725CD92CA00D69A01 /* DrivingViewController.swift */; };
3738
62B1DFB025A9A255006454EE /* _assets in Resources */ = {isa = PBXBuildFile; fileRef = 62B1DFAF25A9A255006454EE /* _assets */; };
3839
62B1DFC525A9BA3C006454EE /* BatteryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62B1DFC425A9BA3C006454EE /* BatteryViewController.swift */; };
3940
62B5A56225A8B10600C4F050 /* Localizable.plist in Resources */ = {isa = PBXBuildFile; fileRef = 62B5A56425A8B10600C4F050 /* Localizable.plist */; };
@@ -111,6 +112,7 @@
111112
629204E0258BB05400288D1E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
112113
629204E2258BB05400288D1E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
113114
629D902625C31187007EF21A /* ChargingGraphViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChargingGraphViewController.swift; sourceTree = "<group>"; };
115+
62A01DE725CD92CA00D69A01 /* DrivingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DrivingViewController.swift; sourceTree = "<group>"; };
114116
62B1DFAF25A9A255006454EE /* _assets */ = {isa = PBXFileReference; lastKnownFileType = folder; path = _assets; sourceTree = "<group>"; };
115117
62B1DFC425A9BA3C006454EE /* BatteryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BatteryViewController.swift; sourceTree = "<group>"; };
116118
62B5A55625A8AD4F00C4F050 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -241,6 +243,7 @@
241243
622B484925CAA53C00F27323 /* VoltageHeatmapViewController.swift */,
242244
622B484C25CAA54B00F27323 /* TemperatureHeatmapViewController.swift */,
243245
622B485325CB051400F27323 /* AuxBatteryViewController.swift */,
246+
62A01DE725CD92CA00D69A01 /* DrivingViewController.swift */,
244247
6282BBB425CC48E600BB442B /* ConsumptionViewController.swift */,
245248
62DFAB5C25924CB800B00C5C /* _TestViewController.swift */,
246249
62E602AE25B971130018D36C /* _Test_CentralManager.swift */,
@@ -536,6 +539,7 @@
536539
62D3F93D25926D36002CB6C7 /* Frame.swift in Sources */,
537540
62D3F95025932CF9002CB6C7 /* Dtc.swift in Sources */,
538541
62D3F97925934B6C002CB6C7 /* CanZeViewController.swift in Sources */,
542+
62A01DE825CD92CA00D69A01 /* DrivingViewController.swift in Sources */,
539543
62E602A825B970620018D36C /* _Test_Wifi.swift in Sources */,
540544
);
541545
runOnlyForDeploymentPostprocessing = 0;

CanZE/CanZE/Base.lproj/Main.storyboard

Lines changed: 259 additions & 1 deletion
Large diffs are not rendered by default.

CanZE/CanZE/BatteryViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class BatteryViewController: CanZeViewController {
116116
queue2 = []
117117

118118
if Utils.isPh2() {
119-
addField("7ec.5003.0", intervalMs: 2000) // open EVC
119+
addField(Sid.EVC, intervalMs: 2000) // open EVC
120120
}
121121
addField("658.33", intervalMs: 5000) // state of health gives continuous timeouts. This frame is send at a very low rate
122122

CanZE/CanZE/ChargingViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ class ChargingViewController: CanZeViewController {
118118
queue2 = []
119119

120120
if Utils.isPh2() {
121-
addField("7ec.5003.0", intervalMs: 2000) // open EVC
121+
addField(Sid.EVC, intervalMs: 2000) // open EVC
122122
}
123123
addField(Sid.MaxCharge, intervalMs: 5000)
124124
addField(Sid.UserSoC, intervalMs: 5000)

CanZE/CanZE/ConsumptionViewController.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,9 @@ class ConsumptionViewController: CanZeViewController {
138138
addField(Sid.UserSoC, intervalMs: 99999)
139139

140140
addField(Sid.RealSpeed, intervalMs: 99999)
141-
// addField("800.6104.24", intervalMs: 99999) TODO: existing virtual field ?
141+
// addField("800.6104.24", intervalMs: 99999) TODO: existing virtual field ?
142142

143-
// addField("800.6107.24", intervalMs: 99999) TODO: existing virtual field ?
143+
// addField("800.6107.24", intervalMs: 99999) TODO: existing virtual field ?
144144
addField(Sid.RangeEstimate, intervalMs: 99999)
145145

146146
startQueue2()
@@ -180,6 +180,7 @@ class ConsumptionViewController: CanZeViewController {
180180
var tprwt = -Int(val!)
181181
// pb = findViewById(R.id.MaxBreakTorque)
182182
// if (pb != null) pb.setProgress(tprwt < 2047 ? tprwt : 10)
183+
// TODO:
183184
/*
184185
case Sid.Instant_Consumption:
185186
double consumptionDbl = field.getValue();

0 commit comments

Comments
 (0)