diff --git a/.cproject b/.cproject
index 7bff557..33b3af8 100644
--- a/.cproject
+++ b/.cproject
@@ -28,7 +28,7 @@
-
+
-
+
@@ -209,16 +209,16 @@
-
+
-
+
-
+
diff --git a/.project b/.project
index 085a4d5..8f177a2 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
- zapp
+ high_power_ctrl_prj
diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index 089a477..0c64d05 100644
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 6a8db16..bea4761 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -3,88 +3,21 @@
{
"name": "app",
"includePath": [
- "Drivers/STM32F4xx_HAL_Driver/Inc",
- "Drivers/CMSIS/Include",
- "./",
"./Core/Inc",
- "Drivers/CMSIS/Device/ST/STM32F4xx/Include/"
+ "./Drivers/STM32F4xx_HAL_Driver/Inc",
+ "./Drivers/STM32F4xx_HAL_Driver/Inc/Legacy",
+ "./Drivers/CMSIS/Device/ST/STM32F4xx/Include",
+ "./Drivers/CMSIS/Include",
+ "C:/ST/STM32CubeIDE_1.13.0/STM32CubeIDE/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.11.3.rel1.win32_1.1.0.202305231506/tools/arm-none-eabi/include",
+ "./usrc/",
+ "./"
],
"defines": [
+ "DEBUG",
"USE_HAL_DRIVER",
- "STM32F407xx",
- "__CC_ARM",
- "__arm__",
- "__align(x)=",
- "__ALIGNOF__(x)=",
- "__alignof__(x)=",
- "__asm(x)=",
- "__forceinline=",
- "__restrict=",
- "__global_reg(n)=",
- "__inline=",
- "__int64=long long",
- "__INTADDR__(expr)=0",
- "__irq=",
- "__packed=",
- "__pure=",
- "__smc(n)=",
- "__svc(n)=",
- "__svc_indirect(n)=",
- "__svc_indirect_r7(n)=",
- "__value_in_regs=",
- "__weak=",
- "__writeonly=",
- "__declspec(x)=",
- "__attribute__(x)=",
- "__nonnull__(x)=",
- "__register=",
- "__breakpoint(x)=",
- "__cdp(x,y,z)=",
- "__clrex()=",
- "__clz(x)=0U",
- "__current_pc()=0U",
- "__current_sp()=0U",
- "__disable_fiq()=",
- "__disable_irq()=",
- "__dmb(x)=",
- "__dsb(x)=",
- "__enable_fiq()=",
- "__enable_irq()=",
- "__fabs(x)=0.0",
- "__fabsf(x)=0.0f",
- "__force_loads()=",
- "__force_stores()=",
- "__isb(x)=",
- "__ldrex(x)=0U",
- "__ldrexd(x)=0U",
- "__ldrt(x)=0U",
- "__memory_changed()=",
- "__nop()=",
- "__pld(...)=",
- "__pli(...)=",
- "__qadd(x,y)=0",
- "__qdbl(x)=0",
- "__qsub(x,y)=0",
- "__rbit(x)=0U",
- "__rev(x)=0U",
- "__return_address()=0U",
- "__ror(x,y)=0U",
- "__schedule_barrier()=",
- "__semihost(x,y)=0",
- "__sev()=",
- "__sqrt(x)=0.0",
- "__sqrtf(x)=0.0f",
- "__ssat(x,y)=0",
- "__strex(x,y)=0U",
- "__strexd(x,y)=0",
- "__strt(x,y)=",
- "__swp(x,y)=0U",
- "__usat(x,y)=0U",
- "__wfe()=",
- "__wfi()=",
- "__yield()=",
- "__vfp_status(x,y)=0"
+ "STM32F407xx"
],
+ "compilerPath": "C:/ST/STM32CubeIDE_1.13.0/STM32CubeIDE/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.11.3.rel1.win32_1.1.0.202305231506/tools/bin/arm-none-eabi-g++.exe",
"intelliSenseMode": "${default}"
}
],
diff --git a/zapp.ioc b/high_power_ctrl_prj.ioc
similarity index 98%
rename from zapp.ioc
rename to high_power_ctrl_prj.ioc
index b9e80d4..c07d331 100644
--- a/zapp.ioc
+++ b/high_power_ctrl_prj.ioc
@@ -152,8 +152,8 @@ ProjectManager.MainLocation=Core/Src
ProjectManager.NoMain=false
ProjectManager.PreviousToolchain=STM32CubeIDE
ProjectManager.ProjectBuild=false
-ProjectManager.ProjectFileName=zapp.ioc
-ProjectManager.ProjectName=zapp
+ProjectManager.ProjectFileName=high_power_ctrl_prj.ioc
+ProjectManager.ProjectName=high_power_ctrl_prj
ProjectManager.ProjectStructure=
ProjectManager.RegisterCallBack=
ProjectManager.StackSize=0x1000
diff --git a/zapp.launch b/high_power_ctrl_prj.launch
similarity index 95%
rename from zapp.launch
rename to high_power_ctrl_prj.launch
index b284c63..3ac3968 100644
--- a/zapp.launch
+++ b/high_power_ctrl_prj.launch
@@ -12,7 +12,7 @@
-
+
@@ -46,7 +46,7 @@
-
+
@@ -80,13 +80,13 @@
-
-
+
+
-
+
diff --git a/usrc/main.cpp b/usrc/main.cpp
index 84af837..16addf4 100644
--- a/usrc/main.cpp
+++ b/usrc/main.cpp
@@ -108,7 +108,7 @@ void Main::run() {
};
ZHALCORE::getInstance()->initialize(oscfg);
- ZLOGI(TAG, "zapp:%s", VERSION);
+ ZLOGI(TAG, "high_power_ctrl_prj:%s", VERSION);
debuglight.initAsOutput(DEBUG_LIGHT_GPIO, ZGPIO::kMode_nopull, false, false);
ZHAL_CORE_REG(200, { debuglight.toggleState(); });