ulog support done

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "src/printf"]
 	path = src/printf
-	url = https://github.com/mpaland/printf
+	url = https://gitlab.com/XuNeo/printf.git
+[submodule "src/app/ulog-noos"]
+	path = src/app/ulog-noos
+	url = https://gitlab.com/XuNeo/ulog-noos.git

.vscode/settings.json

@@ -19,6 +19,8 @@
         "functional": "c",
         "displed.h": "c",
         "menu.h": "c",
-        "hmi.h": "c"
+        "hmi.h": "c",
+        "syslog.h": "c",
+        "ulog.h": "c"
     },
 }

src/MDK/AD5791Ref.uvoptx

@@ -120,9 +120,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>DLGUARM</Key>
-          <Name>燩鷙愞b
-燩鷙愞b
-</Name>
+          <Name>燩鷙</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -165,7 +163,7 @@
         <Ww>
           <count>0</count>
           <WinNumber>1</WinNumber>
-          <ItemText>pstr</ItemText>
+          <ItemText>log_buf</ItemText>
         </Ww>
         <Ww>
           <count>1</count>
@@ -211,8 +209,8 @@
       <MemoryWindow1>
         <Mm>
           <WinNumber>1</WinNumber>
-          <SubType>2</SubType>
-          <ItemText>0x8006000</ItemText>
+          <SubType>8</SubType>
+          <ItemText>0x20000438</ItemText>
           <AccSizeX>0</AccSizeX>
         </Mm>
       </MemoryWindow1>
@@ -779,7 +777,7 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\app\ulog\ulog.c</PathWithFileName>
+      <PathWithFileName>..\app\ulog-noos\ulog.c</PathWithFileName>
       <FilenameWithoutPath>ulog.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
@@ -791,7 +789,7 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\app\ulog\backend\console_be.c</PathWithFileName>
+      <PathWithFileName>..\app\ulog-noos\backend\console_be.c</PathWithFileName>
       <FilenameWithoutPath>console_be.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>

src/MDK/AD5791Ref.uvprojx

@@ -49,7 +49,7 @@
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
           <OutputDirectory>.\OUT\</OutputDirectory>
-          <OutputName>PowerV7</OutputName>
+          <OutputName>ad5791-ref</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>1</CreateHexFile>
@@ -336,9 +336,9 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls>--preinclude ..\stm32f0xx_conf.h </MiscControls>
-              <Define>STM32F030,USE_STDPERIPH_DRIVER,M_PI=3.14159265358979f</Define>
+              <Define>STM32F030,USE_STDPERIPH_DRIVER,M_PI=3.14159265358979f,__CLK_TCK=100</Define>
               <Undefine></Undefine>
-              <IncludePath>..\..\stm32f0xxlib\CMSIS\Device\ST\STM32F0xx\Include;..\..\stm32f0xxlib\STM32F0xx_StdPeriph_Driver\inc;..\..\src;..\..\src\app;..\..\src\bsp;..\printf;..\app\ulog;..\app\ulog\syslog</IncludePath>
+              <IncludePath>..\..\stm32f0xxlib\CMSIS\Device\ST\STM32F0xx\Include;..\..\stm32f0xxlib\STM32F0xx_StdPeriph_Driver\inc;..\..\src;..\..\src\app;..\..\src\bsp;..\printf;..\app\ulog-noos</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -595,12 +595,12 @@
             <File>
               <FileName>ulog.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\app\ulog\ulog.c</FilePath>
+              <FilePath>..\app\ulog-noos\ulog.c</FilePath>
             </File>
             <File>
               <FileName>console_be.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\app\ulog\backend\console_be.c</FilePath>
+              <FilePath>..\app\ulog-noos\backend\console_be.c</FilePath>
             </File>
           </Files>
         </Group>

src/Makefile

@@ -7,35 +7,39 @@ LDSCRIPT    := ./STM32F030F4.ld
 SOURCE      := $(wildcard ./*.c)
 SOURCE      += $(wildcard ./bsp/*.c)
 SOURCE      += $(wildcard ./app/*.c)
+SOURCE      += $(wildcard ./app/ulog-noos/*.c)
+SOURCE      += $(wildcard ./app/ulog-noos/backend/*.c)
 SOURCE      += $(wildcard ./printf/*.c)
 SOURCE      += $(wildcard ../stm32f0xxlib/STM32F0xx_StdPeriph_Driver/src/*.c)
 
 SOURCE_ASM  := ../src/startup_stm32f030.s
 
 INC_DIR     := -I./
 INC_DIR     += -I../src
-INC_DIR 		+= -I../stm32f0xxlib/CMSIS/Include
-INC_DIR 		+= -I../stm32f0xxlib/CMSIS/Device/ST/STM32F0xx/Include
-INC_DIR 		+= -I../stm32f0xxlib/STM32F0xx_StdPeriph_Driver/inc
-INC_DIR 		+= -I./app
-INC_DIR 		+= -I./bsp
-INC_DIR 		+= -I./printf
-INC_DIR 		+= --include ./stm32f0xx_conf.h
+INC_DIR		+= -I../stm32f0xxlib/CMSIS/Include
+INC_DIR		+= -I../stm32f0xxlib/CMSIS/Device/ST/STM32F0xx/Include
+INC_DIR		+= -I../stm32f0xxlib/STM32F0xx_StdPeriph_Driver/inc
+INC_DIR		+= -I./app
+INC_DIR		+= -I./app/ulog-noos
+INC_DIR 	+= -I./bsp
+INC_DIR 	+= -I./printf
+INC_DIR 	+= --include ./stm32f0xx_conf.h
 
 CC          = arm-none-eabi-gcc
 AS          = arm-none-eabi-as
 LD          = arm-none-eabi-gcc
 AR          = arm-none-eabi-ar
 OBJCP       = arm-none-eabi-objcopy
-OBJDUMP			= arm-none-eabi-objdump
+OBJDUMP		= arm-none-eabi-objdump
+SIZE		= arm-none-eabi-size
 
-CCFLAGS			:= -D STM32F030 -D USE_STDPERIPH_DRIVER
-CCFLAGS     += $(CPU_FLAG) -Wall -g '-std=gnu99' -O2 -fno-common 
+CCFLAGS		:= -D STM32F030 -D USE_STDPERIPH_DRIVER
+CCFLAGS     += $(CPU_FLAG) -Wall -g '-std=gnu99' -Os -fno-common -ffunction-sections
 CCFLAGS     += $(INC_DIR)
 ASFLAGS     += $(CPU_FLAG) #-Wall
 
-LDFLAGS     := -T $(LDSCRIPT) -nostartfiles -Wl,--gc-sections
-LDFLAGS 		+= $(CPU_FLAG) -Xlinker -Map=$(PROJECT).map
+LDFLAGS     := -T $(LDSCRIPT) -nostartfiles -Wl,--gc-sections --specs=nosys.specs
+LDFLAGS		+= $(CPU_FLAG) -Xlinker -Map=$(PROJECT).map
 
 C_OBJS      := $(SOURCE:%.c=%.o)
 ASM_OBJS    := $(SOURCE_ASM:%.s=%.o)
@@ -44,7 +48,7 @@ COMPILE     = $(CC) $(CCFLAGS) -c $< -o $@
 ASSEMBLE    = $(AS) $(ASFLAGS) -c $< -o $@ 
 LINK        = $(LD) $+ $(LDFLAGS) $(LDLIBS) -o $@ 
 
-.PHONY: all clean printf
+.PHONY: all clean
 
 all: $(PROJECT).bin
 	@echo "build done"
@@ -53,6 +57,7 @@ $(PROJECT).bin: $(PROJECT).elf
 	@$(OBJDUMP) -S $(PROJECT).elf > $(PROJECT).list
 	$(OBJCP) -Oihex $(PROJECT).elf $(PROJECT).hex
 	$(OBJCP) -Obinary $(PROJECT).elf $(PROJECT).bin
+	@$(SIZE) --format=Berkeley $(PROJECT).elf
 
 $(PROJECT).elf: $(C_OBJS) $(ASM_OBJS)
 	@$(LINK)
@@ -61,7 +66,7 @@ $(C_OBJS):%.o:%.c
 	@$(COMPILE)
 
 $(ASM_OBJS):%.o:%.s
-	$(ASSEMBLE) 
+	@$(ASSEMBLE) 
 
 clean:
 	rm -f $(C_OBJS) $(ASM_OBJS)

src/app/displed.c

@@ -3,6 +3,10 @@
 #include "uart.h"
 #include "ush.h"
 
+#define LOG_TAG              "led"
+#define LOG_LVL              LOG_LVL_DBG
+#include <ulog.h>
+
 #define CMD_SETBLINK        1       //start which led(s) to blink
 #define CMD_SETBLINK_SPEED  2       //set the blink speed
 #define CMD_SETCONTRASTA    3       //set the contrast level
@@ -151,5 +155,7 @@ void displed_init(void){
   displed_addfont('v', LEDSEGC|LEDSEGD|LEDSEGE);
   displed_addfont('U', LEDSEGA|LEDSEGB|LEDSEGC|LEDSEGD|LEDSEGE);
 	displed_str("10.123456");
+  LOG_I("STM8-LED initialized.");
+  //ulog_i("led", "STM8-LED initialized.");
 }
 USH_REGISTER(displed_init, ledinit, re-init the led);