unknown 3 недель назад
Родитель
Сommit
44bcda322d
3 измененных файлов с 70 добавлено и 40 удалено
  1. 20 6
      .obsidian/workspace.json
  2. 34 34
      English/Homework/Homework 11.md
  3. 16 0
      Greenstar/ethernet stm32.md

+ 20 - 6
.obsidian/workspace.json

@@ -20,6 +20,20 @@
               "icon": "lucide-file",
               "title": "Homework 11"
             }
+          },
+          {
+            "id": "c7bcd820d11926a1",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "ROTEK/bt67xx/6721 fix.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "6721 fix"
+            }
           }
         ]
       }
@@ -152,16 +166,20 @@
       "bases:Create new base": false
     }
   },
-  "active": "c7584343712d3d31",
+  "active": "8970e6c5f5d1271c",
   "lastOpenFiles": [
     "ROTEK/bt67xx/6721 fix.md",
     "English/Homework/Homework 11.md",
+    "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",
-    "Greenstar/ethernet stm32.md",
     "linux/linux common.md",
     "ROTEK/allwinner 069 070.md",
     "Кодинг.md",
@@ -177,10 +195,6 @@
     "ROTEK/metrolog/readme.md",
     "English/Texts/Text 11.md",
     "FlyElectronics/Drone.md",
-    "FlyElectronics/Tuber.md",
-    "English/Homework/Homework 10.md",
-    "English/Homework/Homework 9.md",
-    "English/Homework/Homework 2.md",
     "English/img/43-5.jpg",
     "English/img/43-4.jpg",
     "English/img/43-3.jpg",

+ 34 - 34
English/Homework/Homework 11.md

@@ -240,41 +240,41 @@
 12. The girl who I gave the flowers, has a cheerful charecter.
 
 ~={green}229. Вставь подходящее относительное местоимение.=~
-1. London, which is the capital of England, is siruated on the river Thames.
-2. A volcano __ spews out lava is a big danger.
-3. The rail tunnel __ connects Great-Britain with the mainland was built in the late 20th century.
-4. The exercise __ you are doing now, shouldn't be too difficult for you to complete.
-5. The chair on __ you are sitting was made by my grandfather.
-6. The ballet __ I saw last night was by Prokofiev.
-7. The pen __ I'm writing with I got from my best friend.
-8. The platform form __ your train is leaving is number 14.
-9. Last night we watched a film __ was very silly.
-10. The man __ we visited last week is an uncle of mine.
-11. He didn't tell me the truth, __ I don't like at all.
-12. Belarus, __ has a population of over 10 million, is siruated in the middle of Europe.
+1. London, which is the capital of England, is siеuated on the river Thames.
+2. A volcano which spews out lava is a big danger.
+3. The rail tunnel which connects Great-Britain with the mainland was built in the late 20th century.
+4. The exercise which you are doing now, shouldn't be too difficult for you to complete.
+5. The chair on which you are sitting was made by my grandfather.
+6. The ballet which I saw last night was by Prokofiev.
+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.
+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 __ she bought was very cheap.
-2. This is Mr. Brown __ we spoke to yesterday.
-3. The pupils __ compositions were to be handed in the next day, were all working in the library.
-4. What's the name of that film producer __ film you were watching last night?
-5. Nelly said that there's a film on at the cinema __ we might enjoy.
-6. Do you know the woman __ owns the shop?
-7. This is my neighbour Alexander, __ wife works as a medical doctor.
-8. Is this all __ is left of your money?
-9. Is she the woman __ won the lottery last week?
-10. I like people __ have a positive outlook on life.
+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.
+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?
+10. I like people who have a positive outlook on life.
 
 ~={green}231. Исправь ошибку.=~
-1. That which is the girl who bought Ted's car.
-2. John, whom daughter lives next door, works in the hospital.
-3. That's the man which works in the bank.
-4. This is the house where was broken into last night.
-5. The tiger is an animal whom can be found in India.
-6. George is a mechanic which fixed our car.
-7. This is Jane who's sister you met yesterday.
-8. An alarm clock is something when wakes you up in the morning.
-9. This is Neil Adams what is the new computer technician.
-10. Chinese is the lanfuage because is spoken in Taiwan.
-11. The pencil who is on your desk is mine.
-12. The nam whose was arrested by the police is a burglar.
+1. That is the girl who bought Ted's car.
+2. John, whom 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.
+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.

+ 16 - 0
Greenstar/ethernet stm32.md

@@ -95,6 +95,22 @@ MSS - это самая большая порция данных, которую
 В программе необходимо нажать кнопку "Choose" и выбрать образ iap.dfu. Далее нажать кнопку "Upgrade". В память контроллера будет загружен образ. Далее нужно повторить эти действия, но уже для образа fw.dfu.
 По завершению загрузки образов нажать кнопку "Leave DFU mode". Спектрометр готов к работе.
 
+#### Удаленное обновление.
+
+В этом случае после получения специального запроса (см. запрос SetUpdate) спектрометр сделает попытку подключиться к удаленному серверу и скачать файл с прошивкой. После скачивания и успешной проверки контрольной суммы файла, контроллер перезагрузится, перейдет в загрузчик и обновит прошивку. Далее загрузится в обычном режиме.
+
+На удаленном сервере должна быть запущена программа update_server.exe. При запуске указать TCP порт, на который будут приходить HTTP запросы от спектрометра.
+
+```bash
+$ ./update_server.exe 8000
+```
+
+Файл новой прошивки (fw.bin) должен располагать в директории /store относительно программы update_server.exe. Имя файла должно быть только таким.
+Исходный код и исполняемый файл программы располагаются в /tools/update_server/.
+
+Файлы прошивок с разными версиями лежат в /tools/update_server/store/. 
+Важно! Перед тестированием обновления не забыть переименовать файл с нужной версией прошивки в "fw.bin".
+
 ### Дополнительные HTTP-запросы
 
 - Версия прошивки спектрометра добавлена в запрос "getInfo" в поле "fw_ver".