修复源代码中文注释乱码并统一为UTF-8编码，Lora频率改为470MHz频段
1. 修复 source/inc/bsp.h、source/inc/main.h、source/src/bsp.c 中文注释乱码，统一保存为UTF-8编码 2. Lora中心频率由433.1MHz改为470.1MHz~492.6MHz，步进500kHz，共46个信道(CH0~CH45) 3. 新增下载前配置检查注释块，LORA_FREQ默认信道改为CH0 4. 更新Keil调试配置(CMSIS_AGDI调试器及观察窗口设置)
This commit is contained in:
+96
-57
@@ -5,68 +5,107 @@
|
||||
#include <stdbool.h>
|
||||
#include "gpio.h"
|
||||
|
||||
/*设备类型*/
|
||||
#define FORCE_6D 0x0001 //0x0001 六维应力
|
||||
#define OSMOTIC_PRESSURE 0x0002 //0x0002 渗透压
|
||||
#define ELASTIC_WAVEGUIDE 0x0003 //0x0003 弹性波导
|
||||
#define DIELECTRIC_MASS 0x0004 //0x0004 介电质普
|
||||
#define _0x0005 0x0005 //0x0005 保留
|
||||
#define CONT_DEFOR_3D 0x0006 //0x0006 三维连续变形
|
||||
#define COMM_UNIT 0x0007 //0x0007 通讯单元
|
||||
#define FORCE_3D 0x0008 //0x0008 三维应力
|
||||
#define LASER_TRACING 0x0009 //0x0009 激光示踪
|
||||
#define _0x000A 0x000A //0x000A 保留
|
||||
#define _0x000B 0x000B //0x000B 保留
|
||||
#define _0x000C 0x000C //0x000C 保留
|
||||
#define MULTI_PARAMETER_FUSION 0x000D //0x000D 多参数融合
|
||||
#define CRACK_DETECTION 0x000E //0x000E 裂缝仪
|
||||
#define _0x000F 0x000F //0x000F 保留
|
||||
#define ATTITUDE_MONITOR 0x0010 //0x0010 姿态检测
|
||||
#define LASER_DISPLACE 0x0011 //0x0011 激光位移
|
||||
#define REBAR_STRESS 0x0012 //0x0012 钢筋应力
|
||||
#define ANCHOR_ROD_STRESS 0x0013 //0x0013 锚杆轴力
|
||||
#define SURFACE_STRESS 0x0014 //0x0014 表面应力
|
||||
#define PRESSURE 0x0015 //0x0015 压力
|
||||
#define MICROWAVE_DISPLACE 0x0016 //0x0016 微波测距
|
||||
/*通讯方式*/
|
||||
/*设备类型*/
|
||||
#define FORCE_6D 0x0001 //0x0001 六维应力
|
||||
#define OSMOTIC_PRESSURE 0x0002 //0x0002 渗透压
|
||||
#define ELASTIC_WAVEGUIDE 0x0003 //0x0003 弹性波导
|
||||
#define DIELECTRIC_MASS 0x0004 //0x0004 介电质谱
|
||||
#define _0x0005 0x0005 //0x0005 保留
|
||||
#define CONT_DEFOR_3D 0x0006 //0x0006 三维连续变形
|
||||
#define COMM_UNIT 0x0007 //0x0007 通讯单元
|
||||
#define FORCE_3D 0x0008 //0x0008 三维应力
|
||||
#define LASER_TRACING 0x0009 //0x0009 激光示踪
|
||||
#define _0x000A 0x000A //0x000A 保留
|
||||
#define _0x000B 0x000B //0x000B 保留
|
||||
#define _0x000C 0x000C //0x000C 保留
|
||||
#define MULTI_PARAMETER_FUSION 0x000D //0x000D 多参数融合
|
||||
#define CRACK_DETECTION 0x000E //0x000E 裂缝检测
|
||||
#define _0x000F 0x000F //0x000F 保留
|
||||
#define ATTITUDE_MONITOR 0x0010 //0x0010 姿态检测
|
||||
#define LASER_DISPLACE 0x0011 //0x0011 激光位移
|
||||
#define REBAR_STRESS 0x0012 //0x0012 钢筋应力
|
||||
#define ANCHOR_ROD_STRESS 0x0013 //0x0013 锚杆轴力
|
||||
#define SURFACE_STRESS 0x0014 //0x0014 表面应力
|
||||
#define PRESSURE 0x0015 //0x0015 压力
|
||||
#define MICROWAVE_DISPLACE 0x0016 //0x0016 微波测距
|
||||
/*通讯方式*/
|
||||
typedef enum {
|
||||
LORA = 0x01, //0x01 LORA通讯
|
||||
RS485 = 0x02, //0x02 RS485通讯
|
||||
RS232 = 0x03, //0x03 RS232通讯
|
||||
CAN = 0x04, //0x04 CAN通讯
|
||||
_4G = 0x05, //0x05 _4G通讯
|
||||
BLE = 0x06, //0x06 BLE通讯
|
||||
WIFI = 0x07, //0x07 WIFI通讯
|
||||
LORA = 0x01, //0x01 LORA通讯
|
||||
RS485 = 0x02, //0x02 RS485通讯
|
||||
RS232 = 0x03, //0x03 RS232通讯
|
||||
CAN = 0x04, //0x04 CAN通讯
|
||||
_4G = 0x05, //0x05 _4G通讯
|
||||
BLE = 0x06, //0x06 BLE通讯
|
||||
WIFI = 0x07, //0x07 WIFI通讯
|
||||
}COMM_WAY_M;
|
||||
/*设备标志*/
|
||||
/*设备标志*/
|
||||
typedef enum {
|
||||
MASTER = 0x000000, //0x000000 主设备
|
||||
SUBSET = 0x800000, //0x800000 子设备
|
||||
MASTER = 0x000000, //0x000000 主设备
|
||||
SUBSET = 0x800000, //0x800000 子设备
|
||||
}DEVICE_SIGN_M;
|
||||
/*Lora频率：433100000ul + 200000*N */
|
||||
/*Lora频率：470100000ul + 500000*N */
|
||||
typedef enum {
|
||||
CH0 = (433100000ul + 0), //测试频率
|
||||
CH1 = (433100000ul + 200000),
|
||||
CH2 = (433100000ul + 400000),
|
||||
CH3 = (433100000ul + 600000),
|
||||
CH4 = (433100000ul + 800000),
|
||||
CH5 = (433100000ul + 1000000),
|
||||
CH6 = (433100000ul + 1200000),
|
||||
CH7 = (433100000ul + 1400000),
|
||||
CH8 = (433100000ul + 1600000),
|
||||
CH9 = (433100000ul + 1800000),
|
||||
CH10 = (433100000ul + 2000000),
|
||||
CH0 = (470100000ul + 0), //测试频率
|
||||
CH1 = (470100000ul + 500000),
|
||||
CH2 = (470100000ul + 1000000),
|
||||
CH3 = (470100000ul + 1500000),
|
||||
CH4 = (470100000ul + 2000000),
|
||||
CH5 = (470100000ul + 2500000),
|
||||
CH6 = (470100000ul + 3000000),
|
||||
CH7 = (470100000ul + 3500000),
|
||||
CH8 = (470100000ul + 4000000),
|
||||
CH9 = (470100000ul + 4500000),
|
||||
CH10 = (470100000ul + 5000000),
|
||||
CH11 = (470100000ul + 5500000),
|
||||
CH12 = (470100000ul + 6000000),
|
||||
CH13 = (470100000ul + 6500000),
|
||||
CH14 = (470100000ul + 7000000),
|
||||
CH15 = (470100000ul + 7500000),
|
||||
CH16 = (470100000ul + 8000000),
|
||||
CH17 = (470100000ul + 8500000),
|
||||
CH18 = (470100000ul + 9000000),
|
||||
CH19 = (470100000ul + 9500000),
|
||||
CH20 = (470100000ul + 10000000),
|
||||
CH21 = (470100000ul + 10500000),
|
||||
CH22 = (470100000ul + 11000000),
|
||||
CH23 = (470100000ul + 11500000),
|
||||
CH24 = (470100000ul + 12000000),
|
||||
CH25 = (470100000ul + 12500000),
|
||||
CH26 = (470100000ul + 13000000),
|
||||
CH27 = (470100000ul + 13500000),
|
||||
CH28 = (470100000ul + 14000000),
|
||||
CH29 = (470100000ul + 14500000),
|
||||
CH30 = (470100000ul + 15000000),
|
||||
CH31 = (470100000ul + 15500000),
|
||||
CH32 = (470100000ul + 16000000),
|
||||
CH33 = (470100000ul + 16500000),
|
||||
CH34 = (470100000ul + 17000000),
|
||||
CH35 = (470100000ul + 17500000),
|
||||
CH36 = (470100000ul + 18000000),
|
||||
CH37 = (470100000ul + 18500000),
|
||||
CH38 = (470100000ul + 19000000),
|
||||
CH39 = (470100000ul + 19500000),
|
||||
CH40 = (470100000ul + 20000000),
|
||||
CH41 = (470100000ul + 20500000),
|
||||
CH42 = (470100000ul + 21000000),
|
||||
CH43 = (470100000ul + 21500000),
|
||||
CH44 = (470100000ul + 22000000),
|
||||
CH45 = (470100000ul + 22500000), //最高频率
|
||||
}LORA_FREQ_M;
|
||||
/*设备类型选择*/
|
||||
/*****************************************************************************************/
|
||||
/*********************************下载前必须检查配置项************************************/
|
||||
/*设备类型选择*/
|
||||
#define DEVICE_TYPE LASER_TRACING
|
||||
/*通讯方式选择*/
|
||||
/*通讯方式选择*/
|
||||
#define COMM_WAY LORA
|
||||
/*设备标志选择*/
|
||||
/*设备标志选择*/
|
||||
#define DEVICE_SIGN MASTER
|
||||
/*设备地址编号设置*/
|
||||
#define ADD_NUMBER (0x000023 + DEVICE_SIGN) //数字部分对应唯一地址编号
|
||||
/*Lora频率配置*/
|
||||
#define LORA_FREQ CH1
|
||||
/*设备地址编号设置*/
|
||||
#define ADD_NUMBER (0x000023 + DEVICE_SIGN) //数字部分对应唯一地址编号
|
||||
/*Lora频率配置*/
|
||||
#define LORA_FREQ CH0
|
||||
/*****************************************************************************************/
|
||||
/*********************************下载前必须检查配置项************************************/
|
||||
|
||||
#if(DEVICE_TYPE == LASER_TRACING)
|
||||
#define LP_UART_CH 0
|
||||
@@ -229,7 +268,7 @@ typedef enum {
|
||||
#define USE_LOWPOWER 0
|
||||
#define USE_WDT 1
|
||||
|
||||
//#define WAKEUP_TIME_ARR (65536 - (30 * 150)) //65536 - time * 38400Hz / 256分频
|
||||
//#define WAKEUP_TIME_ARR (65536 - (30 * 150)) //65536 - time * 38400Hz / 256分频
|
||||
|
||||
#define SYSCLK_RCH 0
|
||||
#define SYSCLK_XTH 1
|
||||
@@ -243,9 +282,9 @@ typedef struct {
|
||||
uint32_t PackageCnt;
|
||||
uint32_t AppSize;
|
||||
uint32_t Crc32Check;
|
||||
uint32_t FirstRunFlag;//第一次运行
|
||||
uint8_t DevMac[6];//设备MAC
|
||||
uint32_t LoraFreq;//Lora频率
|
||||
uint32_t FirstRunFlag;//第一次运行
|
||||
uint8_t DevMac[6];//设备MAC
|
||||
uint32_t LoraFreq;//Lora频率
|
||||
}BootPara_t, *BootPara;
|
||||
|
||||
typedef void (*ReadPara)(BootPara_t rPara);
|
||||
|
||||
+8
-8
@@ -10,13 +10,13 @@
|
||||
|
||||
typedef enum {
|
||||
UPDATE_CMD_NULL,
|
||||
UPDATE_CMD_SLAVE_RES, //从机应答主机下发
|
||||
UPDATE_CMD_SLAVE_REQ_DATA, //从机请求主机下发数据
|
||||
UPDATE_CMD_MASTER_REQ = 0x81, //主机请求升级
|
||||
UPDATE_CMD_MASTRE_RES_DATA, //主机发送数据
|
||||
UPDATE_CMD_SLAVE_RES, //从机应答主机下发
|
||||
UPDATE_CMD_SLAVE_REQ_DATA, //从机请求主机下发数据
|
||||
UPDATE_CMD_MASTER_REQ = 0x81, //主机请求升级
|
||||
UPDATE_CMD_MASTRE_RES_DATA, //主机发送数据
|
||||
}UpdateCmd_m;
|
||||
|
||||
//帧头结构体
|
||||
//帧头结构体
|
||||
typedef struct {
|
||||
uint8_t Header;
|
||||
uint8_t DevMac[6];
|
||||
@@ -24,20 +24,20 @@ typedef struct {
|
||||
uint8_t PayloadLen;
|
||||
}__attribute__ ((packed))FrameHeader_t, *FrameH;
|
||||
|
||||
//主机下发升级请求载荷结构体
|
||||
//主机下发升级请求载荷结构体
|
||||
typedef struct {
|
||||
uint16_t PackageNum;
|
||||
uint32_t AppSize;
|
||||
uint32_t AppCrc32;
|
||||
}__attribute__ ((packed))UpDataRequset_t, *UDReq;
|
||||
|
||||
//从机请求下发结构体
|
||||
//从机请求下发结构体
|
||||
typedef struct {
|
||||
uint16_t PackageIndex;
|
||||
uint32_t PackageNum;
|
||||
}__attribute__ ((packed))GetDataRequest_t, *GDReq;
|
||||
|
||||
//主机应答下发数据结构体
|
||||
//主机应答下发数据结构体
|
||||
typedef struct {
|
||||
uint16_t PackageIndex;
|
||||
uint16_t PackageNum;
|
||||
|
||||
Reference in New Issue
Block a user