Browse Source

V1025| 修复单片机启动失败的BUG,使能工程将WARNING 当作Error

master
zhaohe 4 months ago
parent
commit
777d0a52ba
  1. 15
      .cproject
  2. 4
      .settings/language.settings.xml
  3. 2
      sdk/chip/zgpio.cpp
  4. 340
      sdk/components/tmc/helpers/Functions.c
  5. 36
      sdk/components/tmc/helpers/Functions.h
  6. 2
      usrc/subboards/subboard90_optical_module/optical_module_v2.cpp
  7. 14
      usrc/sysmgr/sys_mgr.cpp
  8. 4
      usrc/sysmgr/sys_mgr.hpp
  9. 2
      usrc/version.h

15
.cproject

@ -63,6 +63,13 @@
<listOptionValue builtIn="false" value="../Core/ThreadSafe"/>
</option>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.languagestandard.249988768" name="Language standard" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.languagestandard" useByScannerDiscovery="true" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.languagestandard.value.gnu18" valueType="enumerated"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.treataserror.292276502" name="Treat warnings as errors (-Werror)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.treataserror" useByScannerDiscovery="false" value="true" valueType="boolean"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.fatal.1267491451" name="Abort compilation on first error (-Wfatal-errors)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.fatal" useByScannerDiscovery="false" value="false" valueType="boolean"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.conversion.887720562" name="Warn for implicit conversions (-Wconversion)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.conversion" useByScannerDiscovery="false" value="false" valueType="boolean"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.w_switch_enum.1284878485" name="Warn if switch is used on an enum type and the switch statement lacks case for some enumerations (-Wswitch-enum)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.w_switch_enum" useByScannerDiscovery="false" value="false" valueType="boolean"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.1913225581" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="true" valueType="stringList">
<listOptionValue builtIn="false" value=""/>
</option>
<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.330299437" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
</tool>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.344817877" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
@ -90,12 +97,18 @@
</option>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.languagestandard.1505174756" name="Language standard" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.languagestandard" useByScannerDiscovery="true" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.languagestandard.value.gnupp20" valueType="enumerated"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.otherflags.1130332628" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.otherflags" useByScannerDiscovery="true" valueType="stringList">
<listOptionValue builtIn="false" value="-Wno-format"/>
<listOptionValue builtIn="false" value="-Wno-volatile"/>
<listOptionValue builtIn="false" value="-Wno-sign-compare"/>
<listOptionValue builtIn="false" value="-Wno-unused-variable"/>
</option>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.nortti.782400078" name="Disable generation of information about every class with virtual functions (-fno-rtti)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.nortti" useByScannerDiscovery="false" value="false" valueType="boolean"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.noexceptions.1889107635" name="Disable handling exceptions (-fno-exceptions)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.noexceptions" useByScannerDiscovery="false" value="false" valueType="boolean"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.extra.1985092805" name="Enable extra warning flags (-Wextra)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.extra" useByScannerDiscovery="false" value="false" valueType="boolean"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.treataserror.1088023195" name="Treat warnings as errors (-Werror)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.treataserror" useByScannerDiscovery="false" value="true" valueType="boolean"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.conversion.1778668008" name="Warn for implicit conversions (-Wconversion)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.conversion" useByScannerDiscovery="false" value="false" valueType="boolean"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.w_switch_enum.61204989" name="Warn if switch is used on an enum type and the switch statement lacks case for some enumerations (-Wswitch-enum)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.w_switch_enum" useByScannerDiscovery="false" value="false" valueType="boolean"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.fatal.1265496643" name="Abort compilation on first error (-Wfatal-errors)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.fatal" useByScannerDiscovery="false" value="false" valueType="boolean"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.pedantic.835988282" name="Issue all warnings demanded by strict ISO C and ISO C++ (-pedantic)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.pedantic" useByScannerDiscovery="false" value="false" valueType="boolean"/>
<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp.54112860" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp"/>
</tool>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.163881313" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker"/>

4
.settings/language.settings.xml

@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1765539788296876828" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-1454925727642238918" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
@ -16,7 +16,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1838608738188432335" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-1381858352396115768" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>

2
sdk/chip/zgpio.cpp

@ -119,7 +119,7 @@ bool ZGPIO::enableClock(GPIO_TypeDef *port) {
return false;
}
bool ZGPIO::enableClock() { enableClock(m_gpio); }
bool ZGPIO::enableClock() { return enableClock(m_gpio); }
void regIRQGPIO(ZGPIO *gpio) {
for (int i = 0; i < s_irqGPIO_num; i++) {

340
sdk/components/tmc/helpers/Functions.c

@ -1,170 +1,170 @@
/*
* Functions.c
*
* Created on: 23.07.2018
* Author: ed
*/
#include "Functions.h"
int32_t tmc_limitInt(int32_t value, int32_t min, int32_t max)
{
if (value > max)
return max;
else if (value < min)
return min;
else
return value;
}
int64_t tmc_limitS64(int64_t value, int64_t min, int64_t max)
{
if (value > max)
return max;
else if (value < min)
return min;
else
return value;
}
/* lookup table for square root function */
static const unsigned char sqrttable[256] =
{
0, 16, 22, 27, 32, 35, 39, 42, 45, 48, 50, 53, 55, 57, 59, 61,
64, 65, 67, 69, 71, 73, 75, 76, 78, 80, 81, 83, 84, 86, 87, 89,
90, 91, 93, 94, 96, 97, 98, 99, 101, 102, 103, 104, 106, 107, 108, 109,
110, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
128, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
143, 144, 144, 145, 146, 147, 148, 149, 150, 150, 151, 152, 153, 154, 155, 155,
156, 157, 158, 159, 160, 160, 161, 162, 163, 163, 164, 165, 166, 167, 167, 168,
169, 170, 170, 171, 172, 173, 173, 174, 175, 176, 176, 177, 178, 178, 179, 180,
181, 181, 182, 183, 183, 184, 185, 185, 186, 187, 187, 188, 189, 189, 190, 191,
192, 192, 193, 193, 194, 195, 195, 196, 197, 197, 198, 199, 199, 200, 201, 201,
202, 203, 203, 204, 204, 205, 206, 206, 207, 208, 208, 209, 209, 210, 211, 211,
212, 212, 213, 214, 214, 215, 215, 216, 217, 217, 218, 218, 219, 219, 220, 221,
221, 222, 222, 223, 224, 224, 225, 225, 226, 226, 227, 227, 228, 229, 229, 230,
230, 231, 231, 232, 232, 233, 234, 234, 235, 235, 236, 236, 237, 237, 238, 238,
239, 240, 240, 241, 241, 242, 242, 243, 243, 244, 244, 245, 245, 246, 246, 247,
247, 248, 248, 249, 249, 250, 250, 251, 251, 252, 252, 253, 253, 254, 254, 255
};
int32_t tmc_sqrti(int32_t x)
{
int32_t xn;
// Negative parameter?
if (x < 0)
return -1;
if (x < 0x0100)
return (int) sqrttable[x] >> 4;
if (x >= 0x00010000)
{
if (x >= 0x01000000)
{
if (x >= 0x10000000)
{
if (x >= 0x40000000)
{
// 0x40000000 <= x < 0x7FFFFFFF
xn = (int) sqrttable[x >> 24] << 8;
}
else
{
// 0x10000000 <= x < 0x40000000
xn = (int) sqrttable[x >> 22] << 7;
}
}
else
{
if (x >= 0x04000000)
{
// 0x04000000 <= x < 0x10000000
xn = (int) sqrttable[x >> 20] << 6;
}
else
{
// 0x01000000 <= x < 0x04000000
xn = (int) sqrttable[x >> 18] << 5;
}
}
// Two steps of the babylonian method
xn = (xn + 1 + (x / xn)) >> 1;
xn = (xn + 1 + (x / xn)) >> 1;
}
else
{
if (x >= 0x00100000)
{
if (x >= 0x00400000)
{
// 0x00400000 <= x < 0x01000000
xn = (int) sqrttable[x >> 16] << 4;
}
else
{
// 0x00100000 <= x < 0x00400000
xn = (int) sqrttable[x >> 14] << 3;
}
}
else
{
if (x >= 0x00040000)
{
// 0x00040000 <= x < 0x00100000
xn = (int) sqrttable[x >> 12] << 2;
}
else
{
// 0x00010000 <= x < 0x00040000
xn = (int) sqrttable[x >> 10] << 1;
}
}
// One step of the babylonian method
xn = (xn + 1 + (x / xn)) >> 1;
}
}
else
{
if (x >= 0x1000)
{
if (x >= 0x4000)
{
// 0x4000 <= x < 0x00010000
xn = (int) (sqrttable[x >> 8] ) + 1;
}
else
{
// 0x1000 <= x < 0x4000
xn = (int) (sqrttable[x >> 6] >> 1) + 1;
}
}
else
{
if (x >= 0x0400)
{
// 0x0400 <= x < 0x1000
xn = (int) (sqrttable[x >> 4] >> 2) + 1;
}
else
{
// 0x0100 <= x < 0x0400
xn = (int) (sqrttable[x >> 2] >> 3) + 1;
}
}
}
// Make sure that our result is floored
if ((xn * xn) > x)
xn--;
return xn;
}
int32_t tmc_filterPT1(int64_t *akku, int32_t newValue, int32_t lastValue, uint8_t actualFilter, uint8_t maxFilter)
{
*akku += (newValue-lastValue) << (maxFilter-actualFilter);
return *akku >> maxFilter;
}
///*
// * Functions.c
// *
// * Created on: 23.07.2018
// * Author: ed
// */
//#include "Functions.h"
//
//int32_t tmc_limitInt(int32_t value, int32_t min, int32_t max)
//{
// if (value > max)
// return max;
// else if (value < min)
// return min;
// else
// return value;
//}
//
//int64_t tmc_limitS64(int64_t value, int64_t min, int64_t max)
//{
// if (value > max)
// return max;
// else if (value < min)
// return min;
// else
// return value;
//}
//
///* lookup table for square root function */
//static const unsigned char sqrttable[256] =
//{
// 0, 16, 22, 27, 32, 35, 39, 42, 45, 48, 50, 53, 55, 57, 59, 61,
// 64, 65, 67, 69, 71, 73, 75, 76, 78, 80, 81, 83, 84, 86, 87, 89,
// 90, 91, 93, 94, 96, 97, 98, 99, 101, 102, 103, 104, 106, 107, 108, 109,
// 110, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
// 128, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
// 143, 144, 144, 145, 146, 147, 148, 149, 150, 150, 151, 152, 153, 154, 155, 155,
// 156, 157, 158, 159, 160, 160, 161, 162, 163, 163, 164, 165, 166, 167, 167, 168,
// 169, 170, 170, 171, 172, 173, 173, 174, 175, 176, 176, 177, 178, 178, 179, 180,
// 181, 181, 182, 183, 183, 184, 185, 185, 186, 187, 187, 188, 189, 189, 190, 191,
// 192, 192, 193, 193, 194, 195, 195, 196, 197, 197, 198, 199, 199, 200, 201, 201,
// 202, 203, 203, 204, 204, 205, 206, 206, 207, 208, 208, 209, 209, 210, 211, 211,
// 212, 212, 213, 214, 214, 215, 215, 216, 217, 217, 218, 218, 219, 219, 220, 221,
// 221, 222, 222, 223, 224, 224, 225, 225, 226, 226, 227, 227, 228, 229, 229, 230,
// 230, 231, 231, 232, 232, 233, 234, 234, 235, 235, 236, 236, 237, 237, 238, 238,
// 239, 240, 240, 241, 241, 242, 242, 243, 243, 244, 244, 245, 245, 246, 246, 247,
// 247, 248, 248, 249, 249, 250, 250, 251, 251, 252, 252, 253, 253, 254, 254, 255
//};
//
//int32_t tmc_sqrti(int32_t x)
//{
// int32_t xn;
//
// // Negative parameter?
// if (x < 0)
// return -1;
//
// if (x < 0x0100)
// return (int) sqrttable[x] >> 4;
//
// if (x >= 0x00010000)
// {
// if (x >= 0x01000000)
// {
// if (x >= 0x10000000)
// {
// if (x >= 0x40000000)
// {
// // 0x40000000 <= x < 0x7FFFFFFF
// xn = (int) sqrttable[x >> 24] << 8;
// }
// else
// {
// // 0x10000000 <= x < 0x40000000
// xn = (int) sqrttable[x >> 22] << 7;
// }
// }
// else
// {
// if (x >= 0x04000000)
// {
// // 0x04000000 <= x < 0x10000000
// xn = (int) sqrttable[x >> 20] << 6;
// }
// else
// {
// // 0x01000000 <= x < 0x04000000
// xn = (int) sqrttable[x >> 18] << 5;
// }
// }
//
// // Two steps of the babylonian method
// xn = (xn + 1 + (x / xn)) >> 1;
// xn = (xn + 1 + (x / xn)) >> 1;
// }
// else
// {
// if (x >= 0x00100000)
// {
// if (x >= 0x00400000)
// {
// // 0x00400000 <= x < 0x01000000
// xn = (int) sqrttable[x >> 16] << 4;
// }
// else
// {
// // 0x00100000 <= x < 0x00400000
// xn = (int) sqrttable[x >> 14] << 3;
// }
// }
// else
// {
// if (x >= 0x00040000)
// {
// // 0x00040000 <= x < 0x00100000
// xn = (int) sqrttable[x >> 12] << 2;
// }
// else
// {
// // 0x00010000 <= x < 0x00040000
// xn = (int) sqrttable[x >> 10] << 1;
// }
// }
//
// // One step of the babylonian method
// xn = (xn + 1 + (x / xn)) >> 1;
// }
// }
// else
// {
// if (x >= 0x1000)
// {
// if (x >= 0x4000)
// {
// // 0x4000 <= x < 0x00010000
// xn = (int) (sqrttable[x >> 8] ) + 1;
// }
// else
// {
// // 0x1000 <= x < 0x4000
// xn = (int) (sqrttable[x >> 6] >> 1) + 1;
// }
// }
// else
// {
// if (x >= 0x0400)
// {
// // 0x0400 <= x < 0x1000
// xn = (int) (sqrttable[x >> 4] >> 2) + 1;
// }
// else
// {
// // 0x0100 <= x < 0x0400
// xn = (int) (sqrttable[x >> 2] >> 3) + 1;
// }
// }
// }
//
// // Make sure that our result is floored
// if ((xn * xn) > x)
// xn--;
//
// return xn;
//}
//
//int32_t tmc_filterPT1(int64_t *akku, int32_t newValue, int32_t lastValue, uint8_t actualFilter, uint8_t maxFilter)
//{
// *akku += (newValue-lastValue) << (maxFilter-actualFilter);
// return *akku >> maxFilter;
//}

36
sdk/components/tmc/helpers/Functions.h

@ -1,18 +1,18 @@
/*
* Functions.h
*
* Created on: 23.07.2018
* Author: ed
*/
#ifndef TMC_FUNCTIONS_H_
#define TMC_FUNCTIONS_H_
#include "API_Header.h"
int32_t tmc_limitInt(int32_t value, int32_t min, int32_t max);
int64_t tmc_limitS64(int64_t value, int64_t min, int64_t max);
int32_t tmc_sqrti(int32_t x);
int32_t tmc_filterPT1(int64_t *akku, int32_t newValue, int32_t lastValue, uint8_t actualFilter, uint8_t maxFilter);
#endif /* TMC_FUNCTIONS_H_ */
///*
// * Functions.h
// *
// * Created on: 23.07.2018
// * Author: ed
// */
//
//#ifndef TMC_FUNCTIONS_H_
//#define TMC_FUNCTIONS_H_
//
//#include "API_Header.h"
//
//int32_t tmc_limitInt(int32_t value, int32_t min, int32_t max);
//int64_t tmc_limitS64(int64_t value, int64_t min, int64_t max);
//int32_t tmc_sqrti(int32_t x);
//int32_t tmc_filterPT1(int64_t *akku, int32_t newValue, int32_t lastValue, uint8_t actualFilter, uint8_t maxFilter);
//
//#endif /* TMC_FUNCTIONS_H_ */

2
usrc/subboards/subboard90_optical_module/optical_module_v2.cpp

@ -405,7 +405,7 @@ int32_t OpticalModuleV2::start_barcode_scan(int32_t lasterGain, int32_t scanGain
int32_t OpticalModuleV2::dumpresult() {
for (int32_t i = 0; i < adc_capture_point_num; i++) {
printf("%d,%d", i, adc_capture_buf[i]);
printf("%ld,%d", i, adc_capture_buf[i]);
if (i != 0 && i % 5 == 0)
printf("\n");
else {

14
usrc/sysmgr/sys_mgr.cpp

@ -1,15 +1,15 @@
#include "sys_mgr.hpp"
#include "sdk/os/zos.hpp"
#include "project_configs.h"
#include <stdlib.h>
#include <string.h>
#include "project_configs.h"
#include "sdk/os/zos.hpp"
using namespace iflytop;
#define TAG "SysMgr"
extern "C" {
/***********************************************************************************************************************
@ -108,10 +108,11 @@ void SysMgr::osTaskName(osThreadId id, char* name, int bufsize) {
strncpy(name, pcTaskGetName(id), bufsize);
name[bufsize - 1] = 0;
}
void SysMgr::osTaskStackRemainingSize(osThreadId id, uint16_t* remainsize) { *remainsize = uxTaskGetStackHighWaterMark(id); }
void SysMgr::osTaskPriority(osThreadId id, uint16_t* priority) { *priority = uxTaskPriorityGet(id); }
void SysMgr::osTaskStackRemainingSize(osThreadId id, unsigned long* remainsize) { *remainsize = uxTaskGetStackHighWaterMark(id); }
void SysMgr::osTaskPriority(osThreadId id, unsigned long* priority) { *priority = uxTaskPriorityGet(id); }
void SysMgr::osTaskGetState(osThreadId id, char* state) {
eTaskState task_state = eTaskGetState(id);
switch (task_state) {
case eRunning:
*state = 'X';
@ -128,6 +129,9 @@ void SysMgr::osTaskGetState(osThreadId id, char* state) {
case eDeleted:
*state = 'D';
break;
case eInvalid:
*state = '?';
break;
default:
*state = '?';
break;

4
usrc/sysmgr/sys_mgr.hpp

@ -39,8 +39,8 @@ class SysMgr {
const char* osTaskName(osThreadId id);
void osTaskName(osThreadId id, char* name, int bufsize);
void osTaskStackRemainingSize(osThreadId id, uint16_t* remainsize);
void osTaskPriority(osThreadId id, uint16_t* priority);
void osTaskStackRemainingSize(osThreadId id, unsigned long* remainsize);
void osTaskPriority(osThreadId id, unsigned long* priority);
void osTaskGetState(osThreadId id, char* state);
int32_t getTaskNum();

2
usrc/version.h

@ -1,2 +1,2 @@
#pragma once
#define APP_VERSION 1024
#define APP_VERSION 1025
Loading…
Cancel
Save