merge

.obsidian/workspace.json

@@ -1,167 +1,200 @@
-{
-  "main": {
-    "id": "b266890f0c3ff372",
-    "type": "split",
-    "children": [
-      {
-        "id": "f93c9a0110378277",
-        "type": "tabs",
-        "children": [
-          {
-            "id": "f99baed2b9d542bf",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "universal IO/universal IO.md",
-                "mode": "source",
-                "source": false
-              }
-            }
-          }
-        ]
-      }
-    ],
-    "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": "0a44d6178b5d79a8",
-            "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": "universal IO/universal IO.md",
-                "collapseAll": false,
-                "extraContext": false,
-                "sortOrder": "alphabetical",
-                "showSearch": false,
-                "searchQuery": "",
-                "backlinkCollapsed": false,
-                "unlinkedCollapsed": true
-              }
-            }
-          },
-          {
-            "id": "a1fda84e12066836",
-            "type": "leaf",
-            "state": {
-              "type": "all-properties",
-              "state": {
-                "sortOrder": "frequency",
-                "showSearch": false,
-                "searchQuery": ""
-              }
-            }
-          }
-        ]
-      }
-    ],
-    "direction": "horizontal",
-    "width": 300,
-    "collapsed": true
-  },
-  "left-ribbon": {
-    "hiddenItems": {
-      "switcher:Меню быстрого перехода": false,
-      "graph:Граф": false,
-      "canvas:Создать новый холст": false,
-      "command-palette:Открыть палитру команд": false,
-      "markdown-importer:Импорт Markdown-файлов": false
-    }
-  },
-  "active": "f99baed2b9d542bf",
-  "lastOpenFiles": [
-    "linux/linux common.md",
-    "Счета.md",
-    "TODO.md",
-    "Тренировки и занятия.md",
-    "universal IO/universal IO.md",
-    "Кодинг.md",
-    "universal IO/Test HV.md",
-    "FlyElectronics/Grinding machine.md",
-    "2024-02-22.md",
-    "2024-02-25.md",
-    "Golang/common.md",
-    "Разное.md",
-    "Golang",
-    "bt67xx/common.md",
-    "BT7000/BT-7000 Artery.md",
-    "Список литературы.md",
-    "proGit.md",
-    "metrolog/M3 artery + stm32.md",
-    "metrolog/readme.md",
-    "metrolog/Текучка Метролог.md",
-    "linux/GS server.md",
-    "git_rsa.pub",
-    "git_rsa",
-    "RT-701/common.md",
-    "RT-701",
-    "Python/common.md",
-    "Artery testing.md",
-    "Database.kdbx.qglrkI",
-    "ROTEK",
-    "Python",
-    "docs/MEGA 通讯协议.pdf",
-    "linux/Arbiter.md",
-    "docs/Galleon II Galleon III 3 phase V02.pdf",
-    "bt67xx/Документы.md",
-    "docs/Galleon II-33-10K-60K-Rack_DS.PDF",
-    "2024-01-18.md",
-    "img/sch04.JPG"
-  ]
+{
+  "main": {
+    "id": "b266890f0c3ff372",
+    "type": "split",
+    "children": [
+      {
+        "id": "f93c9a0110378277",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "f99baed2b9d542bf",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "Greenstar/stm32l476VG-usb спектрометр.md",
+                "mode": "source",
+                "source": false
+              }
+            }
+          },
+          {
+            "id": "c9b420abfc278524",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "Тренировки и занятия.md",
+                "mode": "source",
+                "source": false
+              }
+            },
+            "group": "1de3011f8e1ee331"
+          }
+        ],
+        "currentTab": 1
+      },
+      {
+        "id": "feb3ea3a369c6c51",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "f38b196c1fe317e6",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "Тренировки и занятия.md",
+                "mode": "preview",
+                "source": false
+              }
+            },
+            "group": "1de3011f8e1ee331"
+          }
+        ]
+      }
+    ],
+    "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": "0a44d6178b5d79a8",
+            "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": "Тренировки и занятия.md",
+                "collapseAll": false,
+                "extraContext": false,
+                "sortOrder": "alphabetical",
+                "showSearch": false,
+                "searchQuery": "",
+                "backlinkCollapsed": false,
+                "unlinkedCollapsed": true
+              }
+            }
+          },
+          {
+            "id": "a1fda84e12066836",
+            "type": "leaf",
+            "state": {
+              "type": "all-properties",
+              "state": {
+                "sortOrder": "frequency",
+                "showSearch": false,
+                "searchQuery": ""
+              }
+            }
+          }
+        ]
+      }
+    ],
+    "direction": "horizontal",
+    "width": 300,
+    "collapsed": true
+  },
+  "left-ribbon": {
+    "hiddenItems": {
+      "switcher:Open quick switcher": false,
+      "graph:Open graph view": false,
+      "canvas:Create new canvas": false,
+      "command-palette:Open command palette": false,
+      "markdown-importer:Open format converter": false
+    }
+  },
+  "active": "f38b196c1fe317e6",
+  "lastOpenFiles": [
+    "universal IO/Test HV.md",
+    "universal IO/universal IO.md",
+    "TODO.md",
+    "Счета.md",
+    "common.md",
+    "Greenstar/stm32l476VG-usb спектрометр.md",
+    "linux/linux common.md",
+    "Тренировки и занятия.md",
+    "Кодинг.md",
+    "FlyElectronics/Grinding machine.md",
+    "2024-02-22.md",
+    "2024-02-25.md",
+    "Golang/common.md",
+    "Разное.md",
+    "Golang",
+    "bt67xx/common.md",
+    "BT7000/BT-7000 Artery.md",
+    "Список литературы.md",
+    "proGit.md",
+    "metrolog/M3 artery + stm32.md",
+    "metrolog/readme.md",
+    "metrolog/Текучка Метролог.md",
+    "linux/GS server.md",
+    "git_rsa.pub",
+    "git_rsa",
+    "RT-701/common.md",
+    "RT-701",
+    "Python/common.md",
+    "Artery testing.md",
+    "Database.kdbx.qglrkI",
+    "ROTEK",
+    "Python",
+    "docs/MEGA 通讯协议.pdf",
+    "linux/Arbiter.md",
+    "docs/Galleon II Galleon III 3 phase V02.pdf",
+    "docs/Galleon II-33-10K-60K-Rack_DS.PDF",
+    "img/sch04.JPG"
+  ]
 }

TODO.md

@@ -9,7 +9,7 @@
 - [x] Подкрутить пластины
 - [x] Записаться к ортодонту
 - [ ] Визит к ортодонту 17 апреля среда 12-20
-- [ ] Оплата счетов
+- [x] Оплата счетов
 
 #### <font color = "MediumSeaGreen">Планы по месяцам:</font>
 **Февраль 2024**
@@ -57,5 +57,5 @@
 - [x] 29.03.24
 - [x] 10.03.24
 - [x] 20.03.24
-- [ ] 30.03.24
+- [x] 30.03.24
 - [ ] 09.04.24

common.md

@@ -0,0 +1,4 @@
+Таймеры:
+TIM14 - статистика freertos
+TIM5 - для коротких задержек
+TIM6 - uptime

universal IO/Test HV.md

@@ -65,4 +65,16 @@
 8. Вычитка архива и журнала по modbus. [3 - 5 дней]
 9. Предварительное тестирование (делаю по мере появление функционала).
 10. Стыковка с драйвером (работа с Пашей).
-11. Рефакторинг.
+11. Рефакторинг.
+<h6>Модуль аналоговых входов/выходов</h6>
+- [x] LED - индикация
+- [x] modbus rx/tx
+- [x] modbus адресация (4 пина)
+- [x] кнопки
+- [x] ревизия
+- [x] USB
+- [x] WDT внешний таймер
+- [x] SPI memory
+- [x] USART debug
+<h6>ADC DAC</h6>
+ADC - https://www.compel.ru/lib/200368

Счета.md

@@ -15,7 +15,7 @@
 - [ ] Планерная Нина электричество: 
 - [ ] Планерная Батя электричество:  
 ##### <font color = "#1D8571">Дополнительно</font>
-- [ ] Отдать Нине (отдать 28007 - 12671)
+- [x] Отдать Нине (отдать 28007 - 12671)
 - [ ] Домашний интернет
 - [x] Сотовый телефон (700)
 #### <font color = "MediumSeaGreen">Март</font>

Тренировки и занятия.md

@@ -9,7 +9,18 @@ renderHabitCalendar(this.container, dv, {
     date: '2024-04-02',
     content: '🏊‍♀️\r🇬🇧💲10000', 
   }, 
-  
+  {
+    date: '2024-04-03',
+    content: '💪\r🦵', 
+  },
+  {
+    date: '2024-04-04',
+    content: '🇬🇧', 
+  },
+  {
+    date: '2024-04-05',
+    content: '💪\r🦵\r🏊‍♀️', 
+  },
   ]
 })
 ```