liumin/acquisition_module
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Compare commits

base: liumin:V1.0.2
Branches Tags
liumin:main liumin:base liumin:car-4while4turn liumin:car-plant liumin:car-7-8 liumin:car-6
liumin:V1.0.2 liumin:V1.0.1 liumin:V1.0.0 liumin:V1.00 liumin:采集模块
..
compare: liumin:V1.00
Branches Tags
liumin:base liumin:car-4while4turn liumin:car-plant liumin:car-7-8 liumin:car-6 liumin:main
liumin:V1.0.2 liumin:V1.0.1 liumin:V1.0.0 liumin:V1.00 liumin:采集模块

3 Commits
V1.0.2 ... V1.00

Author SHA1 Message Date
liumin
e5fe7833e6 修改断开高压开关不休眠 2025-08-18 09:25:26 +08:00
liumin
b5f2f3bc5f 植树车适配旧版本采集模块 2025-08-05 07:53:48 +08:00
liumin
ad771ee812 修改适配6号车的KGF点位 2025-08-05 07:29:29 +08:00
7 changed files with 112 additions and 63 deletions
Expand all files Collapse all files

4
.vscode/settings.json vendored
View File

@@ -2,6 +2,8 @@
"files.associations": { "files.associations": {
"MAIN.C": "cpp", "MAIN.C": "cpp",
"CAN.C": "cpp", "CAN.C": "cpp",
"temperature.C": "cpp" "temperature.C": "cpp",
"IO.C": "cpp",
"PS.C": "cpp"
} }
} }

89
CL2.0.uvgui.liuminVir
View File

File diff suppressed because one or more lines are too long

2
CL2.0.uvopt
View File

@@ -320,7 +320,7 @@
<GroupNumber>2</GroupNumber> <GroupNumber>2</GroupNumber>
<FileNumber>9</FileNumber> <FileNumber>9</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>1</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>.\User.c</PathWithFileName> <PathWithFileName>.\User.c</PathWithFileName>

53
IO.C
View File

@@ -188,29 +188,26 @@ void IO_vInit(void)
/// - is used as general input /// - is used as general input
/// - pull-up device is assigned /// - pull-up device is assigned
/// P1.4: /// P1.4:
/// - is used as general input
/// - pull-up device is assigned
/// P1.5:
/// - is used as general purpose output /// - is used as general purpose output
/// - push/pull output is selected /// - push/pull output is selected
/// - the pin status is low level /// - the pin status is low level
/// - pull-down device is assigned /// - pull device is disabled (tristate)
/// P1.5:
/// - is used as general input
/// - pull-up device is assigned
/// P1.6: /// P1.6:
/// - is used as general purpose output /// - is used as general purpose output
/// - push/pull output is selected /// - push/pull output is selected
/// - the pin status is low level /// - the pin status is low level
/// - pull device is disabled (tristate) /// - pull device is disabled (tristate)
SFR_PAGE(_pp3, noSST); // switch to page 3
P1_OD = 0x00; // load open-drain register
SFR_PAGE(_pp1, noSST); // switch to page 1 SFR_PAGE(_pp1, noSST); // switch to page 1
P1_PUDSEL = 0xDF; // load pullup/pulldown select register P1_PUDSEL = 0xFF; // load pullup/pulldown select register
P1_PUDEN = 0xBF; // load pullup/pulldown enable register P1_PUDEN = 0xAF; // load pullup/pulldown enable register
SFR_PAGE(_pp0, noSST); // switch to page 0 SFR_PAGE(_pp0, noSST); // switch to page 0
P1_DIR = 0x60; // load direction register P1_DIR = 0x50; // load direction register
/// ----------------------------------------------------------------------- /// -----------------------------------------------------------------------
/// Configuration of Port P2: /// Configuration of Port P2:
@@ -223,62 +220,50 @@ void IO_vInit(void)
/// P3.2: /// P3.2:
/// - is used as general purpose output /// - is used as general purpose output
/// - open drain output is selected /// - open drain output is selected
/// - the pin status is low level /// - the pin status is high level
/// - pull-up device is assigned /// - pull-up device is assigned
/// P3.3: /// P3.3:
/// - is used as general purpose output /// - is used as general purpose output
/// - open drain output is selected /// - open drain output is selected
/// - the pin status is low level /// - the pin status is high level
/// - pull-up device is assigned /// - pull-up device is assigned
/// P3.4: /// P3.4:
/// - is used as general purpose output /// - is used as general purpose output
/// - open drain output is selected /// - open drain output is selected
/// - the pin status is low level /// - the pin status is high level
/// - pull-up device is assigned /// - pull-up device is assigned
/// P3.5: /// P3.5:
/// - is used as general purpose output /// - is used as general purpose output
/// - open drain output is selected /// - open drain output is selected
/// - the pin status is low level /// - the pin status is high level
/// - pull-up device is assigned /// - pull-up device is assigned
/// P3.6: /// P3.6:
/// - is used as general purpose output /// - is used as general input
/// - push/pull output is selected /// - pull-up device is assigned
/// - the pin status is low level
/// - pull-down device is assigned
/// P3.7:
/// - is used as general purpose output
/// - push/pull output is selected
/// - the pin status is low level
/// - pull-down device is assigned
SFR_PAGE(_pp3, noSST); // switch to page 3 SFR_PAGE(_pp3, noSST); // switch to page 3
P3_OD = 0x3C; // load open-drain register P3_OD = 0x3C; // load open-drain register
SFR_PAGE(_pp1, noSST); // switch to page 1 SFR_PAGE(_pp1, noSST); // switch to page 1
P3_PUDSEL = 0x3F; // load pullup/pulldown select register P3_PUDSEL = 0xFF; // load pullup/pulldown select register
P3_PUDEN = 0xFC; // load pullup/pulldown enable register P3_PUDEN = 0x7C; // load pullup/pulldown enable register
SFR_PAGE(_pp0, noSST); // switch to page 0 SFR_PAGE(_pp0, noSST); // switch to page 0
P3_DIR = 0xFC; // load direction register P3_DIR = 0x3C; // load direction register
P3_DATA = 0x3C; // load data output register
/// ----------------------------------------------------------------------- /// -----------------------------------------------------------------------
/// Configuration of Port P4: /// Configuration of Port P4:
/// ----------------------------------------------------------------------- /// -----------------------------------------------------------------------
/// P4.3: /// P4.3:
/// - is used as general purpose output /// - is used as general input
/// - push/pull output is selected /// - pull-up device is assigned
/// - the pin status is low level
/// - pull-down device is assigned
SFR_PAGE(_pp1, noSST); // switch to page 1 SFR_PAGE(_pp1, noSST); // switch to page 1
P4_PUDSEL = 0x00; // load pullup/pulldown select register
P4_PUDEN = 0x08; // load pullup/pulldown enable register P4_PUDEN = 0x08; // load pullup/pulldown enable register
SFR_PAGE(_pp0, noSST); // switch to page 0 SFR_PAGE(_pp0, noSST); // switch to page 0
P4_DIR = 0x08; // load direction register
// USER CODE BEGIN (IO_Init,3) // USER CODE BEGIN (IO_Init,3)

18
User.c
View File

@@ -155,7 +155,7 @@ void SystemStateMachine(SystemState *RgSTT)
break; break;
case STATE_ON: case STATE_ON:
if( bm8563CheckAlarmFlag() )//<2F><><EFBFBD><EFBFBD>ʱ<EFBFBD>䵽<EFBFBD>Լ<EFBFBD><D4BC><EFBFBD>ѹ<EFBFBD><D1B9><EFBFBD>عر<D8B9> if(bm8563CheckAlarmFlag())//<2F><><EFBFBD><EFBFBD>ʱ<EFBFBD>䵽<EFBFBD>Լ<EFBFBD><D4BC><EFBFBD>ѹ<EFBFBD><D1B9><EFBFBD>عر<D8B9>
{ {
bm8563SetTime(&inittime);//20250802 <20><>ʼ<EFBFBD><CABC>ʱ<EFBFBD><CAB1> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊʱ<CEAA>䲻<EFBFBD>Ե<EFBFBD><D4B5><EFBFBD><EFBFBD>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> bm8563SetTime(&inittime);//20250802 <20><>ʼ<EFBFBD><CABC>ʱ<EFBFBD><CAB1> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊʱ<CEAA>䲻<EFBFBD>Ե<EFBFBD><D4B5><EFBFBD><EFBFBD>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
bm8563SetAlarm(&sleeptime);//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1> bm8563SetAlarm(&sleeptime);//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>
@@ -182,7 +182,7 @@ void SystemStateMachine(SystemState *RgSTT)
break; break;
case STATE_ON2: case STATE_ON2:
if(POWER_STANDBY == powerstate)//<2F>ܿ<EFBFBD><DCBF>عرջ<D8B1><D5BB>߽<EFBFBD><DFBD><EFBFBD>standy if( POWER_STANDBY == powerstate )//<2F>ܿ<EFBFBD><DCBF>عرջ<D8B1><D5BB>߽<EFBFBD><DFBD><EFBFBD>standy
{ {
bm8563SetTime(&inittime);//20250802 <20><>ʼ<EFBFBD><CABC>ʱ<EFBFBD><CAB1> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊʱ<CEAA>䲻<EFBFBD>Ե<EFBFBD><D4B5><EFBFBD><EFBFBD>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> bm8563SetTime(&inittime);//20250802 <20><>ʼ<EFBFBD><CABC>ʱ<EFBFBD><CAB1> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊʱ<CEAA>䲻<EFBFBD>Ե<EFBFBD><D4B5><EFBFBD><EFBFBD>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
bm8563SetAlarm(&sleeptime); bm8563SetAlarm(&sleeptime);
@@ -345,23 +345,21 @@ void CanRXTX(void)
un_inf_can_kgf_output2.bit_data.KGF01 = 0x01;// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> un_inf_can_kgf_output2.bit_data.KGF01 = 0x01;// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
un_inf_can_kgf_output2.bit_data.KGF02 = 0x01;// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> un_inf_can_kgf_output2.bit_data.KGF02 = 0x01;// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
// un_inf_can_kgf_output2.bit_data.KGF15 = 0x01;// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> un_inf_can_kgf_output2.bit_data.KGF15 = 0x01;// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
// un_inf_can_kgf_output2.bit_data.KGF16 = 0x01;// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> un_inf_can_kgf_output2.bit_data.KGF16 = 0x01;// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
un_inf_can_kgf_output2.bit_data.KGF03 = 0x01;// ң<><D2A3><EFBFBD><EFBFBD> un_inf_can_kgf_output2.bit_data.KGF03 = 0x01;// ң<><D2A3><EFBFBD><EFBFBD>
un_inf_can_kgf_output2.bit_data.KGF05 = 0x01;// <20><><EFBFBD>罻<EFBFBD><E7BDBB><EFBFBD><EFBFBD> un_inf_can_kgf_output2.bit_data.KGF05 = 0x01;// <20><><EFBFBD>罻<EFBFBD><E7BDBB><EFBFBD><EFBFBD>
un_inf_can_kgf_output2.bit_data.KGF06 = 0x01;// <20><><EFBFBD>罻<EFBFBD><E7BDBB><EFBFBD><EFBFBD> un_inf_can_kgf_output2.bit_data.KGF06 = 0x01;// <20><><EFBFBD>罻<EFBFBD><E7BDBB><EFBFBD><EFBFBD>
un_inf_can_kgf_output1.bit_data.KGF09 = 0x01;// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2
un_inf_can_kgf_output2.bit_data.KGF04 = 0x01;//KGF20<32>ӵ<EFBFBD><D3B5><EFBFBD><EFBFBD><EFBFBD>
un_inf_can_kgf_output2.bit_data.KGF04 = 0x01;//KGF20<32>ӵ<EFBFBD><D3B5><EFBFBD><EFBFBD><EFBFBD>
un_inf_can_kgf_output1.bit_data.KGF13 = 0x01;// <20><>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD>
if(1 == flg_KGF)//<2F>ȴ<EFBFBD>KGF<47><46><EFBFBD>Ѻ<EFBFBD><D1BA>ٷ<EFBFBD><D9B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> if(1 == flg_KGF)//<2F>ȴ<EFBFBD>KGF<47><46><EFBFBD>Ѻ<EFBFBD><D1BA>ٷ<EFBFBD><D9B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
{ {
canSendTo(DF_SwTxKGF2,(ubyte *)&un_inf_can_kgf_output2.arr[0]); canSendTo(DF_SwTxKGF2,(ubyte *)&un_inf_can_kgf_output2.arr[0]);
canSendTo(DF_SwTxKGF1,(ubyte *)&un_inf_can_kgf_output1.arr[0]); // canSendTo(DF_SwTxKGF1,(ubyte *)&un_inf_can_kgf_output1.arr[0]);
} }
} }
else else

2
temperature.C
View File

@@ -503,7 +503,7 @@ BOOL GetTemp(void)
for (i = 0; i < RomNum; i++) //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>оƬ for (i = 0; i < RomNum; i++) //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>оƬ
{ {
// iTemp[i] = 0; 20250814ע<34><D7A2> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>CRCʧ<43><CAA7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><C2B6><EFBFBD><EFBFBD><EFBFBD> iTemp[i] = 0;
/*<2A><><EFBFBD><EFBFBD>*/ /*<2A><><EFBFBD><EFBFBD>*/
ReadTempWaiting(&iTemp[i], i); ReadTempWaiting(&iTemp[i], i);

7
user.H
View File

@@ -15,12 +15,13 @@
#define dfPwmH 10 //PWM<57>ĸߵ<C4B8>ƽʱ<C6BD>䣬10<31><30>10ms<6D><73><EFBFBD>ң<EFBFBD><D2A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD>20181227 #define dfPwmH 10 //PWM<57>ĸߵ<C4B8>ƽʱ<C6BD>䣬10<31><30>10ms<6D><73><EFBFBD>ң<EFBFBD><D2A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD>20181227
#define WAKE_UP_PIN P1_4 //<2F><>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> #define WAKE_UP_PIN P1_5 //<2F><>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> // <20>޸<EFBFBD>Ϊ<EFBFBD>ɰ汾Ӳ<E6B1BE><D3B2>
#define KGF_PIN P0_0 //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> #define KGF_PIN P0_0 //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#define CAN_PIN P1_6 //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> #define CAN_PIN P1_6 //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#define STOP_PIN P1_2 //<2F><>ͣ<EFBFBD><CDA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> #define STOP_PIN P3_6 //<2F><>ͣ<EFBFBD><CDA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#define BATTERY_PIN P1_4 //<2F><><EFBFBD>ؿ<EFBFBD><D8BF>ƽ<EFBFBD>
#define BATTERY_PIN P3_6 //<2F><><EFBFBD>ؿ<EFBFBD><D8BF>ƽ<EFBFBD>
#define ON 0 //<2F><><EFBFBD><EFBFBD> #define ON 0 //<2F><><EFBFBD><EFBFBD>