TMS_STM_Peripher/UKSS_23550_2
14
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Лампа "высокое" управляется по CAN

Browse Source
This commit is contained in:
Dimas
2025-08-04 17:29:00 +03:00
parent 111ec362b4
commit ca3ffe0d98
13 changed files with 1013 additions and 957 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Internal/Include/measure.h
View File

@@ -6,10 +6,7 @@ interrupt void cpu_timer1_isr_SENS(void);
void Init_sensors(void);
void Init_packMask(void);
//void measure_all(void);
void Temper_count(int chan);
//void Current_count(int chan);
//void Power_count(int chan);
void calc_sensor_koef();
typedef union
@@ -104,9 +101,8 @@ extern float tmpK[];
extern int sens_type[];
extern unsigned long LoneLeft,LoneRite;
extern unsigned long Caliber_time;
extern unsigned int CanPowse,CanGO;
extern unsigned int Caliber_time;
extern long WAKE;
#endif //_MEASURE

1
Source/Internal/Include/message.h
View File

@@ -29,7 +29,6 @@ typedef struct
} CMD_TO_TMS;
extern int modbus[],archiv[],county[],espero[];
extern unsigned int Maska[][8];
void ReceiveCommandModbus3(RS_DATA *rs_arr);

19
Source/Internal/Include/package.h
View File

@@ -69,7 +69,7 @@
#define sens_hi_edge (modbus+start_hi_edge)
#define sens_lo_edge (modbus+start_lo_edge)
#define keys 0x10
#define keys 0x10 // àäðåñ ïîâòîðàåìîé ïîñûëêè «keys»
#define Inputs Modbus[keys]
#define inputs modbus[keys]
@@ -81,13 +81,14 @@
#define bTermoCal Buttons.bit.bit2
#define RSleng modbus[0x20] // äëèíà ïîñûëêè RS485
#define RScount modbus[0x21] // ďŕóçŕ ěĺćäó I ďîńűëęŕěč RS485
#define RSpack (modbus+0x22) // ńŕěîĺ ďîńűëęŕ RS485
#define RScount modbus[0x21] // ïàóçà ìåæäó ïîñûëêàìè RS485
#define RSpack (modbus+0x22) // íà÷àëî ïîñûëêè RS485
#define Cancount (modbus+0x60) // ďŕóçŕ ěĺćäó I ďîńűëęŕěč CAN
#define CanWait (modbus+0x62) // ěŕęńčěŕëüíŕŕ ďŕóçŕ
#define Cancount (modbus+0x60) // ïàóçà ìåæäó ïîñûëêàìè CAN
#define CanWait (modbus+0x62) // ïàóçà ïîñëå ïðîõîæäåíèà öèêëà
#define CanRestart (modbus+0x64) // ïåðåçàïóñê ïîñûëêè
#define CanRepeat modbus[0x66] // ńęîëüęî đŕç ďîâňîđŕňü íŕäî
#define CanRptVez modbus[0x66] // êîë-âî ïîâòîðåíèé ïîñûëêè «keys»
#define CanRptLen modbus[0x67] // äëèíà ïîâòîðàåìîé ïîñûëêè «keys»
#define Bright (modbus+0x68) // àðêîñòü ñèãíàëüíûõ ëàìïî÷åê
#define Brightness modbus[0x68] // àðêîñòü ñèãíàëüíîé ëàìïî÷êè
@@ -107,8 +108,8 @@
#define K150_D TCaliber[1]
#define cancyclo 0x78 // åãî àäðåñ
#define CanCycle (modbus+0x78) // ń÷ĺň÷čę öčęëîâ CAN
#define CanRound (modbus+0x7A) // ń÷ĺň÷čę ĺůĺ áîëĺĺ ďîëíűő öčęëîâ CAN
#define CanCycle (modbus+0x78) // ñ÷åò÷èê ïðîõîæäåíèé öèêëîâ CAN
#define CanRound (modbus+0x7A) // ñ÷åò÷èê îòîñëàííûõ ìàññèâîâ
#define Protokol modbus[125]
#define LastMode modbus[126]
@@ -123,6 +124,8 @@
#define cSecretBt Modbus[127].bit.bit6
#define cCanReset Modbus[127].bit.bit7
#define cRawMeat Modbus[127].bit.bit8
#define cLiteFire Modbus[127].bit.bit9
#define cHighVolt Modbus[127].bit.bitA
#define cReset Modbus[127].bit.bitF