unknown 2 days ago
parent
commit
827f926b5f
9 changed files with 48 additions and 79 deletions
  1. 17 61
      .obsidian/workspace.json
  2. 14 0
      6711.md
  3. 2 2
      English/Homework/Homework 15.md
  4. 7 5
      English/Texts/Text 16.md
  5. 0 1
      Untitled 1.canvas
  6. 0 3
      Untitled.base
  7. 0 1
      Untitled.canvas
  8. 6 6
      todo/Счета.md
  9. 2 0
      К1921ВГ015.md

+ 17 - 61
.obsidian/workspace.json

@@ -4,67 +4,24 @@
     "type": "split",
     "children": [
       {
-        "id": "e9aafd28fe59ecac",
+        "id": "e23ec24fdfe8ee3a",
         "type": "tabs",
         "children": [
           {
-            "id": "680c057645c3b4a2",
+            "id": "bcdb359127388b01",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "English/words.md",
+                "file": "todo/Счета.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "words"
-            }
-          },
-          {
-            "id": "2ba1f662d53d63a9",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "todo/Разное.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "Разное"
-            }
-          },
-          {
-            "id": "0a5de7712e411d74",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "English/words.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "words"
-            }
-          },
-          {
-            "id": "df4d6cb08a8af6f8",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "ROTEK/bt67xx/common.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "common"
+              "title": "Счета"
             }
           }
-        ],
-        "currentTab": 3
+        ]
       }
     ],
     "direction": "vertical"
@@ -181,15 +138,23 @@
       "bases:Create new base": false
     }
   },
-  "active": "df4d6cb08a8af6f8",
+  "active": "bcdb359127388b01",
   "lastOpenFiles": [
-    "ROTEK/bt67xx/6721 fix.md",
+    "Untitled 1.canvas",
+    "Untitled.canvas",
+    "Untitled.base",
+    "proGit.md",
+    "English/Texts/Text 16.md",
+    "К1921ВГ015.md",
+    "English/words.md",
+    "English/Homework/Homework 15.md",
+    "6711.md",
+    "Greenstar/ksig.md",
     "ROTEK/bt67xx/common.md",
+    "ROTEK/bt67xx/6721 fix.md",
     "ROTEK/bt67xx/Команды.md",
-    "English/Texts/Text 16.md",
     "English/Texts/Text 15.md",
     "English/Texts/Text 14.md",
-    "English/words.md",
     "English/Texts/Text 12.md",
     "English/img/77-1.jpg",
     "English/Texts/Text 8.md",
@@ -201,19 +166,10 @@
     "English/Texts/Text 2.md",
     "English/Texts/Text 1.md",
     "English/Texts/Text 0.md",
-    "English/Homework/Homework 15.md",
     "todo/Разное.md",
     "todo/common.md",
     "todo/Тренировки и занятия.md",
-    "todo/Счета.md",
-    "todo/Задачи по направлениям.md",
-    "Untitled 1.canvas",
-    "Untitled.canvas",
-    "Untitled.base",
-    "ROTEK/cas/common.md",
     "ROTEK/cas",
-    "c/Make.md",
-    "c/c common.md",
     "English/img/75-4.jpg",
     "English/img/75-3.jpg",
     "English/img/75-2.jpg",

+ 14 - 0
6711.md

@@ -0,0 +1,14 @@
+~={green}Проблемы=~
+
+~={yellow}1. Исходные данные=~
+- Неправильно отображает Информация/модель (ИБП) в web.
+- Вывод из Fault при остывании АКБ (по аналогии с BT6711v1 v1.9)
+Коллеги, к началу эксплуатации ИБП RTMP-II v0hi и адаптеров для них BT-6711 провёл проверку пригодности для наших нужд последней версии ПО 1.2 к snmp-адаптерам. По результатам проверки ПО BT_6711_v1_2 от 02.11.2024 вижу следующие недостатки:
+
+·         Именует модель ИБП **_RTMP_****_-_****_II v_****_0_****_hi_** именем **_RTMP_****_-_****_II v_****_0_****_hi v_****_1_**. Требуется доработка ПО.
+
+·         В changelog на эту версию ПО не значится вывод из Fault при остывании на АКБ аналогично параллельному ПО 1.9 для контроллеров BT-6711_v1. ИБП на которых используются соответствующие карты одинаковы, было синхронное изменение ПО электротехнических блоков и ожидалось синхронное изменение ПО адаптеров для этих ИБП. Эта доработка ПО для контроллеров BT-6711 также запрошена довольно давно для сегодняшнего дня.
+
+В остальном ПО 1.2 пригодно.
+
+Также прошу прислать changelog к ПО 1.9 для контроллеров BT-6711_v1, у себя нашёл только для версии 1.8.

+ 2 - 2
English/Homework/Homework 15.md

@@ -108,6 +108,6 @@
 ~={green}2. Put the verbs in brackets into the Past Perfect Passive.=~
 1. This guitar had been tuned before I broke a string and had to tune it again.
 2. This house had been painted pink before it was given a fresh coat of paint (свежий слой краски). Now it's blue.
-3. These beed had been kept in a large hive before they were taked out and examined by the beekeeper.
-4. This man had been given novocaine before the dentist started working on a cavity that needed a filing.
+3. These bees had been kept in a large hive before they were taked out and examined by the beekeeper.
+4. This man had been given novocaine before the dentist started working on a cavity (дупло/полость) that needed a filing (пломба).
  

+ 7 - 5
English/Texts/Text 16.md

@@ -1,9 +1,11 @@
 	FAIRY TALES TEACH US A LOT
 
-For hundreds of years, and perhaps even thousands of years, adults have told traditional fairy tales to their children. The stories have been handed down from one generation to another. They have become a fundamental part of your culture.
+For hundreds of years, and perhaps even thousands of years, adults have told traditional fairy tales to their children. The stories have been handed down from one generation to another. (Истории передавались из поколения в поколение) They have become a fundamental part of your culture. (неотъемлемой частью культуры)
 In early versions of fairy tales there is much more cruetly and violence than in the stories published for children today. The case of Cinderella is a good example.
-In this variant, Cinderella's step-sisters are very pretty rather than ugly, as they are in the modern version. But they are much more cruel. Cinderella works like a slave and has no bed to sleep in. Her step-sisters throw her food into the fire. Cinderella has to pick it out of the fire-place so that she can eat.
-When news comes that there is going to be a big party so that the prince can choose a future wife, naturally Cinderella is told that she can't go. Cinderella visits her real mother's grave and creis. Her tears fall on the ground and a tree grows. From the branches of the tree, beautiful clothes fall down. So when Cinderella finally goes to the party, she looks beautiful and the prince falls in love with her.
-The prince comes looking for Cinderella bringing with him the golden shoe that Cinderella was wearing. Cinderella's sisters try on the shoe but it doesn't fit. To make if fit, one sister cuts off her toes; the other curs off her heel. Their mother says: "You won't need to walk when you become queen!"
+In this variant, Cinderella's step-sisters are very pretty rather (скорее) than ugly, as they are in the modern version. But they are much more cruel. Cinderella works like a slave and has no bed to sleep in. Her step-sisters throw her food into the fire. Cinderella has to pick it out of the fire-place so that she can eat.
+When news comes that there is going to be a big party so that the prince can choose a future wife, naturally Cinderella is told that she can't go. Cinderella visits her real mother's grave and creis (совершает обряд крещения). Her tears fall on the ground and a tree grows. From the branches of the tree, beautiful clothes fall down. (С ветвей дерева падают прекрасные наряды) So when Cinderella finally goes to the party, she looks beautiful and the prince falls in love with her.
+The prince comes looking for Cinderella bringing with him the golden shoe that Cinderella was wearing. Cinderella's sisters try on the shoe but it doesn't fit. To make if fit, one sister cuts off her toes; the other cuts off her heel (пятка). Their mother says: "You won't need to walk when you become queen!"
 Eventually, the prince finds Cinderella and the story ends happily.
-Even if there is violence and cruelty in fairy stories, they all have elements that make them forever popular. They are simple stories which usually involve some form of cruelty or injustice. Good people become victims and must work impossibly hard to try to solve their problems and find happiness. Children who identify themselves with the hero or heroine may sometimes be encouraged to try to find solutions to their own problems. In any case, the stories have a happy ending and give children great pleasure.
+Even if there is violence and cruelty (насилие и жестокость) in fairy stories, they all have elements that make them forever popular. They are simple stories which usually involve some form of cruelty or injustice. Good people become victims (становятся жертвами) and must work impossibly hard to try to solve their problems and find happiness. Children who identify themselves with the hero or heroine may sometimes be encouraged (быть воодушевленным) to try to find solutions to their own problems. In any case, the stories have a happy ending and give children great pleasure.
+
+cruetly and violence - жестокость и насилие

+ 0 - 1
Untitled 1.canvas

@@ -1 +0,0 @@
-{}

+ 0 - 3
Untitled.base

@@ -1,3 +0,0 @@
-views:
-  - type: table
-    name: Table

+ 0 - 1
Untitled.canvas

@@ -1 +0,0 @@
-{}

+ 6 - 6
todo/Счета.md

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

+ 2 - 0
К1921ВГ015.md

@@ -0,0 +1,2 @@
+
+- Примеры https://gitflic.ru/project/rabidrabbit/k1921vg015_simple