TelenkovDmitry 2 yıl önce
ebeveyn
işleme
93adac1e3e
4 değiştirilmiş dosya ile 124 ekleme ve 116 silme
  1. 112 110
      .obsidian/workspace
  2. 6 2
      Artery-testing.md
  3. 2 0
      TODO.md
  4. 4 4
      Счета.md

+ 112 - 110
.obsidian/workspace

@@ -1,111 +1,113 @@
-{
-  "main": {
-    "id": "b266890f0c3ff372",
-    "type": "split",
-    "children": [
-      {
-        "id": "ba0fc598015af7da",
-        "type": "leaf",
-        "state": {
-          "type": "markdown",
-          "state": {
-            "file": "Artery-testing.md",
-            "mode": "source"
-          }
-        },
-        "group": "3befa81e41fa1abf"
-      },
-      {
-        "id": "0531de7aa171fe0f",
-        "type": "leaf",
-        "state": {
-          "type": "markdown",
-          "state": {
-            "file": "Artery-testing.md",
-            "mode": "preview"
-          }
-        },
-        "group": "3befa81e41fa1abf"
-      }
-    ],
-    "direction": "vertical"
-  },
-  "left": {
-    "id": "38e075dd31ff8adb",
-    "type": "split",
-    "children": [
-      {
-        "id": "aa544a1476f258b3",
-        "type": "tabs",
-        "children": [
-          {
-            "id": "8ba77c810766b520",
-            "type": "leaf",
-            "state": {
-              "type": "file-explorer",
-              "state": {}
-            }
-          },
-          {
-            "id": "b71a6ef4ea258338",
-            "type": "leaf",
-            "state": {
-              "type": "search",
-              "state": {
-                "query": "",
-                "matchingCase": false,
-                "explainSearch": false,
-                "collapseAll": false,
-                "extraContext": false,
-                "sortOrder": "alphabetical"
-              }
-            }
-          }
-        ]
-      }
-    ],
-    "direction": "horizontal",
-    "width": 300
-  },
-  "right": {
-    "id": "22baf11b84f2becb",
-    "type": "split",
-    "children": [
-      {
-        "id": "3ebf2f88c333ddfb",
-        "type": "tabs",
-        "children": [
-          {
-            "id": "016cd6639f5f7c6e",
-            "type": "leaf",
-            "state": {
-              "type": "backlink",
-              "state": {
-                "file": "Artery-testing.md",
-                "collapseAll": false,
-                "extraContext": false,
-                "sortOrder": "alphabetical",
-                "showSearch": false,
-                "searchQuery": "",
-                "backlinkCollapsed": false,
-                "unlinkedCollapsed": true
-              }
-            }
-          }
-        ]
-      }
-    ],
-    "direction": "horizontal",
-    "width": 300,
-    "collapsed": true
-  },
-  "active": "ba0fc598015af7da",
-  "lastOpenFiles": [
-    "Artery-testing.md",
-    "Счета.md",
-    "Grinding machine.md",
-    "Разное.md",
-    "TODO.md",
-    "img/sch04.JPG"
-  ]
+{
+  "main": {
+    "id": "b266890f0c3ff372",
+    "type": "split",
+    "children": [
+      {
+        "id": "ba0fc598015af7da",
+        "type": "leaf",
+        "state": {
+          "type": "markdown",
+          "state": {
+            "file": "Artery-testing.md",
+            "mode": "source",
+            "source": false
+          }
+        },
+        "group": "3befa81e41fa1abf"
+      },
+      {
+        "id": "0531de7aa171fe0f",
+        "type": "leaf",
+        "state": {
+          "type": "markdown",
+          "state": {
+            "file": "Artery-testing.md",
+            "mode": "preview",
+            "source": false
+          }
+        },
+        "group": "3befa81e41fa1abf"
+      }
+    ],
+    "direction": "vertical"
+  },
+  "left": {
+    "id": "38e075dd31ff8adb",
+    "type": "split",
+    "children": [
+      {
+        "id": "aa544a1476f258b3",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "8ba77c810766b520",
+            "type": "leaf",
+            "state": {
+              "type": "file-explorer",
+              "state": {}
+            }
+          },
+          {
+            "id": "b71a6ef4ea258338",
+            "type": "leaf",
+            "state": {
+              "type": "search",
+              "state": {
+                "query": "",
+                "matchingCase": false,
+                "explainSearch": false,
+                "collapseAll": false,
+                "extraContext": false,
+                "sortOrder": "alphabetical"
+              }
+            }
+          }
+        ]
+      }
+    ],
+    "direction": "horizontal",
+    "width": 300
+  },
+  "right": {
+    "id": "22baf11b84f2becb",
+    "type": "split",
+    "children": [
+      {
+        "id": "3ebf2f88c333ddfb",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "016cd6639f5f7c6e",
+            "type": "leaf",
+            "state": {
+              "type": "backlink",
+              "state": {
+                "file": "Artery-testing.md",
+                "collapseAll": false,
+                "extraContext": false,
+                "sortOrder": "alphabetical",
+                "showSearch": false,
+                "searchQuery": "",
+                "backlinkCollapsed": false,
+                "unlinkedCollapsed": true
+              }
+            }
+          }
+        ]
+      }
+    ],
+    "direction": "horizontal",
+    "width": 300,
+    "collapsed": true
+  },
+  "active": "ba0fc598015af7da",
+  "lastOpenFiles": [
+    "Счета.md",
+    "Разное.md",
+    "TODO.md",
+    "Artery-testing.md",
+    "Grinding machine.md",
+    "img/sch04.JPG"
+  ]
 }

+ 6 - 2
Artery-testing.md

@@ -60,6 +60,10 @@ SPI тактируется от шины APB через делитель /2. В
 Метролог М3 с at32:
 - UART_1 - USB (to GSM) PB_6 - Tx, PB_7 - Rx (Remap)
 - UART_2 - GMS модуль PD_5 - Tx, PD_6 - Rx (Remap)
+ 
+- UART_7 - RS485_1 PE_8 - Tx, PE_7 - Rx
 - UART_3 - RS485_2 PD_8 - Tx, PD_9 - Rx (Remap)
-- UART_4 - RS232_1 PC_10 - Tx, PC_11 - Rx
-- UART_5 - RS232_2 PC_12 - Tx, PD_2 - Rx
+- UART_4 - RS232_1 PC_10 - Tx, PC_11 - Rx 
+- UART_5 - RS232_1 PC_12 - Tx, PD_2 - Rx
+
+

+ 2 - 0
TODO.md

@@ -14,3 +14,5 @@
 - [ ] Замена масла и диагностика подвески
 - [x] Поменять лампочки на кухне
 - [ ] Починить подвеску
+- [ ] Настроить велик
+- [ ] Разобраться балкон в комнате

+ 4 - 4
Счета.md

@@ -10,10 +10,10 @@
 **Передача показаний с 15-ого числа**
 - [ ] Широкая вода
 - [ ] Широкая электричество
-- [ ] Подрезково
-- [ ] Химки
-- [ ] Планерная Нина электричество
-- [ ] Планерная Батя электричество
+- [x] Подрезково хол - 11, гор 318, эл - 22287
+- [x] Химки 583 - 189, 473 - 519, 450 - 121, 402 - 139, 10868
+- [x] Планерная Нина электричество 8089
+- [x] Планерная Батя электричество 3555
 
 **Дополнительно**
 - [x] Отдать Нине (27292 - 6118 - 636 = 20538)