unknown 1 주 전
부모
커밋
d98193cb9c
4개의 변경된 파일226개의 추가작업 그리고 14개의 파일을 삭제
  1. 55 12
      .obsidian/workspace.json
  2. 7 0
      ROTEK/allwinner 069 070.md
  3. 161 0
      STM32/Makefile template.md
  4. 3 2
      todo/Задачи по направлениям.md

+ 55 - 12
.obsidian/workspace.json

@@ -35,18 +35,60 @@
               "title": "allwinner 069 070"
             }
           },
+          {
+            "id": "8c3157d7ff9e4340",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "STM32/Makefile template.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "Makefile template"
+            }
+          },
+          {
+            "id": "b1e7d5846841bf8a",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "ROTEK/bt67xx/common.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "common"
+            }
+          },
+          {
+            "id": "55862c13e75634a8",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "todo/Разное.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "Разное"
+            }
+          },
           {
             "id": "62d39960a346776c",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "English/Homework/Homework 7.md",
+                "file": "ROTEK/bt67xx/common.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "Homework 7"
+              "title": "common"
             }
           },
           {
@@ -64,7 +106,7 @@
             }
           }
         ],
-        "currentTab": 2
+        "currentTab": 3
       }
     ],
     "direction": "vertical"
@@ -135,7 +177,7 @@
       }
     ],
     "direction": "horizontal",
-    "width": 200
+    "width": 283.5
   },
   "right": {
     "id": "cf92ccf43e96a53d",
@@ -194,15 +236,19 @@
       "markdown-importer:Open format converter": false
     }
   },
-  "active": "62d39960a346776c",
+  "active": "b1e7d5846841bf8a",
   "lastOpenFiles": [
-    "English/words.md",
-    "English/Homework/Homework 7.md",
+    "todo/Задачи по направлениям.md",
+    "ROTEK/bt67xx/common.md",
+    "todo/Разное.md",
+    "STM32/Makefile template.md",
     "ROTEK/allwinner 069 070.md",
+    "STM32/Makefile_template.txt",
+    "English/Homework/Homework 7.md",
+    "English/words.md",
     "ROTEK/Arbiter, artery.md",
     "ROTEK/Arbiter.md",
     "linux/linux common.md",
-    "todo/Задачи по направлениям.md",
     "English/img/29-10.jpg.~tmp",
     "English/img/29-9.jpg.~tmp",
     "English/img/29-8.jpg.~tmp",
@@ -223,7 +269,6 @@
     "English/img/29-1.jpg",
     "Python/venv.md",
     "todo/Счета.md",
-    "todo/Разное.md",
     "todo/Тренировки и занятия.md",
     "English/Homework/Homework 6.md",
     "hardcore web development/11. SQL/Создание таблиц.md",
@@ -238,8 +283,6 @@
     "hardcore web development/11. SQL/JOIN/INNER JOIN.md",
     "Комментарии.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"
+    "English/img/24-2.jpg.~tmp"
   ]
 }

+ 7 - 0
ROTEK/allwinner 069 070.md

@@ -8,6 +8,13 @@
 $ scp -O <my_file> root@192.168.10.244:/tmp
 ```
 
+~={yellow}Сборка проекта для Artery=~
+Rомпилятор **gcc-arm-none-eabi-7-2017-q4-major**
+```bash
+$ make fw HARDWARE=ARBITER_R
+```
+
+
 ~={yellow}Важное=~
 - Теперь повышающем преобразователем управляет Allwinner. Т.е. нужно вносить изменения в основной код. Раньше питание процессора обрубалось Artery.
 

+ 161 - 0
STM32/Makefile template.md

@@ -0,0 +1,161 @@
+```makefile
+# Copyright (c) 2016, James Jackson
+# All rights reserved.
+
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+TARGET	?= ledblink
+
+SERIAL_DEVICE ?= /dev/ttyUSB0
+
+#################################
+# GNU ARM Embedded Toolchain
+#################################
+CC=arm-none-eabi-gcc
+CXX=arm-none-eabi-g++
+LD=arm-none-eabi-ld
+AR=arm-none-eabi-ar
+AS=arm-none-eabi-as
+CP=arm-none-eabi-objcopy
+OD=arm-none-eabi-objdump
+NM=arm-none-eabi-nm
+SIZE=arm-none-eabi-size
+A2L=arm-none-eabi-addr2line
+
+#################################
+# Working directories
+#################################
+BREEZY_DIR = ../../../
+ROOT		 = .
+SRC_DIR		 = $(ROOT)
+CMSIS_DIR	 = $(BREEZY_DIR)/lib/CMSIS
+STDPERIPH_DIR	 = $(BREEZY_DIR)/lib/STM32F10x_StdPeriph_Driver
+OBJECT_DIR	 = $(ROOT)/obj
+BIN_DIR		 = $(ROOT)/obj
+
+
+#################################
+# Source Files
+#################################
+ASOURCES = $(BREEZY_DIR)/startup_stm32f10x_md_gcc.s
+
+VPATH		:= $(SRC_DIR):$(SRC_DIR)/startups
+
+# Search path and source files for the CMSIS sources
+VPATH		:= $(VPATH):$(CMSIS_DIR)/CM3/CoreSupport:$(CMSIS_DIR)/CM3/DeviceSupport/ST/STM32F10x
+CMSIS_SRC	 = $(notdir $(wildcard $(CMSIS_DIR)/CM3/CoreSupport/*.c \
+				       $(CMSIS_DIR)/CM3/DeviceSupport/ST/STM32F10x/*.c))
+
+# Search path and source files for the ST stdperiph library
+VPATH		:= $(VPATH):$(STDPERIPH_DIR)/src
+STDPERIPH_SRC	 = $(notdir $(wildcard $(STDPERIPH_DIR)/src/*.c))
+
+CSOURCES =  $(BREEZY_DIR)/drv_system_stm32f10x.c \
+	    $(BREEZY_DIR)/drv_uart_stm32f10x.c \
+	    $(BREEZY_DIR)/drv_gpio.c \
+	    $(BREEZY_DIR)/drv_i2c.c \
+	    $(BREEZY_DIR)/drv_adc.c \
+	    $(BREEZY_DIR)/drv_spi.c \
+	    $(BREEZY_DIR)/drv_pwm.c \
+	    $(BREEZY_DIR)/drv_serial.c \
+	    $(BREEZY_DIR)/drv_timer.c \
+	    $(BREEZY_DIR)/printf.c \
+	    $(CMSIS_SRC) \
+	    $(STDPERIPH_SRC)
+
+CXXSOURCES = $(ROOT)/ledblink.cpp \
+	     $(BREEZY_DIR)/main.cpp \
+
+INCLUDE_DIRS	 = $(SRC_DIR) \
+		   $(BREEZY_DIR) \
+		   $(STDPERIPH_DIR)/inc \
+		   $(CMSIS_DIR)/CM3/CoreSupport \
+		   $(CMSIS_DIR)/CM3/DeviceSupport/ST/STM32F10x
+
+
+#################################
+# Object List
+#################################
+OBJECTS=$(addsuffix .o,$(addprefix $(OBJECT_DIR)/$(TARGET),$(basename $(ASOURCES))))
+OBJECTS+=$(addsuffix .o,$(addprefix $(OBJECT_DIR)/$(TARGET),$(basename $(CSOURCES))))
+OBJECTS+=$(addsuffix .o,$(addprefix $(OBJECT_DIR)/$(TARGET),$(basename $(CXXSOURCES))))
+
+
+#################################
+# Target Output Files
+#################################
+TARGET_ELF=$(BIN_DIR)/$(TARGET).elf
+TARGET_HEX=$(BIN_DIR)/$(TARGET).hex
+
+
+#################################
+# Flags
+#################################
+MCFLAGS=-mcpu=cortex-m3 -mthumb
+OPTIMIZE = -Os
+DEFS=-DTARGET_STM32F10X_MD -D__CORTEX_M4 -D__FPU_PRESENT -DWORDS_STACK_SIZE=200 -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER
+CFLAGS=-c $(MCFLAGS) $(DEFS) $(OPTIMIZE) $(addprefix -I,$(INCLUDE_DIRS)) -std=c99
+CXXFLAGS=-c $(MCFLAGS) $(DEFS) $(OPTIMIZE) $(addprefix -I,$(INCLUDE_DIRS)) -std=c++11
+CXXFLAGS+=-U__STRICT_ANSI__
+LDSCRIPT=$(BREEZY_DIR)/stm32_flash.ld
+LDFLAGS =-T $(LDSCRIPT) $(MCFLAGS) -lm -nostartfiles -lc --specs=rdimon.specs $(ARCH_FLAGS)  $(LTO_FLAGS)  $(DEBUG_FLAGS) -static  -Wl,-gc-sections
+
+#################################
+# Build
+#################################
+$(TARGET_HEX): $(TARGET_ELF)
+	$(CP) -O ihex --set-start 0x8000000 $< $@
+
+$(TARGET_ELF): $(OBJECTS)
+	$(CXX) -o $@ $^ $(LDFLAGS)
+	$(SIZE) $(TARGET_ELF)
+
+$(BIN_DIR)/$(TARGET)%.o: %.cpp
+	@mkdir -p $(dir $@)
+	@echo %% $(notdir $<)
+	@$(CXX) -c -o $@ $(CXXFLAGS) $<
+
+$(BIN_DIR)/$(TARGET)%.o: %.c
+	@mkdir -p $(dir $@)
+	@echo %% $(notdir $<)
+	@$(CC) -c -o $@ $(CFLAGS) $<
+
+$(BIN_DIR)/$(TARGET)%.o: %.s
+	@mkdir -p $(dir $@)
+	@echo %% $(notdir $<)
+	@$(CC) -c -o $@ $(CFLAGS) $<
+
+
+#################################
+# Recipes
+#################################
+.PHONY: all flash clean
+
+clean:
+	rm -f $(OBJECTS) $(TARGET_ELF) $(TARGET_HEX) $(BIN_DIR)/output.map
+
+flash: $(TARGET_HEX)
+	stty -F $(SERIAL_DEVICE) raw speed 921600 -crtscts cs8 -parenb -cstopb -ixon
+	stm32flash -w $(TARGET_HEX) -v -g 0x0 -b 921600 $(SERIAL_DEVICE)
+
+all: $(TARGET_HEX)
+```

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

@@ -5,7 +5,7 @@
 - [x] Подкрутить верхнюю челюсть
 - [x] Покрасить змею
 - [x] Оплата счетов за апрель
-- [ ] Запись к ортодонту на конец мая
+- [x] Запись к ортодонту на конец мая
 - [ ] Навести порядок в таблице оплаты
 <h6>Работа и образование</h6>
 - [ ] Пройти на 100% курс по Python OOP.
@@ -28,10 +28,11 @@
 
 - [ ] Примерно в августе 2025 удалять верхний зуб мудрости. Позвонить Екатерине, она запишет к хирургу.
 - [x] Таня к врачу 29.04.25
+- [ ] Таня к ортодонту 26 мая понедельник к 14-30.
 <h6>Задачи по датам</h6>
 - [x] ~={yellow}Визит к ортодонту 11 февраля во вторник к 8-10=~
 - [x] Визит к ортодонту 8 апреля в 16:00, 57 кабинет Мидея Атариевна Хунзи
-- [ ] Визит к ортодонту в конце мая. Медея Отариевна Хундзия.  Записаться заранее.
+- [ ] Визит к ортодонту в конце мая. Медея Отариевна Хундзия (понедельник, вторник, среда). 
 
 ---
  <h6>Покупки и траты</h6>