Merge branch 'master' of dtelenkov:Home/obsidian

.obsidian/workspace.json

@@ -8,63 +8,34 @@
         "type": "tabs",
         "children": [
           {
-            "id": "0f1109505357e2ce",
+            "id": "1c6299e394a918e8",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "hardcore web development/11. SQL/JOIN/INNER JOIN.md",
+                "file": "English/words.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "INNER JOIN"
+              "title": "words"
             }
           },
           {
-            "id": "8431bd2ebe2a22be",
+            "id": "06b1a8b5f5f15be9",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "hardcore web development/11. SQL/JOIN/LEFT и RIGHT OUTER JOIN.md",
+                "file": "English/Homework/Homework 6.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "LEFT и RIGHT OUTER JOIN"
-            }
-          },
-          {
-            "id": "d1879175350295da",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "hardcore web development/11. SQL/Дата и время.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "Дата и время"
-            }
-          },
-          {
-            "id": "6ffa63e5d29e1292",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "hardcore web development/11. SQL/Создание таблиц.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "Создание таблиц"
+              "title": "Homework 6"
             }
           }
-        ],
-        "currentTab": 1
+        ]
       }
     ],
     "direction": "vertical"
@@ -87,7 +58,7 @@
                 "autoReveal": false
               },
               "icon": "lucide-folder-closed",
-              "title": "Files"
+              "title": "Файловый менеджер"
             }
           },
           {
@@ -135,7 +106,7 @@
       }
     ],
     "direction": "horizontal",
-    "width": 279.5
+    "width": 229.5
   },
   "right": {
     "id": "cf92ccf43e96a53d",
@@ -187,47 +158,47 @@
   },
   "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
+      "switcher:Меню быстрого перехода": false,
+      "graph:Граф": false,
+      "canvas:Создать новый холст": false,
+      "command-palette:Открыть палитру команд": false,
+      "markdown-importer:Импорт Markdown-файлов": false
     }
   },
-  "active": "8431bd2ebe2a22be",
+  "active": "1c6299e394a918e8",
   "lastOpenFiles": [
-    "hardcore web development/11. SQL/JOIN/INNER JOIN.md",
+    "English/Homework/Homework 6.md",
+    "English/words.md",
+    "linux/linux common.md",
+    "ROTEK/allwinner 069 070.md",
+    "todo/Задачи по направлениям.md",
+    "common.md",
+    "Python/Архитектура.md",
+    "English/Homework/Homework 5.md",
+    "linux/Сценарий. Полная настройка Windows, WSL и инструментов для разработчика.md",
     "hardcore web development/11. SQL/Создание таблиц.md",
+    "linux/server.md",
+    "todo/Счета.md",
+    "todo/Тренировки и занятия.md",
+    "hardcore web development/11. SQL/JOIN/INNER JOIN.md",
+    "todo/Разное.md",
+    "Комментарии.md",
     "hardcore web development/11. SQL/Дата и время.md",
-    "hardcore web development/11. SQL/Задание.md",
     "hardcore web development/11. SQL/JOIN/LEFT и RIGHT OUTER JOIN.md",
-    "ROTEK/allwinner 069 070.md",
-    "English/Homework/Homework 5.md",
+    "hardcore web development/11. SQL/Задание.md",
     "English/img/24-2.jpg.~tmp",
     "English/img/24-1.jpg.~tmp",
-    "todo/Счета.md",
-    "todo/Задачи по направлениям.md",
     "English/img/24-2.jpg",
     "English/img/24-1.jpg",
-    "todo/Разное.md",
     "Кодинг.md",
-    "Комментарии.md",
-    "common.md",
-    "todo/Тренировки и занятия.md",
     "hardcore web development/11. SQL/Псевдонимы.md",
     "hardcore web development/11. SQL/SQL настройка.md",
     "hardcore web development/11. SQL/JOIN",
-    "linux/server.md",
-    "linux/linux common.md",
     "linux/gogs.md",
     "linux/GS server.md",
     "proGit.md",
     "link.md",
     "Pasted image 20250413063157.png",
-    "hardcore web development/11. SQL/Изменение структуры таблиц.md",
-    "hardcore web development/11. SQL/Последовательности.md",
-    "English/Texts/Text 8.md",
-    "English/Homework/Homework 1.md",
     "English/Homework",
     "English/Texts",
     "configs/gl_wg.conf",

English/Homework/Homework 5.md

@@ -236,3 +236,68 @@ I get up at 7:30 and have breakfast. It takes half an hour to get to school on f
 ~={yellow}Mitsuko, 17, from Japan=~
 I get up at 6 and have breakfast. Then I catch the bus to school. School starts at 7:40 and lessons finish at 4.30 in the afternoon. After school, the students clean the classroom. We have extra activities like music and karate until 7:30. Then we go home for dinner. After dinner, I have a bath. Later, I start my homework. I don't finish it until 11:00. I go straight to bed after my homework because I'm very tired.
 
+---
+~={green}1 Прочитайте предложения в выберите правильную форму глагола.=~
+1. She usually goes to the gym every day after work to stay fit.
+2. I am doing my homework right now because I need to finish it before dinner.
+3. We have been to Paris three times, and each visit was amazing.
+4. The letters are sent by the post office workers every day.
+5. They saw a great film last night and enjoyed it very much.
+6. He was watching TV when I called him but he didn't hear the phone ring.
+7. I will visit my grandparents next weekend because I haven't seen them for a long time.
+8. This book is written by a famous writer and is translated into many languages.
+9. We were having dinner at 7 p.m. yesterday when the light suddenly went out.
+10. I met my friend yesterday, and we talked about our plans for the weekend.
+
+~={green}2 Выберите правильные артикли (a / an/ th _ ), где необходимо=~
+1. My friend is the cleverest boy in our class.
+2. My dream is to visit Moscow.
+3. Lake Baikal is the deepest lake in the world.
+4. I like athletics.
+5. I would like to buy a pair of jeans.
+6. I visited the Louvre last summer.
+7. They often play football in the park.
+8. This painting is the most beautiful piece in the gallery.
+9. My brother wants to learn how to play the violin.
+10. Paris is the capital of France.
+
+~={green}3 Выберите и запишите правильные предлоги.=~
+1. Mary loves to look at the stars at night.
+2. I am trying to look for my keys, have you seen them?
+3. I've learnt a lot of new things at school this year.
+4. I usually have lunch at 6 p.m. every day.
+5. It's important to learn the rules by heart before the game.
+6. He has always been interested in science and technology.
+7. I usually go to bed early on weekdays.
+8. She is excited to go to school after the summer break.
+9. She prefers to go by car rather (довольно таки) than (нежели чем) take the train.
+10. She is found of learning new languages.
+
+~={green}4 Прочитайте предложения, выбирая правильный вариант. Запишите выбранное слово.=~
+1. I'm sorry to say, but you made too many mistakes in your last test.
+2. His clothes are always very clean and tidy.
+3. She didn't answer all the letters because she had no time.
+4. My old jeans are a little tight now.
+5. The weather was rainy, so few people came to see the football match.
+6. She speaks English so fast that I can't understand her.
+7. This is the most beautiful dress I've ever seen.
+8. Do we have enough chairs for everyone?
+9. There are a few good restaurants in this city.
+10. I have  no idea how to solve this problem.
+11. There are some interesting books on the shelf.
+12. I have met a lot of interesting people at the conference.
+13. I liked neither of the two movies we watched last night.
+14. I will take either of the two books.
+15. Neither if the two answers was correct.
+16. Can you give me a little help with my homework?
+17. Either Sean or Brad will look after your cat. Just ask one of them.
+18. You look tired and ill. You should go to bed and have some rest.
+19. Is there any milk left in the fridge?
+20. I'd like to try on a bigger size.
+
+~={green}5 Напишите правильную форму слова, добавляя суффиксы - ous, - ful, - able. Пример: care - careful.=~
+1. She dreams of becoming a famous singer one day.
+2. I prefer wearing comfortable clothes when I travel.
+3. The festival was filled with colourful lights and decorations.
+4. The sunset over the ocean was absolutely beautiful.
+5. Her clothes are very fashionable and trendy this season.

English/Homework/Homework 6.md

@@ -0,0 +1,131 @@
+~={green}77 Напиши исчисляемые и неисчисляемые существительные в разных колонках.=~
+Countable: canteen, fish, pie, mushroom, sausage, potato, biscuit, egg, pudding, chop (отбивная), cup, vegetable, banana, caouliflowers
+
+Uncountable: fish, beef, sugar, bread, gravy (подливка), meat, water, cheese, coffee, butter, tea, flour, hair, food, milk, weather, cocoa
+
+~={green}78 Подчеркни неисчисляемые существительные в предложениях=~
+1. We usually have 4 meals a day.
+2. If you are hungry you can eat crisps, sandwiches of biscuits.
+3. Kate has always thought pudding is sweet.
+4. There is more *flour* than *fish* in them.
+5. I dont' like *gravy* with *meat*.
+6. People of Belarus have white *bread* with *butter* and *jam* for breakfast.
+7. Many people think that *caviar (икра)* is the national food of Russinan people.
+8. You must add *oil* in the dish.
+9. I am not sure that my friend is found of *soup*.
+10. For brakfast she usually drinks *tea* or *coffee*.
+11. Do you like pancakes with sour *cream* or *honey*?
+
+~={green}79 Поставь глагол в единственном или множественном числе.=~
+1. Money does not make you happy.
+2. The spaghetti is ready.
+3. Water boils at 100 degrees.
+4. This fruit countains a lot of vitamins.
+5. Light comes from the sun.
+6. Maths doesn't interest me very much.
+7. Bread is fresh today.
+8. Your food looks great!
+9. There are two fish on the plate.
+10. You hair needs cutting.
+11. Sugar damages your teeth.
+
+~={green}80 Подчеркни правильный вариант.=~
+1. The news was sad.
+2. Yorkshire pudding is served with roast beef.
+3. Billiards is their favourite game.
+4. Is there any cheese in this dish?
+5. Meat becomes brown in the oven (духовка).
+6. There is no salt on the table.
+7. Knowledge of foreign lanuages helps...
+8. He planted several peppers in the green house.
+9. Would you like some chocolate?
+10. Please, bring us coffee.
+11. Every morning I eat a plate of porridge.
+12. How much sugar do you take with your tea?
+13. We need to buy some furniture for our kitchen.
+
+~={green}81 Исправь ошибку.=~
+1. I am going to buy some bread.
+2. 'Fish and chips' is a dish consisting of fish and potatoes.
+3. Black pudding (кровянка) is a type of sausages made from the meat and blood of pigs.
+4. What kind of soup does your mother like?
+5. We had very good wather during our holidays.
+6. I ate a plate of noodle (лапша) and rice.
+7. Where is he going to put all his furniture?
+8. Bangers (сардельки самодельные) and mash is sausages with mashed potato.
+9. Tom gave me good advice.
+10. He never drinks milk.
+
+~={green}83 Подчеркни правильный вариант.=~
+1. I never have breakfast at school.
+2. Can we have a hot dinner here?
+3. What are you going to have for lunch?
+4. The breakfast we had yesterday was delicious.
+5. On Sunday many families have a traditional lunch.
+6. After dinner we watched TV.
+7. She advised me to have a light supper.
+8. I will not eat the brakfast. You have burnt it again.
+9. A traditional English breakfast is a very big meal.
+10. Dinner is ready!
+11. British people don't eat dinner late in the evening.
+12. The supper is in the fridge. Warm it up.
+
+~={green}84 Поставь правильный артикль, где необходимо.=~
+1. I liked the delicious dinner which my friend had cooked.
+2. At what time do English people usually have lucnh?
+3. After tea we spoke much about the film.
+4. What a huge breakfast!
+5. If you put some more salt in the dinner, it'll be alright.
+6. He had a expensive supper in the hotel.
+7. Now I must go to the kitchen and have a look at the dinner.
+8. I very often invite my friend for tea and supper.
+9. The supper which my brother cooked is indedible! (несъедобен)
+10. Thank you very much for the supper!
+11. A European breakfast consists of toast with marmalade and tea or coffee.
+12. What about lunch? I am dying for a cup of tea.
+
+~={green}85 Исправь ошибку=~
+1. Mother is cooking a special supper for my birthday.
+2. Don't forget to wash your hands before dinner.
+3. Supper consisted of fish and chips.
+4. Let's have dinner in my favourite cafe!
+5. Our lunch break is from 12 till 1.
+6. Hurry up.  The dinner will get cold.
+7. What time is lunch?
+8. My granny usually cooks a very tasty supper for Christmas.
+9. Some children take a packed lunch from home.
+10. Kate invited me to dinner.
+11. I am not very hungry. I had a big breakfast.
+12. Dinner is another common name for supper.
+
+~={green}87 Переведи=~
+1. A packet of tea - чашка чая. 
+2. A bottle of oil - бутылка масла.
+3. A jar of jam - банка варенья
+4. A tin of sprats - банка шпротов
+5. A loaf of bread - буханка хлеба
+6. A bar of chocolate - плитка шоколада
+7. A pound of bacon - фунт бекона
+8. A kilo of meat - килограмм мяса
+9. Carton of yoghurt - упаковка йогурта
+10. A bag of sugar - пакет сахара
+
+~={green} 88 Соедини слова=~
+1. A kilo of potatoes
+2. A packet of butter
+3. A box of matches (спички)
+4. A tube of toothpaste
+5. A tin of sardines
+6. A loaf of bread
+7. A pound of sugar
+8. A jar of honey 
+9. A bag of sugar
+10. A bottle of milk
+
+~={green}89 Подчеркни правильный вариант=~
+1. I would like to buy a can of Coke.
+2. I need two loaves of bread.
+3. My mother bought two bars of chocolate.
+4. The customer bought a carton of orange juice.
+5. Have you got a packet of black tea?
+6. 

English/words.md

@@ -85,3 +85,31 @@ in front of - перед
 in the right - направо
 in the left - налево
 near (next to) - около (рядом)
+
+---
+~={yellow}Unit 3. Lesson 1=~
+to boil, boiled - варить, вареный
+a bowl - миска
+to fry, fried - жарить, жаренный
+to roast - жарить, запекать
+meal - время приема пищи, еда
+to mash - раздавливать, размешивать
+to try - пробовать, отведывать
+~={yellow}Lesson 2=~
+a berry, berries - ягода, ягоды
+breakfast - завтрак
+brunch - поздний завтрак
+lunch - обед
+course - блюдо
+dessert (sweet dish) - десерт
+stewed fruit - компот (тушеные фрукты)
+~={yellow}Lesson 3=~
+a piece - кусок
+a slice - тонкий кусочек
+a pot - горшок
+a tin - консервная банка
+a can - консервная банка для напитков
+a bowl - миска
+a loaf - буханка хлеба
+a jar - стеклянная банка
+a chunk of - ломоть

ROTEK/allwinner 069 070.md

@@ -56,13 +56,17 @@ echo 1 > /sys/devices/platform/bt7kgpio/charger.charge_on/value
 ~={green}Важно=~
 1. Artery на пробуждение из режима standby требуется 8мс.
 
-~={green}Тестирование мультиплексера ПСД U904=~
+~={green}Тестирование мультиплексора ПСД U904=~
 2 GPIO определяют какой из выходов mux подключен ко входу.
 1. При нулях на управляющих вход подключен к нулевому выходу (1Y0, 2Y0).
 2. При S0 = 1, S1 = 0 подключается выход 1Y1 и 2Y1.
 3. При S0 = 0, S1 = 1 подключается выход 1Y2 и 2Y2.
 4. При S0 = 1, S1 = 1 подключается выход 1Y3 и 2Y3.
-5. 
+
+~={green}Задачи по микроконтроллера Artery.=~
+1. Интегрироваться в проект Дмитрия Репникова.
+2. Модуль мультиплексора. Работа мультиплексора проверена. Добавить команды управления в SVC.
+3. 
 
   // первый аналоговый вход
   // второй аналоговый вход
@@ -73,10 +77,3 @@ echo 1 > /sys/devices/platform/bt7kgpio/charger.charge_on/value
   // верхняя точка super cup
   // средняя точка super cup
 
-
-0,327868
-
-335
-
-
-3,05

hardcore web development/11. SQL/JOIN/LEFT и RIGHT OUTER JOIN.md

@@ -107,4 +107,5 @@ right join book p on b.parent_book_id = p.book_id;
 |                |Судьба человека              |
 |                |Дети капитана Гранта         |
 |                |Остров погибших кораблей     |
-```
+```
+

hardcore web development/11. SQL/Создание таблиц.md

@@ -1,4 +1,4 @@
-
+pii
 Создаем таблицу авторов:
 ```sql
 create table author (

todo/Задачи по направлениям.md

@@ -1,5 +1,5 @@
 <h6>Срочные дела</h6>
-- [ ] Разобраться со счетчиком горячей воды в Подрезково
+- [x] Разобраться со счетчиком горячей воды в Подрезково
 - [x] Записаться к ортодонту (звонить завтра 25.03.25)
 - [x] Передать показания счетчиков
 <h6>Работа и образование</h6>
@@ -13,7 +13,7 @@
 <h6>Финансы:</h6>
 - [ ] Разобраться с налоговым вычетом по квартире (жена).
 - [x] Разобраться со вкладом 15-16 апреля
-- [ ] Долг 20к до 20-ого апреля
+- [x] Долг 20к до 20-ого апреля
 <h6>Бытовые:</h6>
 - [ ] Подобрать новые телефоны
 - [ ] Починить пороги
@@ -37,8 +37,8 @@
 - [x] Самокат
 ---
 <h6>Срочные задачи:</h6>
-- [ ] Забрать документы на счетчик в Подрезково
-- [ ] Купить батарейку для часов жены.
+- [x] Забрать документы на счетчик в Подрезково
+- [x] Купить батарейку для часов жены.
 - [ ] Борьба с плесенью в ванной.
 - [ ] Купить футболки.
 - [ ] Починить пороги.
@@ -54,11 +54,13 @@
 #### <font color = "MediumSeaGreen">Подкрутить пластины:</font>
 Верхняя: (раз в 5 дней)
 - [x] 08.04.25 - регулировка у врача
-- [ ] 15.04.25
-- [ ] 20.04.25
+- [x] 15.04.25
+- [x] 21.04.25
+- [ ] 26.06.25
 Нижняя (оба винта раз в 10 дней):
 - [x] 08.04.25 - регулировка у врача
-- [ ] 18.04.25 
+- [x] 21.04.25 
+- [ ] 01.05.25
 
 <h4>Перенос репозиториев до 28.07.24</h4>
 <h6>Разное</h6>

todo/Разное.md

@@ -24,6 +24,8 @@
 ~={yellow}Инна=~
 2200 7013 1856 8083
 
+~={yellow}Где отдохнуть=~
+https://www.erino.ru/
 #### <font color = "MediumSeaGreen">VIN:</font> Z94CU41DADR315596
 
 soap march file tonight thunder answer inhale faculty skull goddess say first

todo/Счета.md

@@ -9,12 +9,12 @@
 ##### <font color = "#1D8571">Передача показаний с 15-ого числа</font>
 - [x] Широкая вода. хол , гор 
 - [x] Широкая электричество: 
-- [ ] Подрезково: хол , гор , эл  (передал только электричества!)
-- [ ] Химки: 471 - , 473 - , 450 - , 402 - , эл -  (передал только электричества!)
-- [ ] Планерная Нина электричество: 
-- [ ] Планерная Батя электричество: 
+- [x] Подрезково: хол , гор , эл  (передал только электричества!)
+- [x] Химки: 471 - , 473 - , 450 - , 402 - , эл -  (передал только электричества!)
+- [x] Планерная Нина электричество: 15812
+- [x] Планерная Батя электричество: 
 ##### <font color = "#1D8571">Дополнительно</font>
-- [ ] Отдать Нине ()
+- [x] Отдать Нине ()
 - [x] Домашний интернет
 - [x] Сотовый телефон ()
 - [x] Хостинг