FEAT: Show tool temperature in printer overview

OctoPhone/Generated/Localizable.Generated.swift

@@ -307,6 +307,12 @@ enum L10n {
   case targetTemperature
   /// Terminal
   case terminal
+  /// Tool temperature
+  case toolTemperature
+  /// Tool temperature offset
+  case toolTemperatureOffset
+  /// Tool temperature target
+  case toolTemperatureTarget
   /// Unknown
   case unknown
   /// Uknown file
@@ -641,6 +647,12 @@ extension L10n: CustomStringConvertible {
         return L10n.tr(key: "Target temperature")
       case .terminal:
         return L10n.tr(key: "Terminal")
+      case .toolTemperature:
+        return L10n.tr(key: "Tool temperature")
+      case .toolTemperatureOffset:
+        return L10n.tr(key: "Tool temperature offset")
+      case .toolTemperatureTarget:
+        return L10n.tr(key: "Tool temperature target")
       case .unknown:
         return L10n.tr(key: "Unknown")
       case .unknownFile:

OctoPhone/Networking/OctoPrintAPI.swift

@@ -37,6 +37,7 @@ typealias OctoPrintProvider = DynamicProvider<OctoPrintAPI>
 /// - jogPrintHead - Jogs print head in given direction on given axis
 /// - homePrintHead - Moves print head to home position on given axes
 /// - extrudeFilamen - Extrudes fixed amount of filament
+/// - currentToolState - Read current state of all printer tools
 /// - currentBedState - Reads current bed state
 /// - setBedTemperature - Sets given amount to given temperature type
 /// - currentJob - Reads info about current job
@@ -77,6 +78,7 @@ enum OctoPrintAPI {
     case homePrintHead(Set<JogAxis>)
     // Print tool controls
     case extrudeFilament
+    case currentToolState
     // Bed
     case currentBedState
     case setBedTemperature(amout: Double, BedTemperatureType)
@@ -200,6 +202,9 @@ extension OctoPrintAPI: TargetPart {
         case .extrudeFilament:
             return ("api/printer/tool", .post, .request, ["command": "extrude", "amount": 5])
 
+        case .currentToolState:
+            return ("api/printer/tool", .get, .request, nil)
+
         // Bed
         case .currentBedState:
             return ("api/printer/bed", .get, .request, nil)

OctoPhone/View Related/Detail/DetailViewController.swift

@@ -155,7 +155,7 @@ class DetailViewController: BaseCollectionViewController {
 // MARK: - UICollectionViewDataSource
 extension DetailViewController {
     override func numberOfSections(in collectionView: UICollectionView) -> Int {
-        return viewModel.outputs.contentIsAvailable.value ? 3 : 0
+        return viewModel.outputs.contentIsAvailable.value ? 4 : 0
     }
 
     override func collectionView(_ collectionView: UICollectionView,
@@ -164,6 +164,7 @@ extension DetailViewController {
         return section == 0 ? 2 : 3
     }
 
+    // swiftlint:disable cyclomatic_complexity
     override func collectionView(_ collectionView: UICollectionView,
                                  cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
 
@@ -209,6 +210,18 @@ extension DetailViewController {
         case (2, 2):
             return dequeueInfoCell(for: indexPath, collectionView: collectionView,
                                    title: tr(.bedTemperatureOffset), detail: outputs.bedTemperatureOffset.value)
+        // Actual bed temperature
+        case (3, 0):
+            return dequeueInfoCell(for: indexPath, collectionView: collectionView,
+                                   title: tr(.toolTemperature), detail: outputs.toolTemperature.value)
+        // Target bed temperature
+        case (3, 1):
+            return dequeueInfoCell(for: indexPath, collectionView: collectionView,
+                                   title: tr(.toolTemperatureTarget), detail: outputs.toolTemperaturTarget.value)
+        // Offset bed temperature
+        case (3, 2):
+            return dequeueInfoCell(for: indexPath, collectionView: collectionView,
+                                   title: tr(.toolTemperatureOffset), detail: outputs.toolTemperatureOffset.value)
         default:
             fatalError("Unexpected IndexPath requested.")
         }

OctoPhone/View Related/Detail/DetailViewModel.swift

@@ -69,6 +69,15 @@ protocol DetailViewModelOutputs {
     /// Printer bed offset temperature
     var bedTemperatureOffset: Property<String> { get }
 
+    /// Current temperature of printer tool
+    var toolTemperature: Property<String> { get }
+
+    /// Target temperature of printer tool
+    var toolTemperaturTarget: Property<String> { get }
+
+    /// Printer tool offset temperature
+    var toolTemperatureOffset: Property<String> { get }
+
     /// Indicates whether the current job is cancellable
     var jobCancellable: Property<Bool> { get }
 
@@ -124,6 +133,12 @@ final class DetailViewModel: DetailViewModelType, DetailViewModelInputs, DetailV
 
     let bedTemperatureOffset: Property<String>
 
+    let toolTemperature: Property<String>
+
+    let toolTemperaturTarget: Property<String>
+
+    let toolTemperatureOffset: Property<String>
+
     let jobCancellable: Property<Bool>
 
     let dataChanged: SignalProducer<(), NoError>
@@ -147,6 +162,8 @@ final class DetailViewModel: DetailViewModelType, DetailViewModelInputs, DetailV
     /// Current state value
     private let stateProperty = MutableProperty<PrinterState?>(nil)
 
+    private let toolProperty = MutableProperty<Tool?>(nil)
+
     /// Last error occured
     private let displayErrorProperty = MutableProperty<DisplayableError?>(nil)
 
@@ -183,6 +200,7 @@ final class DetailViewModel: DetailViewModelType, DetailViewModelInputs, DetailV
         let jobProducer = jobProperty.producer.skipNil()
         let bedProducer = bedProperty.producer.skipNil()
         let printerProducer = printerProperty.producer.skipNil()
+        let toolProducer = toolProperty.producer.skipNil()
         let imageProducer = imageProperty.producer.skipNil()
 
         self.displayError = displayErrorProperty.producer.skipNil()
@@ -202,6 +220,12 @@ final class DetailViewModel: DetailViewModelType, DetailViewModelInputs, DetailV
                                             then: bedProducer.map({ $0.targetTemperature }).formatTemperature())
         self.bedTemperatureOffset = Property(initial: tr(.unknown),
                                              then: bedProducer.map({ $0.offsetTemperature }).formatTemperature())
+        self.toolTemperature = Property(initial: tr(.unknown),
+                                        then: toolProducer.map({ $0.actualTemperature }).formatTemperature())
+        self.toolTemperaturTarget = Property(initial: tr(.unknown),
+                                             then: toolProducer.map({ $0.targetTemperature }).formatTemperature())
+        self.toolTemperatureOffset = Property(initial: tr(.unknown),
+                                             then: toolProducer.map({ $0.offsetTemperature }).formatTemperature())
         self.jobPreview = Property(initial: FontAwesomeIcon.lightBulbIcon.image(ofSize: CGSize(width: 60, height: 60),
                                                                                 color: Colors.Pallete.greyHue3),
                                    then: imageProducer)
@@ -284,13 +308,18 @@ final class DetailViewModel: DetailViewModelType, DetailViewModelInputs, DetailV
             .filterSuccessfulStatusCodes()
             .mapJSON()
             .mapTo(object: PrinterState.self)
-            .flatMap(FlattenStrategy.latest) { state -> SignalProducer<Any, MoyaError> in
+            .flatMap(.latest) { state -> SignalProducer<Any, MoyaError> in
                 self.stateProperty.value = state
                 return self.provider.request(.currentJob).filterSuccessfulStatusCodes().mapJSON()
             }
             .mapTo(object: Job.self)
-            .flatMap(FlattenStrategy.latest) { job -> SignalProducer<Any, MoyaError> in
+            .flatMap(.latest) { job -> SignalProducer<Any, MoyaError> in
                 self.jobProperty.value = job
+                return self.provider.request(.currentToolState).filterSuccessfulStatusCodes().mapJSON()
+            }
+            .mapDictionary(collectionOf: Tool.self)
+            .flatMap(.latest) { tools -> SignalProducer<Any, MoyaError> in
+                self.toolProperty.value = tools.first
                 return self.provider.request(.currentBedState).filterSuccessfulStatusCodes().mapJSON()
             }
             .mapTo(object: Bed.self, forKeyPath: "bed")

en.lproj/Localizable.strings

@@ -55,6 +55,9 @@
 "Bed temperature" = "Bed temperature";
 "Bed temperature target" = "Bed temperature target";
 "Bed temperature offset" = "Bed temperature offset";
+"Tool temperature" = "Tool temperature";
+"Tool temperature offset" = "Tool temperature offset";
+"Tool temperature target" = "Tool temperature target";
 "Printer is currently not in operational state" = "Printer is currently not in operational state. If you want to connect printer, click the button below.";
 "Connect printer" = "Connect.";
 "Could not load printer stream" = "Could not load printer stream.";