wxsmart-test
/
sggt
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新： 

1、删除了文件头部的多余注释；
2、HART连接模式切换逻辑调整，目前提供4-20mA电流的情况下，三种模式都能与定位器通讯，不提供4-20mA的情况下，24V的连接模式可以点亮定位器并正常通讯；
This commit is contained in:
吴俊潮 2025-08-19 08:34:03 +08:00
parent 882d627288
commit 3c9c66d408
9 changed files with 3663 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
App/BLE/ble.c
View File

@ -1,12 +1,3 @@
/*
* @Author: DaMingSY zxm5337@163.com
* @Date: 2024-09-02 08:54:40
* @LastEditors: DaMingSY zxm5337@163.com
* @LastEditTime: 2024-09-09 11:11:11
* @FilePath: \signal_generator\App\BLE\ble.c
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
#include "ble.h" #include "ble.h"
void ble_send(UART_HandleTypeDef *huart, uint8_t *data) void ble_send(UART_HandleTypeDef *huart, uint8_t *data)

12
App/HART/hart.h
View File

@ -6,14 +6,14 @@
#define RTS_ON GPIO_PIN_RESET #define RTS_ON GPIO_PIN_RESET
#define RTS_OFF GPIO_PIN_SET #define RTS_OFF GPIO_PIN_SET
#define HART_24V_ENABLE HAL_GPIO_WritePin(RS_EN_GPIO_Port, RS_EN_Pin, GPIO_PIN_RESET) #define HART_24V_L HAL_GPIO_WritePin(RS_EN_GPIO_Port, RS_EN_Pin, GPIO_PIN_RESET)
#define HART_24V_DISABLE HAL_GPIO_WritePin(RS_EN_GPIO_Port, RS_EN_Pin, GPIO_PIN_SET) #define HART_24V_H HAL_GPIO_WritePin(RS_EN_GPIO_Port, RS_EN_Pin, GPIO_PIN_SET)
#define HART_250OHM_ENABLE HAL_GPIO_WritePin(RP_EN_GPIO_Port, RP_EN_Pin, GPIO_PIN_RESET) #define HART_250OHM_L HAL_GPIO_WritePin(RP_EN_GPIO_Port, RP_EN_Pin, GPIO_PIN_RESET)
#define HART_250OHM_DISABLE HAL_GPIO_WritePin(RP_EN_GPIO_Port, RP_EN_Pin, GPIO_PIN_SET) #define HART_250OHM_H HAL_GPIO_WritePin(RP_EN_GPIO_Port, RP_EN_Pin, GPIO_PIN_SET)
#define HART_VOUT_ENABLE HAL_GPIO_WritePin(Vout_EN_GPIO_Port, Vout_EN_Pin, GPIO_PIN_SET) #define HART_VOUT_L HAL_GPIO_WritePin(Vout_EN_GPIO_Port, Vout_EN_Pin, GPIO_PIN_RESET)
#define HART_VOUT_DISABLE HAL_GPIO_WritePin(Vout_EN_GPIO_Port, Vout_EN_Pin, GPIO_PIN_RESET) #define HART_VOUT_H HAL_GPIO_WritePin(Vout_EN_GPIO_Port, Vout_EN_Pin, GPIO_PIN_SET)
void hart_send(UART_HandleTypeDef *huart, uint8_t *data); void hart_send(UART_HandleTypeDef *huart, uint8_t *data);
void hart_communicate(st_scom *scom); void hart_communicate(st_scom *scom);

8
App/IP5310/ip5310_i2c.c
View File

@ -1,11 +1,3 @@
/*
* @Author: wujunchao wujunchao@wuxismart.com
* @Date: 2025-03-17 13:35:30
* @LastEditors: wujunchao wujunchao@wuxismart.com
* @LastEditTime: 2025-03-24 17:35:57
* @FilePath: \signal_generator\App\APP_WU\Src\ip5310_i2c.c
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
#include "ip5310_i2c.h" #include "ip5310_i2c.h"
uint8_t rx_data = 0; uint8_t rx_data = 0;

8
App/LCD/JLX240-00301-BN.h
View File

@ -1,11 +1,3 @@
/*
* @Author: DaMingSY zxm5337@163.com
* @Date: 2024-08-29 10:34:51
* @LastEditors: wujunchao wujunchao@wuxismart.com
* @LastEditTime: 2024-12-25 10:14:46
* @FilePath: \signal_generator\App\LCD\JLX240-00301-BN.h
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
#ifndef _JLX240X320_H_ #ifndef _JLX240X320_H_
#define _JLX240X320_H_ #define _JLX240X320_H_
#include "data_type_def.h" #include "data_type_def.h"

16
App/MUX_SIGNAL/mux_signal.c
View File

@ -1,19 +1,3 @@
/*
* @Author: wujunchao wujunchao@wuxismart.com
* @Date: 2024-12-24 08:18:26
* @LastEditors: wujunchao wujunchao@wuxismart.com
* @LastEditTime: 2025-03-20 15:01:22
* @FilePath: \signal_generator\App\MUX_SIGNAL\mux_signal.c
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
/*
* @Author: DaMingSY zxm5337@163.com
* @Date: 2024-09-02 15:58:58
* @LastEditors: DaMingSY zxm5337@163.com
* @LastEditTime: 2024-11-28 10:21:04
* @FilePath: \signal_generator\App\MUX_SIGNAL\mux_signal.c
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
#include "FreeRTOS.h" #include "FreeRTOS.h"
#include "task.h" #include "task.h"
#include "tim.h" #include "tim.h"

8
App/TM1650/tm1650.c
View File

@ -1,11 +1,3 @@
/*
* @Author: wujunchao wujunchao@wuxismart.com
* @Date: 2024-12-24 13:24:59
* @LastEditors: wujunchao wujunchao@wuxismart.com
* @LastEditTime: 2025-03-17 11:31:24
* @FilePath: \signal_generator\App\TM1650\tm1650.c
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
#include "tm1650.h" #include "tm1650.h"
#include "apps_gather.h" #include "apps_gather.h"

26
Core/Src/freertos.c
View File

@ -241,35 +241,33 @@ void start_task_hart(void const * argument)
frequence_output(fre_set_hart, 50, PWM_HART); frequence_output(fre_set_hart, 50, PWM_HART);
} }
HART_24V_DISABLE; HART_24V_H;
HART_VOUT_DISABLE; HART_250OHM_H;
HART_250OHM_DISABLE; HART_VOUT_H;
} }
break; break;
case HART_LISTEN: case HART_LISTEN:
{ {
HART_24V_DISABLE; HART_24V_H;
HART_VOUT_DISABLE; HART_250OHM_H;
HART_250OHM_DISABLE; HART_VOUT_H;
} }
break; break;
case HART_INTERNAL_24V: case HART_INTERNAL_24V:
{ {
HART_24V_ENABLE; HART_24V_L;
HART_VOUT_ENABLE; HART_250OHM_H;
HART_VOUT_L;
HART_250OHM_DISABLE;
} }
break; break;
case HART_INTERNAL_250OHM: case HART_INTERNAL_250OHM:
{ {
HART_250OHM_ENABLE; HART_24V_H;
HART_250OHM_L;
HART_24V_DISABLE; HART_VOUT_H;
HART_VOUT_DISABLE;
} }
break; break;

3637
MDK-ARM/signal_generator.uvguix.吴俊潮 Normal file
View File

File diff suppressed because one or more lines are too long

16
MDK-ARM/signal_generator/signal_generator.hex
View File

@ -16522,14 +16522,14 @@
:1008400057D145E0314890ED000AB5EEC00AF1EE0F :1008400057D145E0314890ED000AB5EEC00AF1EE0F
:1008500010FA0DD09FED320A80ED000A01223221FC :1008500010FA0DD09FED320A80ED000A01223221FC
:1008600090ED000ABCEEC00A10EE100AD6F7D4FADA :1008600090ED000ABCEEC00A10EE100AD6F7D4FADA
:10087000012210212B48C1F789F9002220212948A3 :10087000012210212B48C1F789F90122D1032A480E
:10088000C1F784F90122D1032748C1F77FF931E08C :10088000C1F784F9012220212648C1F77FF931E020
:10089000012210212348C1F779F9002220212148A3 :10089000012210212348C1F779F90122D10322480E
:1008A000C1F774F90122D1031F48C1F76FF921E0A4 :1008A000C1F774F9012220211E48C1F76FF921E038
:1008B000002210211B48C1F769F9012220211948A3 :1008B000002210211B48C1F769F90122D1031A480F
:1008C000C1F764F90122D1031748C1F75FF911E0BC :1008C000C1F764F9002220211648C1F75FF911E051
:1008D00000224FF400411448C1F758F901221021B9 :1008D000012210211348C1F759F900224FF40041B9
:1008E0001048C1F753F9002220210E48C1F74EF9F4 :1008E0001148C1F753F9012220210E48C1F74EF9F2
:1008F00000E000BF00BF002002F064FEC0F5807081 :1008F00000E000BF00BF002002F064FEC0F5807081
:100900000A4908816420EDF740FE60E728C0012015 :100900000A4908816420EDF740FE60E728C0012015
:100910000000E148E4670120000C024000000240B2 :100910000000E148E4670120000C024000000240B2