tmp

.obsidian/workspace.json

@@ -8,34 +8,49 @@
         "type": "tabs",
         "children": [
           {
-            "id": "8970e6c5f5d1271c",
+            "id": "c7bcd820d11926a1",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "ROTEK/bt67xx/common.md",
+                "file": "English/expressions.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "common"
+              "title": "expressions"
             }
           },
           {
-            "id": "c7bcd820d11926a1",
+            "id": "206c144a832f0380",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "English/expressions.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "expressions"
+            }
+          },
+          {
+            "id": "9b80234c7af74c38",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "ROTEK/bt67xx/6721 fix.md",
+                "file": "English/Homework/Homework 11.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "6721 fix"
+              "title": "Homework 11"
             }
           }
-        ]
+        ],
+        "currentTab": 2
       }
     ],
     "direction": "vertical"
@@ -58,7 +73,7 @@
                 "autoReveal": false
               },
               "icon": "lucide-folder-closed",
-              "title": "Файловый менеджер"
+              "title": "Files"
             }
           },
           {
@@ -158,26 +173,29 @@
   },
   "left-ribbon": {
     "hiddenItems": {
-      "switcher:Меню быстрого перехода": false,
-      "graph:Граф": false,
-      "canvas:Создать новый холст": false,
-      "command-palette:Открыть палитру команд": false,
-      "markdown-importer:Импорт Markdown-файлов": false,
-      "bases:Создать новую базу": false
+      "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,
+      "bases:Create new base": false
     }
   },
-  "active": "8970e6c5f5d1271c",
+  "active": "9b80234c7af74c38",
   "lastOpenFiles": [
-    "English/img/47-1.jpg",
-    "English/Homework/Homework 11.md",
+    "English/expressions.md",
+    "English/words.md",
     "ROTEK/bt67xx/6721 fix.md",
+    "ROTEK/bt67xx/common.md",
+    "English/Homework/Homework 11.md",
+    "English/Theory.md",
+    "English/img/47-1.jpg",
     "Greenstar/ethernet stm32.md",
     "Greenstar/modbus in ethernet stm32.md",
     "Greenstar/ksig.md",
     "Greenstar/FPGA Blaster.md",
     "proGit.md",
     "todo/Счета.md",
-    "English/words.md",
     "linux/GS server.md",
     "todo/Разное.md",
     "todo/Задачи по направлениям.md",
@@ -191,10 +209,8 @@
     "img/Pasted image 20250812151104.png",
     "Golang/links.md",
     "Golang/common.md",
-    "ROTEK/bt67xx/common.md",
     "ROTEK/bt67xx/Команды.md",
     "ROTEK/metrolog/readme.md",
-    "English/Texts/Text 11.md",
     "English/img/43-5.jpg",
     "English/img/43-4.jpg",
     "English/img/43-3.jpg",
@@ -203,7 +219,6 @@
     "English/img/42-4.jpg",
     "English/img/42-3.jpg",
     "English/img/42-2.jpg",
-    "English/img/42-1.jpg",
     "net",
     "English/words",
     "English/img/38-1.jpg.~tmp",

English/Homework/Homework 11.md

@@ -200,7 +200,7 @@
 
 1. **who** - который. The woman **who** is sitting next to Helen is a famous actress. - Женщина, которая сидит рядом с Хелен, знаменитая актриса.
 2. **that** - который. The woman **that** is sitting next to Helen is a famous actress. - Женщина, которая сидит рядом с Хелен, знаменитая актриса.
-3. whom - которого. There is the man whom we saw in the park yesterday. - Вот тот человек, которого мы вчера видели в парке.
+3. whom - которого, кого-либо, кому. Все падежи кроме именительного. There is the man whom we saw in the park yesterday. - Вот тот человек, которого мы вчера видели в парке.
 
 *Когда говорим о вещах или животных*
 
@@ -209,7 +209,7 @@
 
 *Когда говорим о людях, животных и предметах, чтобы показать принадлежность (вместо притяжательного местоимения мой, твой, его, чей и т.д.)*
 
-1. whose - которого. Do you know the man **whose** house is next to Bob's? - Ты знаешь человека, дом которого находится рядом с домом Боба? We saw the house **whose** roof (the roof of which) was covered with straw. - Мы видели дом, крыша которого была покрыта соломой.
+1. whose - чей. После него ставим существительное. Do you know the man **whose** house is next to Bob's? - Ты знаешь человека, дом которого находится рядом с домом Боба? We saw the house **whose** roof (the roof of which) was covered with straw. - Мы видели дом, крыша которого была покрыта соломой.
 
 ~={green}227. Вставь who, which или whose.=~
 1. That's the man whose brother works in our office.
@@ -226,7 +226,7 @@
 12. The pupils who are standing by the window are my friends.
 
 ~={green}228. Вставь подходящее относительное местоимение who, whose, that или which (в некоторых предложениях возможны два варианта). =~
-1. The road by which/that we came, was in excellent condition.
+1. The road by which we came, was in excellent condition.
 2. The lady who told the story lives just around the corner.
 3. This boy, who is very good at maths, is my brother's friend.
 4. The house which we bought, needs lots of repairs.
@@ -237,7 +237,7 @@
 9. Yesterday I saw my friend who had just bought a new computer.
 10. The Tower, which is a famous sight in London, dates from centuries ago.
 11. The train which we wanted to catch had already left.
-12. The girl who I gave the flowers, has a cheerful charecter.
+12. The girl whom I gave the flowers, has a cheerful charecter.
 
 ~={green}229. Вставь подходящее относительное местоимение.=~
 1. London, which is the capital of England, is siеuated on the river Thames.
@@ -249,32 +249,54 @@
 7. The pen which I'm writing with I got from my best friend.
 8. The platform form which your train is leaving is number 14.
 9. Last night we watched a film which was very silly (глупый).
-10. The man whose we visited last week is an uncle of mine.
+10. The man whom we visited last week is an uncle of mine.
 11. He didn't tell me the truth, which I don't like at all.
 12. Belarus, which has a population of over 10 million, is siruated in the middle of Europe.
 
 ~={green}230. Выбери правильный вариант.=~
 1. The new car which she bought was very cheap.
-2. This is Mr. Brown who we spoke to yesterday.
-3. The pupils who compositions were to be handed in the next day, were all working in the library.
+2. This is Mr. Brown whom we spoke to yesterday.
+3. The pupils whose compositions were to be handed in the next day, were all working in the library.
 4. What's the name of that film producer whose film you were watching last night?
 5. Nelly said that there's a film on at the cinema which we might enjoy.
 6. Do you know the woman who owns the shop?
-7. This is my neighbour Alexander, whom wife works as a medical doctor.
-8. Is this all which is left of your money?
-9. Is she the woman who won the lottery last week?
+7. This is my neighbour Alexander, whose wife works as a medical doctor.
+8. Is this all that is left of your money?
+9. Is she the woman that won the lottery last week?
 10. I like people who have a positive outlook on life.
 
 ~={green}231. Исправь ошибку.=~
 1. That is the girl who bought Ted's car.
-2. John, whom daughter lives next door, works in the hospital. (не понял где ошибка)
+2. John, whose daughter lives next door, works in the hospital. 
 3. That's the man who works in the bank.
 4. This is the house which was broken into last night.
 5. The tiger is an animal which can be found in India.
 6. George is a mechanic who fixed our car.
-7. This is Jane whom sister you met yesterday.
+7. This is Jane whose sister you met yesterday.
 8. An alarm clock is something which wakes you up in the morning.
 9. This is Neil Adams who is the new computer technician.
 10. Chinese is the language which is spoken in Taiwan.
 11. The pencil which is on your desk is mine.
-12. The nam who was arrested by the police is a burglar.
+12. The man who was arrested by the police is a burglar.
+
+~={green}Exercise 4. Переведите предложения на английский язык.=~
+1. Я опаздываю. - I'am late.
+2. Когда я проснулся она уже ушла. - When I woke up, she had already left.
+3. Где ты живешь? - Where do you live?
+4. Я купил машину своей мечты. - I have bought the car of my dream.
+5. Не уходи, пожалуйста. Don't go away, please.
+6. Ты поможешь мне? Will you help me?
+7. Я ему не доверяю. I don't trust him.
+8. Он закончит статью к двум часам. He will have finished the article by two o'clock.
+9. Он работал в этой компании 10 лет. He had been working in this company for 10 years.
+10. Он работает в этой компании 10 лет. He has been working in this company for 10 years.
+11. Алекс ничего мне не сказал. Alex told me nothing.
+12. Дождь шел вчера до пяти. It had been raining until 5 o'clock yesterday. It was raining until 5 o'clock.
+13. Мэри всегда придумывает истории! Mary always makes up stories.
+14. Посмотри в окно! Будет дождь. Look out the window. It will be raining. It's going to rain.
+15. Что я могу для вас сделать? What can I do for you?
+16. Я уверена, что он придет. I'm sure he will come.
+17. Какая твоя любимая еда? What is your favorite food?
+18. Когда я шел домой, я встретил одноклассника. When I  was going home, I met my classmate.
+19. Не может быть, чтобы это было его письмо. It can't be his letter.
+20. Она могла говорить по-английски, когда ей было 5. She could speak English when she was five.

English/expressions.md

@@ -0,0 +1,31 @@
+But now it's raining hard.
+It looks like rain. - Похоже на дождь.
+She must be cooking.
+Look here - Послушай.
+I say - Послушай.
+I see - Понятно.
+Laugh at - смеяться над.
+Smile at - улыбаться кому-то.
+Interfere with - вмешиваться в
+rely on - положиться на кого-то
+pay attention to - уделить внимание чему-то
+make a conclusion - сделать вывод
+in the daytime - в дневное время, днем
+frankly speaking - честно говоря
+as for me - что касается меня
+to my mind - на мой взгляд, по моему мнению
+save time - экономить время
+actual speaking - разговорная речь
+to keep it - хранить это
+to keep secret - хранить в тайне
+
+---
+greedy - жадный
+embroidery - вышивка
+burglar - грабитель
+yell - кричать, вопить, орать
+choir - хор
+quarrel - ссориться
+quarrels - ссоры
+pronunciation - произношение
+drop in - заглянуть, зайти

ROTEK/bt67xx/6721 fix.md

@@ -326,3 +326,20 @@ SNMP_SendUserTrap(VAC_HIGH_OUTPUT_ALARM);
 syslog(SYSLOG_ERROR, "Высокое выходное напряжение (%0.1f В)", VACoutputCurrent);
 ```
 
+8. При отказе флешки контроллер виснет - хочется чтобы продолжал работать пусть и без журнала.
+
+9. Сброс ИБП командой "C" (кнопка отмены отключения) если состояние Fault длится более 15-и секунд. ~={green}Fixed.=~
+Добавил анализ состояния в функцию void kstar_mode(void)
+```c
+    if (UPS.Mode == 'F') {
+        fault_mode_cnt++;
+    }
+    else {
+        fault_mode_cnt = 0;
+    }
+
+    if (fault_mode_cnt == UPA_CANSEL_DELAY) {
+        send_MegaTec_cmd(ups_cancel_shut_down);
+        fault_mode_cnt = 0;
+    }
+```