work

.obsidian/workspace.json

@@ -1,232 +1,245 @@
-{
-  "main": {
-    "id": "702c86104f0a0629",
-    "type": "split",
-    "children": [
-      {
-        "id": "d32e90214846329f",
-        "type": "tabs",
-        "children": [
-          {
-            "id": "9fcc05866a0efe94",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "ROTEK/allwinner 069 070.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "allwinner 069 070"
-            }
-          },
-          {
-            "id": "aac30ac1aa814964",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "English/Homework/Homework 7.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "Homework 7"
-            }
-          },
-          {
-            "id": "f2567d12b68b0d39",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "English/words.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "words"
-            }
-          }
-        ],
-        "currentTab": 1
-      }
-    ],
-    "direction": "vertical"
-  },
-  "left": {
-    "id": "6664e9908eeea5a2",
-    "type": "split",
-    "children": [
-      {
-        "id": "97095e32830cbc6f",
-        "type": "tabs",
-        "children": [
-          {
-            "id": "c7584343712d3d31",
-            "type": "leaf",
-            "state": {
-              "type": "file-explorer",
-              "state": {
-                "sortOrder": "alphabetical",
-                "autoReveal": false
-              },
-              "icon": "lucide-folder-closed",
-              "title": "Файловый менеджер"
-            }
-          },
-          {
-            "id": "e389aabe146b0498",
-            "type": "leaf",
-            "state": {
-              "type": "search",
-              "state": {
-                "query": "",
-                "matchingCase": false,
-                "explainSearch": false,
-                "collapseAll": false,
-                "extraContext": false,
-                "sortOrder": "alphabetical"
-              },
-              "icon": "lucide-search",
-              "title": "Search"
-            }
-          },
-          {
-            "id": "5f649a68cfee8d78",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "Python/SQLite.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "SQLite"
-            }
-          },
-          {
-            "id": "9cc940b45c7a4595",
-            "type": "leaf",
-            "state": {
-              "type": "bookmarks",
-              "state": {},
-              "icon": "lucide-bookmark",
-              "title": "Bookmarks"
-            }
-          }
-        ]
-      }
-    ],
-    "direction": "horizontal",
-    "width": 200
-  },
-  "right": {
-    "id": "cf92ccf43e96a53d",
-    "type": "split",
-    "children": [
-      {
-        "id": "4e6c94e5301f3341",
-        "type": "tabs",
-        "children": [
-          {
-            "id": "86c23330f2a84cf8",
-            "type": "leaf",
-            "state": {
-              "type": "backlink",
-              "state": {
-                "file": "English/Homework/Homework 5.md",
-                "collapseAll": false,
-                "extraContext": false,
-                "sortOrder": "alphabetical",
-                "showSearch": false,
-                "searchQuery": "",
-                "backlinkCollapsed": false,
-                "unlinkedCollapsed": true
-              },
-              "icon": "links-coming-in",
-              "title": "Backlinks for Homework 5"
-            }
-          },
-          {
-            "id": "06e27be0fe382bd8",
-            "type": "leaf",
-            "state": {
-              "type": "all-properties",
-              "state": {
-                "sortOrder": "frequency",
-                "showSearch": false,
-                "searchQuery": ""
-              },
-              "icon": "lucide-archive",
-              "title": "All properties"
-            }
-          }
-        ]
-      }
-    ],
-    "direction": "horizontal",
-    "width": 300,
-    "collapsed": true
-  },
-  "left-ribbon": {
-    "hiddenItems": {
-      "switcher:Меню быстрого перехода": false,
-      "graph:Граф": false,
-      "canvas:Создать новый холст": false,
-      "command-palette:Открыть палитру команд": false,
-      "markdown-importer:Импорт Markdown-файлов": false
-    }
-  },
-  "active": "aac30ac1aa814964",
-  "lastOpenFiles": [
-    "English/words.md",
-    "English/Homework/Homework 7.md",
-    "ROTEK/allwinner 069 070.md",
-    "common.md",
-    "ROTEK/bt67xx/common.md",
-    "STM32/Makefile template.md",
-    "todo/Разное.md",
-    "Python/venv.md",
-    "linux/server.md",
-    "todo/Задачи по направлениям.md",
-    "STM32/Makefile_template.txt",
-    "ROTEK/Arbiter, artery.md",
-    "ROTEK/Arbiter.md",
-    "linux/linux common.md",
-    "English/img/29-10.jpg.~tmp",
-    "English/img/29-9.jpg.~tmp",
-    "English/img/29-8.jpg.~tmp",
-    "English/img/29-7.jpg.~tmp",
-    "English/img/29-6.jpg.~tmp",
-    "English/img/29-5.jpg.~tmp",
-    "English/img/29-4.jpg.~tmp",
-    "English/img/29-3.jpg.~tmp",
-    "English/img/29-10.jpg",
-    "English/img/29-9.jpg",
-    "English/img/29-8.jpg",
-    "English/img/29-7.jpg",
-    "English/img/29-6.jpg",
-    "English/img/29-5.jpg",
-    "English/img/29-4.jpg",
-    "English/img/29-3.jpg",
-    "English/img/29-2.jpg",
-    "English/img/29-1.jpg",
-    "todo/Счета.md",
-    "todo/Тренировки и занятия.md",
-    "English/Homework/Homework 6.md",
-    "hardcore web development/11. SQL/Создание таблиц.md",
-    "English/Homework/Homework 5.md",
-    "ROTEK/Artery testing.md",
-    "Untitled.md",
-    "hardcore web development/11. SQL/JOIN/LEFT и RIGHT OUTER JOIN.md",
-    "Python/Архитектура.md",
-    "linux/Сценарий. Полная настройка Windows, WSL и инструментов для разработчика.md",
-    "hardcore web development/11. SQL/JOIN/INNER JOIN.md",
-    "Комментарии.md",
-    "hardcore web development/11. SQL/Дата и время.md",
-    "English/img/24-2.jpg.~tmp"
-  ]
+{
+  "main": {
+    "id": "702c86104f0a0629",
+    "type": "split",
+    "children": [
+      {
+        "id": "d32e90214846329f",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "8e042e91d76d4fa9",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "English/Homework/Homework 8.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "Homework 8"
+            }
+          },
+          {
+            "id": "0df03167c0b318ca",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "ROTEK/allwinner 069 070.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "allwinner 069 070"
+            }
+          },
+          {
+            "id": "abff0a476b66d7ad",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "ROTEK/metrolog/readme.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "readme"
+            }
+          },
+          {
+            "id": "f2567d12b68b0d39",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "English/words.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "words"
+            }
+          }
+        ]
+      }
+    ],
+    "direction": "vertical"
+  },
+  "left": {
+    "id": "6664e9908eeea5a2",
+    "type": "split",
+    "children": [
+      {
+        "id": "97095e32830cbc6f",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "c7584343712d3d31",
+            "type": "leaf",
+            "state": {
+              "type": "file-explorer",
+              "state": {
+                "sortOrder": "alphabetical",
+                "autoReveal": false
+              },
+              "icon": "lucide-folder-closed",
+              "title": "Files"
+            }
+          },
+          {
+            "id": "e389aabe146b0498",
+            "type": "leaf",
+            "state": {
+              "type": "search",
+              "state": {
+                "query": "",
+                "matchingCase": false,
+                "explainSearch": false,
+                "collapseAll": false,
+                "extraContext": false,
+                "sortOrder": "alphabetical"
+              },
+              "icon": "lucide-search",
+              "title": "Search"
+            }
+          },
+          {
+            "id": "5f649a68cfee8d78",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "Python/SQLite.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "SQLite"
+            }
+          },
+          {
+            "id": "9cc940b45c7a4595",
+            "type": "leaf",
+            "state": {
+              "type": "bookmarks",
+              "state": {},
+              "icon": "lucide-bookmark",
+              "title": "Bookmarks"
+            }
+          }
+        ]
+      }
+    ],
+    "direction": "horizontal",
+    "width": 200
+  },
+  "right": {
+    "id": "cf92ccf43e96a53d",
+    "type": "split",
+    "children": [
+      {
+        "id": "4e6c94e5301f3341",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "86c23330f2a84cf8",
+            "type": "leaf",
+            "state": {
+              "type": "backlink",
+              "state": {
+                "file": "English/Homework/Homework 5.md",
+                "collapseAll": false,
+                "extraContext": false,
+                "sortOrder": "alphabetical",
+                "showSearch": false,
+                "searchQuery": "",
+                "backlinkCollapsed": false,
+                "unlinkedCollapsed": true
+              },
+              "icon": "links-coming-in",
+              "title": "Backlinks for Homework 5"
+            }
+          },
+          {
+            "id": "06e27be0fe382bd8",
+            "type": "leaf",
+            "state": {
+              "type": "all-properties",
+              "state": {
+                "sortOrder": "frequency",
+                "showSearch": false,
+                "searchQuery": ""
+              },
+              "icon": "lucide-archive",
+              "title": "All properties"
+            }
+          }
+        ]
+      }
+    ],
+    "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": "8e042e91d76d4fa9",
+  "lastOpenFiles": [
+    "ROTEK/metrolog/readme.md",
+    "ROTEK/allwinner 069 070.md",
+    "English/Homework/Homework 8.md",
+    "todo/Задачи по направлениям.md",
+    "ROTEK/Arbiter.md",
+    "STM32/Makefile template.md",
+    "English/Homework/Homework 7.md",
+    "English/words.md",
+    "common.md",
+    "ROTEK/bt67xx/common.md",
+    "todo/Разное.md",
+    "Python/venv.md",
+    "linux/server.md",
+    "STM32/Makefile_template.txt",
+    "ROTEK/Arbiter, artery.md",
+    "linux/linux common.md",
+    "English/img/29-10.jpg.~tmp",
+    "English/img/29-9.jpg.~tmp",
+    "English/img/29-8.jpg.~tmp",
+    "English/img/29-7.jpg.~tmp",
+    "English/img/29-6.jpg.~tmp",
+    "English/img/29-5.jpg.~tmp",
+    "English/img/29-4.jpg.~tmp",
+    "English/img/29-3.jpg.~tmp",
+    "English/img/29-10.jpg",
+    "English/img/29-9.jpg",
+    "English/img/29-8.jpg",
+    "English/img/29-7.jpg",
+    "English/img/29-6.jpg",
+    "English/img/29-5.jpg",
+    "English/img/29-4.jpg",
+    "English/img/29-3.jpg",
+    "English/img/29-2.jpg",
+    "English/img/29-1.jpg",
+    "todo/Счета.md",
+    "todo/Тренировки и занятия.md",
+    "English/Homework/Homework 6.md",
+    "hardcore web development/11. SQL/Создание таблиц.md",
+    "English/Homework/Homework 5.md",
+    "ROTEK/Artery testing.md",
+    "Untitled.md",
+    "hardcore web development/11. SQL/JOIN/LEFT и RIGHT OUTER JOIN.md",
+    "Python/Архитектура.md",
+    "linux/Сценарий. Полная настройка Windows, WSL и инструментов для разработчика.md",
+    "hardcore web development/11. SQL/JOIN/INNER JOIN.md",
+    "English/img/24-2.jpg.~tmp"
+  ]
 }

Homework 8.md → English/Homework/Homework 8.md

@@ -88,4 +88,37 @@
 7. The porter brought the luggage to our room. Who was brought the luggage to our room.
 8. Jim was sent to London last month. Who was sent to London to last month?
 9. Kate and Mary came to our garden party last week-end. Who was came to our garden party last week-end.
-10. The pictures were brought to the Russian Museum yesterday. What were brought to the Russian Museum yesterday?
+10. The pictures were brought to the Russian Museum yesterday. What were brought to the Russian Museum yesterday?
+
+~={green}151 Переведи=~
+1. Кто издал законы против католиков в Англии в 16 веке? Who passed laws against Catholics in England in the 16th century?
+2. Кто был приглашен на праздновании "Порохового заговора" в прошлом году? Who was invited to the Gunpowder celebration last year?
+3. Кто почувствовал, что правительство несправедливо к ним? Who felt that the gavernment was unfair to them?
+4. Кто надеялся, что король Джеймс 1 изменит несправедливые законы? Who hoped that King James 1 would change tu
+5. Кто должен был посещать протестантскую церковь по воскресеньям? Who had to attend Protestant church on Sundays?
+6. Кто был арестован в подвале здания парламента? Who was arrested in the basement of the Houses of Parliament?
+7. Кто отмечал дату 5 ноября? Who celebrated the date of November 5th?
+8. Кто готовил традиционные блюда этого праздника? Who cooked the traditional dishes of this holiday?
+9. Кто делал чучела для Ночи Костров? Who made the effigies for Bonfire Night?
+10. Кто собирал деньги для фейерверков? Who collected money for the fireworks?
+11. Кто был главным заговорщиком в "Пороховом заговоре"? Who was the main conspirator in the Gunpowder Plot?
+12. Кто просил "копеечку для Гая" на улицах перед праздником Ночи Костров? Who asked for "a penny for Guy" on the streets befor the Bonfire Night holiday?
+
+~={green}160 Вставь подходящий инфинитив из рамки и переведи.=~
+1. I'd like to invite you to a garden party.
+2. I am sure you would like to visit a zoo.
+3. Sue would prefer to go to the theatre.
+4. Ann would love to go to Paris one day.
+5. Joe would like to listen to some rock.
+6. I would prefer to watch cartoons.
+7. I would like to go a month at the seaside.
+8. Nick would like to meet to that new restaurant.
+9. I would love to have a new car.
+10. I would prefer to study at this college.
+11. Mike would love to see his Granny on Tuesday.
+12. She would prefer to go shopping instead (вместо).
+13. I am glad to see you.
+14. Jim was sorry to talk news.
+15. Mary was happy to meet John.
+16. Nick was annoyed (раздраженный) to have that his train had left.
+17. He was so anxious (встревожен) to hear about his success.

ROTEK/allwinner 069 070.md

@@ -14,6 +14,13 @@ Rомпилятор **gcc-arm-none-eabi-7-2017-q4-major**
 $ make fw HARDWARE=ARBITER_R
 ```
 
+~={yellow}Разное=~
+- Можно ориентироваться на проект для stm32 https://192.168.24.200:3000/drep/teplo_bt7k.git
+- Для питания от supercup нужно включить пин charger.charge_on
+```bash
+$ echo 1 > charger.charge_on/value
+```
+
 
 ~={yellow}Важное=~
 - Теперь повышающем преобразователем управляет Allwinner. Т.е. нужно вносить изменения в основной код. Раньше питание процессора обрубалось Artery.
@@ -200,3 +207,10 @@ uart2, uart3, uart5
 ~={green}Дополнительные проверки=~
 - SRVC2
 - SRVC3
+
+~={yellow}Программные модули=~
+- [x] Счетные входы
+- [ ] usched
+- [ ] Таблица GPIO
+- [ ] Standby mode
+- [ ]