sundp
/
STS_RR_R125
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

PB3 PB5 exchange

This commit is contained in:
Yunhorn 2024-04-08 18:14:35 +08:00
parent 371c9ea497
commit ee0b30a2e6
13 changed files with 4521 additions and 32810 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -35,7 +35,6 @@
*.app
*.i*86
*.x86_64
*.hex
# Debug files
*.dSYM/

70
Core/Inc/main.h
View File

@ -131,70 +131,70 @@ void MX_TOF_Init(void);
/* | | | */
/* | TOF-2 | TOF-1 | */
/* -------------------- | ------------------ | */
/* U4, PA-9 | U3, PB-3 | */
/* U4, PA-9 | U3, PB-5 | */
/* TOF_1, U3 RIGHT CORNER, PB-3 */
/* TOF_1, U3 RIGHT CORNER, PB-5 */
#if defined(TOF_1)&& defined(STM32WLE5xx)
#define TOF_C_INT_Pin GPIO_PIN_5
#define TOF_C_INT_GPIO_Port GPIOB
#define TOF_C_INT_EXTI_IRQn EXTI9_5_IRQn
#define TOF_C_XSHUT_Pin GPIO_PIN_3
#define TOF_C_XSHUT_GPIO_Port GPIOB
#if defined(TOF_1) //&& defined(STM32WLE5xx)
#define TOF_C_INT_Pin GPIO_PIN_3 // 2024-04-08 WAS GPIO_PIN_5
#define TOF_C_INT_GPIO_Port GPIOB
#define TOF_C_INT_EXTI_IRQn EXTI3_IRQn // 2024-04-08 WAS EXTI9_5_IRQn
#define TOF_C_XSHUT_Pin GPIO_PIN_5 // 2024-04-08 WAS GPIO_PIN_3
#define TOF_C_XSHUT_GPIO_Port GPIOB
#endif
// Common Shared Int Pin and Port for VL53L0X
#define TOF_INT_EXTI_PIN GPIO_PIN_5 //TOF_C_INT_Pin
#define TOF_INT_EXTI_PORT GPIOB //TOF_C_INT_GPIO_Port
#define TOF_INT_EXTI_PIN GPIO_PIN_3 // 2024-04-08 WAS GPIO_PIN_5 //TOF_C_INT_Pin
#define TOF_INT_EXTI_PORT GPIOB //TOF_C_INT_GPIO_Port
/* TOF_2, */
#if defined(TOF_2) && defined(STM32WL55xx)
#define TOF_L_INT_Pin GPIO_PIN_7
#define TOF_L_INT_GPIO_Port GPIOC
#define TOF_L_INT_EXTI_IRQn EXTI9_5_IRQn
#define TOF_L_XSHUT_Pin GPIO_PIN_10
#define TOF_L_XSHUT_GPIO_Port GPIOB
#define TOF_L_INT_Pin GPIO_PIN_7
#define TOF_L_INT_GPIO_Port GPIOC
#define TOF_L_INT_EXTI_IRQn EXTI9_5_IRQn
#define TOF_L_XSHUT_Pin GPIO_PIN_10
#define TOF_L_XSHUT_GPIO_Port GPIOB
#endif
/* TOF_2, U4 LEFT CORNER, PA-9 */
#if defined(TOF_1) && defined(STM32WLE5xx)
#define TOF_L_INT_Pin GPIO_PIN_5
#define TOF_L_INT_GPIO_Port GPIOB
#define TOF_L_INT_EXTI_IRQn EXTI9_5_IRQn
#define TOF_L_XSHUT_Pin GPIO_PIN_9
#define TOF_L_XSHUT_GPIO_Port GPIOA
#if defined(TOF_2) && defined(STM32WLE5xx)
#define TOF_L_INT_Pin GPIO_PIN_3 // 2024-04-08 WAS GPIO_PIN_5
#define TOF_L_INT_GPIO_Port GPIOB
#define TOF_L_INT_EXTI_IRQn EXTI3_IRQn // 2024-04-08 WAS EXTI9_5_IRQn
#define TOF_L_XSHUT_Pin GPIO_PIN_9
#define TOF_L_XSHUT_GPIO_Port GPIOA
#endif
/* TOF_3 */
#if defined(STM32WL55xx)&& defined(TOF_3)
#define TOF_R_INT_Pin GPIO_PIN_10
#define TOF_R_INT_GPIO_Port GPIOA
#define TOF_R_INT_EXTI_IRQn EXTI15_10_IRQn
#define TOF_R_XSHUT_Pin GPIO_PIN_5
#define TOF_R_XSHUT_GPIO_Port GPIOB
#define TOF_R_INT_Pin GPIO_PIN_10
#define TOF_R_INT_GPIO_Port GPIOA
#define TOF_R_INT_EXTI_IRQn EXTI15_10_IRQn
#define TOF_R_XSHUT_Pin GPIO_PIN_5
#define TOF_R_XSHUT_GPIO_Port GPIOB
#endif
/* TOF_3 */
#if defined(STM32WLE5xx)&& defined(TOF_3)
#define TOF_R_INT_Pin GPIO_PIN_5
#define TOF_R_INT_GPIO_Port GPIOB
#define TOF_R_INT_EXTI_IRQn EXTI9_5_IRQn
#define TOF_R_XSHUT_Pin GPIO_PIN_10
#define TOF_R_XSHUT_GPIO_Port GPIOA
#define TOF_R_INT_Pin GPIO_PIN_3 // 2024-04-08 WAS GPIO_PIN_5
#define TOF_R_INT_GPIO_Port GPIOB
#define TOF_R_INT_EXTI_IRQn EXTI3_IRQn // 2024-04-08 WAS EXTI9_5_IRQn
#define TOF_R_XSHUT_Pin GPIO_PIN_10
#define TOF_R_XSHUT_GPIO_Port GPIOA
#endif
#if defined(SOAP_LEVEL_SENSOR)
/* IF_SOAP_IN, MEMS_IF_3, PA10 */
#define SOAP_STATUS_Pin GPIO_PIN_10
#define SOAP_STATUS_GPIO_Port GPIOA
#define SOAP_STATUS_Pin GPIO_PIN_10
#define SOAP_STATUS_GPIO_Port GPIOA
/* IF_SENSOR_ON_OFF, MEMS_IF_1, PB3 */
#define SOAP_SWITCH_Pin GPIO_PIN_3
#define SOAP_SWITCH_GPIO_Port GPIOB
#define SOAP_SWITCH_Pin GPIO_PIN_5 // 2024-04-08 WAS GPIO_PIN_3
#define SOAP_SWITCH_GPIO_Port GPIOB
#define SOAP_DATA HAL_GPIO_ReadPin(SOAP_STATUS_GPIO_Port,SOAP_STATUS_Pin)
#endif

6
Core/Inc/sys_conf.h
View File

@ -47,12 +47,12 @@ extern "C" {
/**
* @brief Verbose level for all trace logs
*/
#define VERBOSE_LEVEL VLEVEL_M
#define VERBOSE_LEVEL VLEVEL_OFF
/**
* @brief Enable trace logs
*/
#define APP_LOG_ENABLED 1
#define APP_LOG_ENABLED 0
/**
* @brief Activate monitoring (probes) of some internal RF signals for debug purpose
@ -75,7 +75,7 @@ extern "C" {
* @brief Enable/Disable MCU Debugger pins (dbg serial wires)
* @note by HW serial wires are ON by default, need to put them OFF to save power
*/
#define DEBUGGER_ENABLED 1
#define DEBUGGER_ENABLED 0
/**
* @brief Disable Low Power mode

6
Core/Inc/yunhorn_sts_prd_conf.h
View File

@ -233,9 +233,9 @@
#define MajorVer 23U
#define MinorVer 11U
#define SubMinorVer 18U
#define MajorVer 24U
#define MinorVer 4U
#define SubMinorVer 8U
#define FirmwareVersion 3U
#define YUNHORN_STS_MAX_NVM_CFG_SIZE 64U
#define YUNHORN_STS_AC_CODE_SIZE 20U

4
STM32CubeIDE/.cproject
View File

@ -26,7 +26,7 @@
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1155291299" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="NUCLEO-WL55JC1" valueType="string"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.2103610047" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.5 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || NUCLEO-WL55JC1 || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../LoRaWAN/Target | ../../../../../../../Utilities/misc | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Utilities/sequencer | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages | ../../LoRaWAN/App | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Utilities/timer | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../Drivers/CMSIS/Include || || || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 || || || || || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure || || secure_nsclib.o || || None || " valueType="string"/>
<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.611324519" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
<builder buildPath="${workspace_loc:/LoRaWAN_End_Node}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.216780214" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="GNU Make 构建器" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
<builder buildPath="${workspace_loc:/LoRaWAN_End_Node}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.216780214" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.288747390" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.344559782" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.137102589" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" valueType="definedSymbols">
@ -129,7 +129,7 @@
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.convertbinary.1339425071" name="Convert to binary file (-O binary)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.convertbinary" useByScannerDiscovery="false" value="true" valueType="boolean"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex.371677536" name="Convert to Intel Hex file (-O ihex)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex" useByScannerDiscovery="false" value="true" valueType="boolean"/>
<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.504306143" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
<builder buildPath="${workspace_loc:/LoRaWAN_End_Node}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.820311016" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="GNU Make 构建器" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
<builder buildPath="${workspace_loc:/LoRaWAN_End_Node}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.820311016" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1121803732" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1317616676" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1232841293" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>

4
STM32CubeIDE/.settings/language.settings.xml
View File

@ -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="-752586124573436390" 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="188690963369024153" 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="-752586124573436390" 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="188690963369024153" 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>

5
STM32CubeIDE/.settings/stm32cubeide.project.prefs
View File

@ -1,3 +1,4 @@
8DF89ED150041C4CBC7CB9A9CAA90856=1E8F1D9EDF5EB0F4ACFD485842648E9C
DC22A860405A8BF2F2C095E5B6529F12=EAC6FC6468FD9889D03DF8A29B68CCA9
2F62501ED4689FB349E356AB974DBE57=0886257CDC7421405ED752F51B92C86D
8DF89ED150041C4CBC7CB9A9CAA90856=0886257CDC7421405ED752F51B92C86D
DC22A860405A8BF2F2C095E5B6529F12=74CD6EB106FB50B767E4FE71225C7638
eclipse.preferences.version=1

BIN
STM32CubeIDE/Release/STS_O5_JP_2024_04_08.bin Normal file
View File

Binary file not shown.

4466
STM32CubeIDE/Release/STS_O5_JP_2024_04_08.hex Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
STM32CubeIDE/Release/STS_RR_R125-YUNHORN-MASTER.bin
View File

Binary file not shown.

32756
STM32CubeIDE/Release/STS_RR_R125-YUNHORN-MASTER.list
View File

File diff suppressed because it is too large Load Diff

10
STM32CubeIDE/STM32WLE5CCUX_FLASH.ld
View File

@ -86,13 +86,13 @@ SECTIONS
. = ALIGN(4);
} >FLASH
.ARM.extab : {
.ARM.extab (READONLY) : {
. = ALIGN(4);
*(.ARM.extab* .gnu.linkonce.armextab.*)
. = ALIGN(4);
} >FLASH
.ARM : {
.ARM (READONLY): {
. = ALIGN(4);
__exidx_start = .;
*(.ARM.exidx*)
@ -100,7 +100,7 @@ SECTIONS
. = ALIGN(4);
} >FLASH
.preinit_array :
.preinit_array (READONLY) :
{
. = ALIGN(4);
PROVIDE_HIDDEN (__preinit_array_start = .);
@ -109,7 +109,7 @@ SECTIONS
. = ALIGN(4);
} >FLASH
.init_array :
.init_array (READONLY):
{
. = ALIGN(4);
PROVIDE_HIDDEN (__init_array_start = .);
@ -119,7 +119,7 @@ SECTIONS
. = ALIGN(4);
} >FLASH
.fini_array :
.fini_array (READONLY):
{
. = ALIGN(4);
PROVIDE_HIDDEN (__fini_array_start = .);

3
readme.txt
View File

@ -39,5 +39,6 @@ Pre-defines
Jumbo Roll, Tissue Paper, Waste Bin sensor
CHANGE LOG
2024-04-08 PB3/PB5 EXCHANGE
******************************************************************************