unknown 5 days ago
parent
commit
fa2bada7bb

+ 13 - 56
.obsidian/workspace.json

@@ -8,63 +8,20 @@
         "type": "tabs",
         "children": [
           {
-            "id": "0f1109505357e2ce",
+            "id": "1c6299e394a918e8",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "hardcore web development/11. SQL/JOIN/INNER JOIN.md",
+                "file": "linux/linux common.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "INNER JOIN"
-            }
-          },
-          {
-            "id": "2f231eda32a1c788",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "todo/Счета.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "Счета"
-            }
-          },
-          {
-            "id": "8431bd2ebe2a22be",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "linux/Сценарий. Полная настройка Windows, WSL и инструментов для разработчика.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "Сценарий. Полная настройка Windows, WSL и инструментов для разработчика"
-            }
-          },
-          {
-            "id": "6ffa63e5d29e1292",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "hardcore web development/11. SQL/Создание таблиц.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "Создание таблиц"
+              "title": "linux common"
             }
           }
-        ],
-        "currentTab": 3
+        ]
       }
     ],
     "direction": "vertical"
@@ -194,22 +151,25 @@
       "markdown-importer:Open format converter": false
     }
   },
-  "active": "6ffa63e5d29e1292",
+  "active": "1c6299e394a918e8",
   "lastOpenFiles": [
+    "ROTEK/allwinner 069 070.md",
+    "English/Homework/Homework 6.md",
+    "English/words.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",
-    "todo/Задачи по направлениям.md",
     "hardcore web development/11. SQL/JOIN/INNER JOIN.md",
     "todo/Разное.md",
-    "common.md",
     "Комментарии.md",
-    "English/Homework/Homework 5.md",
-    "ROTEK/allwinner 069 070.md",
     "hardcore web development/11. SQL/Дата и время.md",
     "hardcore web development/11. SQL/JOIN/LEFT и RIGHT OUTER JOIN.md",
-    "hardcore web development/11. SQL/Создание таблиц.md",
     "hardcore web development/11. SQL/Задание.md",
     "English/img/24-2.jpg.~tmp",
     "English/img/24-1.jpg.~tmp",
@@ -225,9 +185,6 @@
     "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",
     "English/Texts",
     "configs/gl_wg.conf",

+ 131 - 0
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 to 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 need 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 you tea?
+13. We need to buy some furniture for our kitchen.
+
+~={green}81 Исправь ошибку.=~
+1. I am going to buy 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 have a very good wather during our holidays.
+6. I ate a plate of noodle (лапша) and rice.
+7. Where is he going to put all his furnitures?
+8. Bangers (сосиски) and mash are sausages with mashed potato.
+9. Tom gave me good advice.
+10. He never drinks milks.
+
+~={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 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 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 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 het 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. 

BIN
English/img/26-1.JPEG


BIN
English/img/26-2.JPEG


BIN
English/img/26-3.JPEG


BIN
English/img/26-4.JPEG


BIN
English/img/26-5.JPEG


BIN
English/img/26-6.JPEG


BIN
English/img/26-7.JPEG


BIN
English/img/26-8.JPEG


BIN
English/img/26-9.JPEG


+ 25 - 0
English/words.md

@@ -85,3 +85,28 @@ 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) - десерт
+~={yellow}Lesson 3=~
+a piece - кусок
+a slice - тонкий кусочек
+a pot - горшок
+a tin - консервная банка
+a can - консервная банка для напитков
+a bowl - миска
+a loaf - буханка хлеба

+ 6 - 9
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