TelenkovDmitry 2 роки тому
батько
коміт
fb4b5e8252
5 змінених файлів з 150 додано та 113 видалено
  1. 110 110
      .obsidian/workspace
  2. 38 1
      Artery-testing.md
  3. 1 1
      TODO.md
  4. BIN
      img/spi_flash_mx25L1606.PNG
  5. 1 1
      Счета.md

+ 110 - 110
.obsidian/workspace

@@ -1,111 +1,111 @@
-{
-  "main": {
-    "id": "b266890f0c3ff372",
-    "type": "split",
-    "children": [
-      {
-        "id": "ba0fc598015af7da",
-        "type": "leaf",
-        "state": {
-          "type": "markdown",
-          "state": {
-            "file": "Grinding machine.md",
-            "mode": "source"
-          }
-        },
-        "group": "3befa81e41fa1abf"
-      },
-      {
-        "id": "0531de7aa171fe0f",
-        "type": "leaf",
-        "state": {
-          "type": "markdown",
-          "state": {
-            "file": "Grinding machine.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": 181
-  },
-  "right": {
-    "id": "22baf11b84f2becb",
-    "type": "split",
-    "children": [
-      {
-        "id": "3ebf2f88c333ddfb",
-        "type": "tabs",
-        "children": [
-          {
-            "id": "016cd6639f5f7c6e",
-            "type": "leaf",
-            "state": {
-              "type": "backlink",
-              "state": {
-                "file": "Grinding machine.md",
-                "collapseAll": false,
-                "extraContext": false,
-                "sortOrder": "alphabetical",
-                "showSearch": false,
-                "searchQuery": "",
-                "backlinkCollapsed": false,
-                "unlinkedCollapsed": true
-              }
-            }
-          }
-        ]
-      }
-    ],
-    "direction": "horizontal",
-    "width": 300,
-    "collapsed": true
-  },
-  "active": "ba0fc598015af7da",
-  "lastOpenFiles": [
-    "Grinding machine.md",
-    "Artery-testing.md",
-    "Счета.md",
-    "TODO.md",
-    "Разное.md",
-    "img/sch04.JPG"
-  ]
+{
+  "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"
+  ]
 }

+ 38 - 1
Artery-testing.md

@@ -1,4 +1,17 @@
 #### Artery
+###### Тестирование модулей
+- [x] Ethernet
+- [x] DEBUG UART
+- [x] SPI FLASH
+- [ ] Сдвиговые регистры (LED)
+- [ ] Сдвиговые регистры (UART)
+- [ ] Artery flash
+- [x] LED
+	- [x] LED "Сервер" (green + red)
+	- [x] LED "Состояние" (green + red)
+	- [x] LEDs "Уровень сигнала"
+	 
+
 ![[ARM_JTAG_SWD_Header.png]]
 ###### Ethernet
 PC_1 - DC (+)
@@ -25,4 +38,28 @@ PE_13 - EnRST
 SPI_nCS - PA_15
 SPI_SCK - PB_3
 SPI_MISO - PB_4
-SPI_MOSI - PB_5
+SPI_MOSI - PB_5
+
+SPI_3 - default multi-function
+SPI тактируется от шины APB через делитель /2. В нашем случае частота тактирования SPI - 100МГц.
+![[spi_flash_mx25L1606.PNG]]
+
+###### LEDs
+Метролог (stm32):
+- LED Green GPIOE_0
+- LED Red GPIOE_1
+
+###### UART
+Метролог М3 с stm32:
+- UART_1 - Debug PB_6 - Tx, PB_7 - Rx
+- UART_2 - GMS модуль PD_5 - Tx, PD_6 - Rx
+- UART_3 - RS485_2 PD_8 - Tx, PD_9 - Rx
+- UART_4 - RS232_1 PC_10 - Tx, PC_11 - Rx
+- UART_5 - RS232_2 PC_12 - Tx, PD_2 - Rx
+ 
+Метролог М3 с at32:
+- UART_1 - Debug port + RS485_1 PA_9 - Tx, PA_10 - Rx
+- UART_2 - GMS модуль PD_5 - Tx, PD_6 - Rx (Remap)
+- 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

+ 1 - 1
TODO.md

@@ -12,5 +12,5 @@
 - [x] Борьба с плесенью
 - [ ] Отнести документы на счетчик в Подрезково 
 - [ ] Замена масла и диагностика подвески
-- [ ] Поменять лампочки на кухне
+- [x] Поменять лампочки на кухне
 - [ ] Починить подвеску

BIN
img/spi_flash_mx25L1606.PNG


+ 1 - 1
Счета.md

@@ -16,7 +16,7 @@
 - [ ] Планерная Батя электричество
 
 **Дополнительно**
-- [ ] Отдать Нине (27292 - 6118 - 636 = 20538)
+- [x] Отдать Нине (27292 - 6118 - 636 = 20538)
 - [x] Домашний интернет (550)
 - [x] Сотовый телефон (650)
 - [x] Детский сад