Merge pull request #460 from SUPLA/develop

Develop
SUPLA · Dec 18, 2024 · 2f28d9f · 2f28d9f
2 parents 64af3f5 + e5eec05
commit 2f28d9f
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/SUPLA.xcodeproj/project.pbxproj b/SUPLA.xcodeproj/project.pbxproj
@@ -8145,7 +8145,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = SUPLA/SUPLA.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 215;
+				CURRENT_PROJECT_VERSION = 216;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = T6ZPGSWA75;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -8184,7 +8184,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = SUPLA/SUPLA.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 215;
+				CURRENT_PROJECT_VERSION = 216;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = T6ZPGSWA75;
 				GCC_PREPROCESSOR_DEFINITIONS = (

diff --git a/SUPLA/Features/Details/DetailBase/ElectricityMeter/ElectricityMeterGeneralStateHandler.swift b/SUPLA/Features/Details/DetailBase/ElectricityMeter/ElectricityMeterGeneralStateHandler.swift
@@ -182,13 +182,13 @@ final class ElectricityMeterGeneralStateHandlerImpl: ElectricityMeterGeneralStat
         if (measuredValues.contains(.voltagePhaseAngle12)) {
             result.append(.init(
                 type: .voltagePhaseAngle12,
-                value: formatter.format(value.voltagePhaseAngle12(), withUnit: false, precision: SuplaElectricityMeasurementType.voltagePhaseAngle12.precision)
+                value: formatter.format(value.voltagePhaseAngle12(), withUnit: false, precision: .customPrecision(value: SuplaElectricityMeasurementType.voltagePhaseAngle12.precision))
             ))
         }
         if (measuredValues.contains(.voltagePhaseAngle13)) {
             result.append(.init(
                 type: .voltagePhaseAngle13,
-                value: formatter.format(value.voltagePhaseAngle13(), withUnit: false, precision: SuplaElectricityMeasurementType.voltagePhaseAngle13.precision)
+                value: formatter.format(value.voltagePhaseAngle13(), withUnit: false, precision: .customPrecision(value: SuplaElectricityMeasurementType.voltagePhaseAngle13.precision))
             ))
         }
         if (measuredValues.contains(.voltagePhaseSequence)) {

diff --git a/SUPLA/Features/Details/ElectricityMeterDetail/History/IntroductionView.swift b/SUPLA/Features/Details/ElectricityMeterDetail/History/IntroductionView.swift
@@ -212,7 +212,7 @@ private func mockSetsForMultiplePhases() -> ChannelChartSets {
     return ChannelChartSets(
         remoteId: 124,
         function: 123,
-        name: "Reverse active energy",
+        name: Strings.ElectricityMeter.forwardActiveEnergy,
         aggregation: .minutes,
         dataSets: [
             HistoryDataSet(
@@ -241,7 +241,7 @@ private func mockSetsForMultiplePhases() -> ChannelChartSets {
                 active: true
             )
         ],
-        typeName: "Reverse active energy"
+        typeName: Strings.ElectricityMeter.forwardActiveEnergy
     )
 }
 
@@ -251,7 +251,7 @@ private func mockSetsForSinglePhase() -> ChannelChartSets {
     return ChannelChartSets(
         remoteId: 124,
         function: 123,
-        name: "Reverse active energy",
+        name: Strings.ElectricityMeter.forwardActiveEnergy,
         aggregation: .minutes,
         dataSets: [
             HistoryDataSet(
@@ -270,7 +270,7 @@ private func mockSetsForSinglePhase() -> ChannelChartSets {
                 active: true
             )
         ],
-        typeName: "Reverse active energy"
+        typeName: Strings.ElectricityMeter.forwardActiveEnergy
     )
 }
 

diff --git a/SUPLA/Model/SuplaClient/Channel/SuplaElectricityMeasurementType.swift b/SUPLA/Model/SuplaClient/Channel/SuplaElectricityMeasurementType.swift
@@ -214,8 +214,6 @@ enum SuplaElectricityMeasurementType: Identifiable, Codable, CaseIterable, Picke
     var precision: Int {
         switch (self) {
         case .frequency,
-             .voltagePhaseAngle12,
-             .voltagePhaseAngle13,
              .voltagePhaseSequence,
              .currentPhaseSequence,
              .voltage,
@@ -229,6 +227,8 @@ enum SuplaElectricityMeasurementType: Identifiable, Codable, CaseIterable, Picke
              .reverseActiveEnergy,
              .forwardReactiveEnergy,
              .reverseReactiveEnergy: 5
+        case .voltagePhaseAngle12,
+             .voltagePhaseAngle13: 1
         default: 0
         }
     }

diff --git a/SUPLA/SAElectricityMeterExtendedValue.h b/SUPLA/SAElectricityMeterExtendedValue.h
@@ -41,8 +41,8 @@ NS_ASSUME_NONNULL_BEGIN
 - (double) totalReverseActiveEnergyBalanced;
 - (unsigned int) measuredValues;
 - (BOOL) currentIsOver65A;
-- (int) voltagePhaseAngle12;
-- (int) voltagePhaseAngle13;
+- (double) voltagePhaseAngle12;
+- (double) voltagePhaseAngle13;
 - (TElectricityMeter_ExtendedValue_V3) getStruct;
 @end
 

diff --git a/SUPLA/SAElectricityMeterExtendedValue.m b/SUPLA/SAElectricityMeterExtendedValue.m
@@ -166,12 +166,12 @@ - (BOOL) currentIsOver65A {
     && (_emev.measured_values & EM_VAR_CURRENT_OVER_65A) != 0;
 }
 
-- (int) voltagePhaseAngle12 {
-    return _emev.voltage_phase_angle_12;
+- (double) voltagePhaseAngle12 {
+    return _emev.voltage_phase_angle_12 / 10.0;
 }
 
-- (int) voltagePhaseAngle13 {
-    return _emev.voltage_phase_angle_13;
+- (double) voltagePhaseAngle13 {
+    return _emev.voltage_phase_angle_13 / 10.0;
 }
 
 - (TElectricityMeter_ExtendedValue_V3) getStruct {