Templates/DS18B20_Library
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

перестал работать проект для 002B

Browse Source
This commit is contained in:
Razvalyaev
2025-03-06 15:42:54 +03:00
parent 570a11a37f
commit 016efe4a05
5 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
py_project/Core/Modbus/interface_config.h
View File

@@ -40,8 +40,8 @@
#define rs_huart huart1 #define rs_huart huart1
#define rs_htim htim14 #define rs_htim htim14
#define RS_EnableReceive() GPIOB->ODR |= GPIO_PIN_3 //#define RS_EnableReceive() GPIOB->ODR |= GPIO_PIN_3
#define RS_EnableTransmit() GPIOB->ODR &= ~GPIO_PIN_3 //#define RS_EnableTransmit() GPIOB->ODR &= ~GPIO_PIN_3
/** /**
* @brief Поменять комманды 0x03 и 0x04 местами (для LabView терминалки от двигателей) * @brief Поменять комманды 0x03 и 0x04 местами (для LabView терминалки от двигателей)
* @details Терминалка от двигателей использует для чтения регистров комманду R_HOLD_REGS вместо R_IN_REGS * @details Терминалка от двигателей использует для чтения регистров комманду R_HOLD_REGS вместо R_IN_REGS

3
py_project/Core/Modbus/rs_message.h
View File

@@ -28,6 +28,7 @@
#include "modbus.h" #include "modbus.h"
#include "crc_algs.h" #include "crc_algs.h"
#include "string.h"
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
@@ -43,7 +44,7 @@
/* Clear message-uart buffer */ /* Clear message-uart buffer */
#define RS_Clear_Buff(_buff_) for(int i=0; i<MSG_SIZE_MAX;i++) _buff_[i] = NULL #define RS_Clear_Buff(_buff_) memset(_buff_, 0, MSG_SIZE_MAX)
/* Set/Reset flags */ /* Set/Reset flags */
#define RS_Set_Free(_hRS_) _hRS_->f.RS_Busy = 0 #define RS_Set_Free(_hRS_) _hRS_->f.RS_Busy = 0

3
py_project/Core/Src/gpio.c
View File

@@ -69,14 +69,11 @@ void MX_GPIO_Init(void)
(GPIO_SPEED_FREQ_LOW << GPIO_OSPEEDR_OSPEED4_Pos) | (GPIO_SPEED_FREQ_LOW << GPIO_OSPEEDR_OSPEED4_Pos) |
(GPIO_SPEED_FREQ_LOW << GPIO_OSPEEDR_OSPEED5_Pos); (GPIO_SPEED_FREQ_LOW << GPIO_OSPEEDR_OSPEED5_Pos);
#ifdef PY32F002Bx5
/*Configure LED GPIO pin : PB3 (Receive Enable) */ /*Configure LED GPIO pin : PB3 (Receive Enable) */
/* Íàñòðîéêà ïèíîâ PA1, PA4, PA5 */
GPIOB->MODER &= ~(GPIO_MODER_MODE3); GPIOB->MODER &= ~(GPIO_MODER_MODE3);
GPIOB->MODER |= (GPIO_MODE_OUTPUT_PP << GPIO_MODER_MODE3_Pos); GPIOB->MODER |= (GPIO_MODE_OUTPUT_PP << GPIO_MODER_MODE3_Pos);
GPIOB->PUPDR &= ~(GPIO_PUPDR_PUPD3); GPIOB->PUPDR &= ~(GPIO_PUPDR_PUPD3);
GPIOB->PUPDR |= (GPIO_NOPULL << GPIO_PUPDR_PUPD3_Pos); GPIOB->PUPDR |= (GPIO_NOPULL << GPIO_PUPDR_PUPD3_Pos);
GPIOB->OSPEEDR |= (GPIO_SPEED_FREQ_HIGH << GPIO_OSPEEDR_OSPEED3_Pos); GPIOB->OSPEEDR |= (GPIO_SPEED_FREQ_HIGH << GPIO_OSPEEDR_OSPEED3_Pos);
#endif
} }
/************************ (C) COPYRIGHT Puya *****END OF FILE******************/ /************************ (C) COPYRIGHT Puya *****END OF FILE******************/

10
py_project/MDK-ARM/PY32Dallas.uvoptx
View File

@@ -75,7 +75,7 @@
<OPTFL> <OPTFL>
<tvExp>1</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>0</IsCurrentTarget> <IsCurrentTarget>1</IsCurrentTarget>
</OPTFL> </OPTFL>
<CpuCode>255</CpuCode> <CpuCode>255</CpuCode>
<DebugOpt> <DebugOpt>
@@ -284,6 +284,10 @@
<pSingCmdsp></pSingCmdsp> <pSingCmdsp></pSingCmdsp>
<pMultCmdsp></pMultCmdsp> <pMultCmdsp></pMultCmdsp>
<SystemViewers> <SystemViewers>
<Entry>
<Name>System Viewer\TIM1</Name>
<WinId>35903</WinId>
</Entry>
<Entry> <Entry>
<Name>System Viewer\TIM14</Name> <Name>System Viewer\TIM14</Name>
<WinId>35904</WinId> <WinId>35904</WinId>
@@ -357,7 +361,7 @@
<OPTFL> <OPTFL>
<tvExp>1</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>1</IsCurrentTarget> <IsCurrentTarget>0</IsCurrentTarget>
</OPTFL> </OPTFL>
<CpuCode>255</CpuCode> <CpuCode>255</CpuCode>
<DebugOpt> <DebugOpt>
@@ -987,7 +991,7 @@
<Group> <Group>
<GroupName>Drivers/PY32F002B_HAL_Driver</GroupName> <GroupName>Drivers/PY32F002B_HAL_Driver</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>

6
py_project/MDK-ARM/startup_py32f002bxx.s
View File

@@ -99,7 +99,7 @@ __Vectors DCD __initial_sp ; Top of Stack
DCD 0 ; 16Reserved DCD 0 ; 16Reserved
DCD LPTIM1_IRQHandler ; 17LPTIM1 DCD LPTIM1_IRQHandler ; 17LPTIM1
DCD 0 ; 18Reserved DCD 0 ; 18Reserved
DCD TIM_MB_IRQHandler ; 19TIM14 DCD TIM14_IRQHandler ; 19TIM14
DCD 0 ; 20Reserved DCD 0 ; 20Reserved
DCD 0 ; 21Reserved DCD 0 ; 21Reserved
DCD 0 ; 22Reserved DCD 0 ; 22Reserved
@@ -167,7 +167,7 @@ Default_Handler PROC
EXPORT TIM1_BRK_UP_TRG_COM_IRQHandler [WEAK] EXPORT TIM1_BRK_UP_TRG_COM_IRQHandler [WEAK]
EXPORT TIM1_CC_IRQHandler [WEAK] EXPORT TIM1_CC_IRQHandler [WEAK]
EXPORT LPTIM1_IRQHandler [WEAK] EXPORT LPTIM1_IRQHandler [WEAK]
EXPORT TIM_MB_IRQHandler [WEAK] EXPORT TIM14_IRQHandler [WEAK]
EXPORT I2C1_IRQHandler [WEAK] EXPORT I2C1_IRQHandler [WEAK]
EXPORT SPI1_IRQHandler [WEAK] EXPORT SPI1_IRQHandler [WEAK]
EXPORT USART1_IRQHandler [WEAK] EXPORT USART1_IRQHandler [WEAK]
@@ -181,7 +181,7 @@ ADC_COMP_IRQHandler
TIM1_BRK_UP_TRG_COM_IRQHandler TIM1_BRK_UP_TRG_COM_IRQHandler
TIM1_CC_IRQHandler TIM1_CC_IRQHandler
LPTIM1_IRQHandler LPTIM1_IRQHandler
TIM_MB_IRQHandler TIM14_IRQHandler
I2C1_IRQHandler I2C1_IRQHandler
SPI1_IRQHandler SPI1_IRQHandler
USART1_IRQHandler USART1_IRQHandler