merge

.obsidian/workspace.json

@@ -1,155 +1,155 @@
-{
-  "main": {
-    "id": "b266890f0c3ff372",
-    "type": "split",
-    "children": [
-      {
-        "id": "541885ca85d4e849",
-        "type": "tabs",
-        "dimension": 54.82594936708861,
-        "children": [
-          {
-            "id": "6e5d35e0fcb51699",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "BT7000/BT-7000 Artery.md",
-                "mode": "source",
-                "source": false
-              }
-            },
-            "group": "26d62c567202b9b3"
-          }
-        ]
-      },
-      {
-        "id": "07ab8bc742a342a5",
-        "type": "tabs",
-        "dimension": 45.174050632911396,
-        "children": [
-          {
-            "id": "edbe53b376d24f06",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "BT7000/BT-7000 Artery.md",
-                "mode": "preview",
-                "source": false
-              }
-            },
-            "group": "26d62c567202b9b3"
-          }
-        ]
-      }
-    ],
-    "direction": "vertical"
-  },
-  "left": {
-    "id": "38e075dd31ff8adb",
-    "type": "split",
-    "children": [
-      {
-        "id": "aa544a1476f258b3",
-        "type": "tabs",
-        "children": [
-          {
-            "id": "8ba77c810766b520",
-            "type": "leaf",
-            "state": {
-              "type": "file-explorer",
-              "state": {
-                "sortOrder": "alphabetical"
-              }
-            }
-          },
-          {
-            "id": "b71a6ef4ea258338",
-            "type": "leaf",
-            "state": {
-              "type": "search",
-              "state": {
-                "query": "",
-                "matchingCase": false,
-                "explainSearch": false,
-                "collapseAll": false,
-                "extraContext": false,
-                "sortOrder": "alphabetical"
-              }
-            }
-          },
-          {
-            "id": "2e34ed2e5d722aca",
-            "type": "leaf",
-            "state": {
-              "type": "bookmarks",
-              "state": {}
-            }
-          }
-        ]
-      }
-    ],
-    "direction": "horizontal",
-    "width": 200
-  },
-  "right": {
-    "id": "22baf11b84f2becb",
-    "type": "split",
-    "children": [
-      {
-        "id": "3ebf2f88c333ddfb",
-        "type": "tabs",
-        "children": [
-          {
-            "id": "016cd6639f5f7c6e",
-            "type": "leaf",
-            "state": {
-              "type": "backlink",
-              "state": {
-                "file": "BT7000/BT-7000 Artery.md",
-                "collapseAll": false,
-                "extraContext": false,
-                "sortOrder": "alphabetical",
-                "showSearch": false,
-                "searchQuery": "",
-                "backlinkCollapsed": false,
-                "unlinkedCollapsed": true
-              }
-            }
-          }
-        ]
-      }
-    ],
-    "direction": "horizontal",
-    "width": 300,
-    "collapsed": true
-  },
-  "left-ribbon": {
-    "hiddenItems": {
-      "switcher:Меню быстрого перехода": false,
-      "graph:Граф": false,
-      "canvas:Создать новый холст": false,
-      "command-palette:Открыть палитру команд": false,
-      "markdown-importer:Импорт Markdown-файлов": false
-    }
-  },
-  "active": "edbe53b376d24f06",
-  "lastOpenFiles": [
-    "Счета.md",
-    "BT7000/BT-7000 Artery.md",
-    "metrolog/M3 artery + stm32.md",
-    "metrolog/Текучка Метролог.md",
-    "Разное.md",
-    "metrolog/readme.md",
-    "Artery testing.md",
-    "TODO.md",
-    "proGit.md",
-    "BT7000",
-    "metrolog/IRQ + FreeRTOS.md",
-    "Greenstar/FPGA Blaster.md",
-    "FlyElectronics/LED Controller.md",
-    "FlyElectronics/Grinding machine.md",
-    "img/sch04.JPG"
-  ]
+{
+  "main": {
+    "id": "b266890f0c3ff372",
+    "type": "split",
+    "children": [
+      {
+        "id": "541885ca85d4e849",
+        "type": "tabs",
+        "dimension": 54.82594936708861,
+        "children": [
+          {
+            "id": "6e5d35e0fcb51699",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "BT7000/BT-7000 Artery.md",
+                "mode": "source",
+                "source": false
+              }
+            },
+            "group": "26d62c567202b9b3"
+          }
+        ]
+      },
+      {
+        "id": "07ab8bc742a342a5",
+        "type": "tabs",
+        "dimension": 45.174050632911396,
+        "children": [
+          {
+            "id": "edbe53b376d24f06",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "BT7000/BT-7000 Artery.md",
+                "mode": "preview",
+                "source": false
+              }
+            },
+            "group": "26d62c567202b9b3"
+          }
+        ]
+      }
+    ],
+    "direction": "vertical"
+  },
+  "left": {
+    "id": "38e075dd31ff8adb",
+    "type": "split",
+    "children": [
+      {
+        "id": "aa544a1476f258b3",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "8ba77c810766b520",
+            "type": "leaf",
+            "state": {
+              "type": "file-explorer",
+              "state": {
+                "sortOrder": "alphabetical"
+              }
+            }
+          },
+          {
+            "id": "b71a6ef4ea258338",
+            "type": "leaf",
+            "state": {
+              "type": "search",
+              "state": {
+                "query": "",
+                "matchingCase": false,
+                "explainSearch": false,
+                "collapseAll": false,
+                "extraContext": false,
+                "sortOrder": "alphabetical"
+              }
+            }
+          },
+          {
+            "id": "2e34ed2e5d722aca",
+            "type": "leaf",
+            "state": {
+              "type": "bookmarks",
+              "state": {}
+            }
+          }
+        ]
+      }
+    ],
+    "direction": "horizontal",
+    "width": 200
+  },
+  "right": {
+    "id": "22baf11b84f2becb",
+    "type": "split",
+    "children": [
+      {
+        "id": "3ebf2f88c333ddfb",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "016cd6639f5f7c6e",
+            "type": "leaf",
+            "state": {
+              "type": "backlink",
+              "state": {
+                "file": "BT7000/BT-7000 Artery.md",
+                "collapseAll": false,
+                "extraContext": false,
+                "sortOrder": "alphabetical",
+                "showSearch": false,
+                "searchQuery": "",
+                "backlinkCollapsed": false,
+                "unlinkedCollapsed": true
+              }
+            }
+          }
+        ]
+      }
+    ],
+    "direction": "horizontal",
+    "width": 300,
+    "collapsed": true
+  },
+  "left-ribbon": {
+    "hiddenItems": {
+      "switcher:Меню быстрого перехода": false,
+      "graph:Граф": false,
+      "canvas:Создать новый холст": false,
+      "command-palette:Открыть палитру команд": false,
+      "markdown-importer:Импорт Markdown-файлов": false
+    }
+  },
+  "active": "edbe53b376d24f06",
+  "lastOpenFiles": [
+    "Счета.md",
+    "BT7000/BT-7000 Artery.md",
+    "metrolog/M3 artery + stm32.md",
+    "metrolog/Текучка Метролог.md",
+    "Разное.md",
+    "metrolog/readme.md",
+    "Artery testing.md",
+    "TODO.md",
+    "proGit.md",
+    "BT7000",
+    "metrolog/IRQ + FreeRTOS.md",
+    "Greenstar/FPGA Blaster.md",
+    "FlyElectronics/LED Controller.md",
+    "FlyElectronics/Grinding machine.md",
+    "img/sch04.JPG"
+  ]
 }

Счета.md

@@ -7,12 +7,12 @@
 - [x] Нина электричество на планерной (390)
 
 ##### <font color = "#1D8571">Передача показаний с 15-ого числа</font>
-- [ ] Широкая вода. Хол , гор 
-- [ ] Широкая электричество. 
-- [ ] Подрезково хол. , гор , эл 
-- [ ] Химки 583 - , 473 - , 450 - , 402 - , элх - , элп -  
-- [ ] Планерная Нина электричество ()
-- [ ] Планерная Батя электричество 
+- [x] Широкая вода. Хол 667 , гор 512 
+- [x] Широкая электричество. 6822, 7507, 9488
+- [x] Подрезково: хол - 82, гор - 397, эл - 23919
+- [x] Химки: 583 - 228, 473 - 621, 450 - 145, 402 - 185, эл - 12632
+- [x] Планерная Нина электричество: 10364 
+- [x] Планерная Батя электричество: 4488
 
 ##### <font color = "#1D8571">Дополнительно</font>
 - [x] Отдать Нине (27771 - 7038 - 390 = 20343)