Archived
fix CAN filters
This commit is contained in:
Klagarge committed
1 parent
2b91ec2df0
commit
3f1e4c84f0
4 files changed
+72
-58
No files matched your search
@@ -109,26 +109,39 @@ void ECAN_Initialize(void)
|
|||||||
........................................................
|
........................................................
|
||||||
........................................................
|
........................................................
|
||||||
*/
|
*/
|
||||||
// mask 0 is 11 bits for filter 0 and 1
|
|
||||||
|
/*
|
||||||
|
* Mask 0 is 11 bits for filters 0 and 1 only
|
||||||
|
* filter set for 3 recipient bits
|
||||||
|
* Mask 1 is copy of mask 0 but for other filters
|
||||||
|
*/
|
||||||
convertCANid2Reg(0x070, dSTANDARD_CAN_MSG_ID_2_0B, &RXM0EIDH, &RXM0EIDL, &RXM0SIDH, &RXM0SIDL);
|
convertCANid2Reg(0x070, dSTANDARD_CAN_MSG_ID_2_0B, &RXM0EIDH, &RXM0EIDL, &RXM0SIDH, &RXM0SIDL);
|
||||||
// filter 0 and 1 is broadcast message
|
convertCANid2Reg(0x070, dSTANDARD_CAN_MSG_ID_2_0B, &RXM1EIDH, &RXM1EIDL, &RXM1SIDH, &RXM1SIDL);
|
||||||
|
|
||||||
|
// filter 0 is broadcast message
|
||||||
convertCANid2Reg(0x000, dSTANDARD_CAN_MSG_ID_2_0B, &RXF0EIDH, &RXF0EIDL, &RXF0SIDH, &RXF0SIDL);
|
convertCANid2Reg(0x000, dSTANDARD_CAN_MSG_ID_2_0B, &RXF0EIDH, &RXF0EIDL, &RXF0SIDH, &RXF0SIDL);
|
||||||
|
|
||||||
|
// filter 1 is message for controller
|
||||||
convertCANid2Reg(0x010, dSTANDARD_CAN_MSG_ID_2_0B, &RXF1EIDH, &RXF1EIDL, &RXF1SIDH, &RXF1SIDL);
|
convertCANid2Reg(0x010, dSTANDARD_CAN_MSG_ID_2_0B, &RXF1EIDH, &RXF1EIDL, &RXF1SIDH, &RXF1SIDL);
|
||||||
|
|
||||||
|
// filter 2 is message for recipient n°7, not yet defined
|
||||||
convertCANid2Reg(0x070, dSTANDARD_CAN_MSG_ID_2_0B, &RXF2EIDH, &RXF2EIDL, &RXF2SIDH, &RXF2SIDL);
|
convertCANid2Reg(0x070, dSTANDARD_CAN_MSG_ID_2_0B, &RXF2EIDH, &RXF2EIDL, &RXF2SIDH, &RXF2SIDL);
|
||||||
|
|
||||||
/**
|
/*
|
||||||
Enable Filters
|
* ENABLE FILTERS
|
||||||
*/
|
*
|
||||||
RXFCON0 = 0x01; // Filter 0 is activated
|
* Filter 0 set on mask 0
|
||||||
RXFCON1 = 0x00;
|
* Filter 1 set on mask 0
|
||||||
|
* Filter 2 set on mask 1
|
||||||
|
*/
|
||||||
|
RXFCON0 = 0x07;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Assign Filters to Masks
|
Assign Filters to Masks
|
||||||
*/
|
*/
|
||||||
MSEL0 = 0x00; // filter 0 is assigned to mask 0
|
// Filter 0 & 1 assigned to mask 0 and filter 2 assigned to mask 1
|
||||||
MSEL1 = 0x00;
|
MSEL0 = 0x10;
|
||||||
MSEL2 = 0x00;
|
|
||||||
MSEL3 = 0x00;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Initialize CAN Timings
|
Initialize CAN Timings
|
||||||
|
|||||||
@@ -85,9 +85,9 @@ bool CAN_processEvent(Event* ev) {
|
|||||||
// Send a message
|
// Send a message
|
||||||
if (ev->id == evCAsend) {
|
if (ev->id == evCAsend) {
|
||||||
uCAN_MSG canMsg;
|
uCAN_MSG canMsg;
|
||||||
canMsg.frame.idType = 0; // I don't understand what is it
|
canMsg.frame.idType = dSTANDARD_CAN_MSG_ID_2_0B; // standard
|
||||||
canMsg.frame.dlc = 4; // 4 bytes to send
|
canMsg.frame.dlc = 4; // 4 bytes to send
|
||||||
canMsg.frame.rtr = 0; // no remote frame
|
canMsg.frame.rtr = 0; // no remote frame
|
||||||
canMsg.frame.data3 = (uint8_t) data;
|
canMsg.frame.data3 = (uint8_t) data;
|
||||||
data = data >> 8;
|
data = data >> 8;
|
||||||
canMsg.frame.data2 = (uint8_t) data;
|
canMsg.frame.data2 = (uint8_t) data;
|
||||||
|
|||||||
@@ -210,6 +210,7 @@
|
|||||||
<property key="debugoptions.debug-startup" value="Use system settings"/>
|
<property key="debugoptions.debug-startup" value="Use system settings"/>
|
||||||
<property key="debugoptions.reset-behaviour" value="Use system settings"/>
|
<property key="debugoptions.reset-behaviour" value="Use system settings"/>
|
||||||
<property key="debugoptions.useswbreakpoints" value="false"/>
|
<property key="debugoptions.useswbreakpoints" value="false"/>
|
||||||
|
<property key="firmware.download.all" value="false"/>
|
||||||
<property key="hwtoolclock.frcindebug" value="false"/>
|
<property key="hwtoolclock.frcindebug" value="false"/>
|
||||||
<property key="memories.aux" value="false"/>
|
<property key="memories.aux" value="false"/>
|
||||||
<property key="memories.bootflash" value="true"/>
|
<property key="memories.bootflash" value="true"/>
|
||||||
|
|||||||
@@ -1948,7 +1948,7 @@
|
|||||||
</entry>
|
</entry>
|
||||||
<entry>
|
<entry>
|
||||||
<key class="com.microchip.mcc.core.tokenManager.CustomKey" moduleName="DMA Manager" name="dmaTable"/>
|
<key class="com.microchip.mcc.core.tokenManager.CustomKey" moduleName="DMA Manager" name="dmaTable"/>
|
||||||
<value>{"dataArray":[{"DMA Channels":{"data":{"isDisable":"true","options":"--NONE--","text":"DMA CHANNEL1","value":"false"},"id":"DMA Channels_rowCount_0"},"Src Module":{"data":{"isDisable":"true","options":"--NONE--,MEMORY,TMR0,ECAN","text":"--NONE--","value":"--NONE--"},"id":"Src Module_rowCount_0"},"Src Region":{"data":{"isDisable":"true","options":"SFR#disabled,GPR#enabled,Program Flash#enabled,Data EEPROM#enabled","text":"GPR","value":"GPR"},"id":"Src Region_rowCount_0"},"Src SFR":{"Src SFR":{"isDisable":"true","options":"","text":"","value":""},"data":{"isDisable":"true","options":"","text":"","value":""},"id":"Src SFR_rowCount_0"},"Src VarName":{"data":{"isDisable":"true","options":"","text":"SrcVarName0","value":"SrcVarName0"},"Src VarName":{"isDisable":"true","options":"","text":"SrcVarName0","value":"SrcVarName0"},"id":"Src VarName_rowCount_0"},"Src VarSize":{"data":{"isDisable":"true","options":"","text":"10","value":"10"},"id":"Src VarSize_rowCount_0","Src VarSize":{"isDisable":"true","options":"","text":"10","value":"10"}},"Src Address":{"data":{"isDisable":"true","options":"","text":"Enter Address0","value":"Enter Address0"},"id":"Src Address_rowCount_0","Src Address":{"isDisable":"true","options":"","text":"Enter Address0","value":"Enter Address0"}},"Src Mode":{"Src Mode":{"isDisable":"true","options":"decremented,incremented,unchanged","text":"unchanged","value":"unchanged"},"data":{"isDisable":"true","options":"decremented,incremented,unchanged","text":"unchanged","value":"unchanged"},"id":"Src Mode_rowCount_0"},"Src Message Size":{"data":{"isDisable":"true","options":"","text":"1","value":"1"},"Src Message Size":{"isDisable":"true","options":"","text":"1","value":"1"},"id":"Src Message Size_rowCount_0"},"Dst Module":{"data":{"isDisable":"true","options":"--NONE--,MEMORY,TMR0,ECAN","text":"--NONE--","value":"--NONE--"},"id":"Dst Module_rowCount_0"},"Dst Region":{"data":{"isDisable":"true","options":"SFR,GPR","text":"GPR","value":"GPR"},"id":"Dst Region_rowCount_0"},"Dst SFR":{"Dst SFR":{"isDisable":"true","options":"","text":"","value":""},"data":{"isDisable":"true","options":"","text":"","value":""},"id":"Dst SFR_rowCount_0"},"Dst VarName":{"data":{"isDisable":"true","options":"","text":"DstVarName0","value":"DstVarName0"},"Dst VarName":{"isDisable":"true","options":"","text":"DstVarName0","value":"DstVarName0"},"id":"Dst VarName_rowCount_0"},"Dst VarSize":{"data":{"isDisable":"true","options":"","text":"10","value":"10"},"id":"Dst VarSize_rowCount_0","Dst VarSize":{"isDisable":"true",&Line truncated
|
<value>{"dataArray":[{"DMA Channels":{"data":{"isDisable":"true","options":"--NONE--","text":"DMA CHANNEL1","value":"false"},"id":"DMA Channels_rowCount_0"},"Src Module":{"data":{"isDisable":"true","options":"--NONE--,ECAN,MEMORY,TMR0","text":"--NONE--","value":"--NONE--"},"id":"Src Module_rowCount_0"},"Src Region":{"data":{"isDisable":"true","options":"SFR#disabled,GPR#enabled,Program Flash#enabled,Data EEPROM#enabled","text":"GPR","value":"GPR"},"id":"Src Region_rowCount_0"},"Src SFR":{"Src SFR":{"isDisable":"true","options":"","text":"","value":""},"data":{"isDisable":"true","options":"","text":"","value":""},"id":"Src SFR_rowCount_0"},"Src VarName":{"data":{"isDisable":"true","options":"","text":"SrcVarName0","value":"SrcVarName0"},"Src VarName":{"isDisable":"true","options":"","text":"SrcVarName0","value":"SrcVarName0"},"id":"Src VarName_rowCount_0"},"Src VarSize":{"data":{"isDisable":"true","options":"","text":"10","value":"10"},"id":"Src VarSize_rowCount_0","Src VarSize":{"isDisable":"true","options":"","text":"10","value":"10"}},"Src Address":{"data":{"isDisable":"true","options":"","text":"Enter Address0","value":"Enter Address0"},"id":"Src Address_rowCount_0","Src Address":{"isDisable":"true","options":"","text":"Enter Address0","value":"Enter Address0"}},"Src Mode":{"Src Mode":{"isDisable":"true","options":"decremented,incremented,unchanged","text":"unchanged","value":"unchanged"},"data":{"isDisable":"true","options":"decremented,incremented,unchanged","text":"unchanged","value":"unchanged"},"id":"Src Mode_rowCount_0"},"Src Message Size":{"data":{"isDisable":"true","options":"","text":"1","value":"1"},"Src Message Size":{"isDisable":"true","options":"","text":"1","value":"1"},"id":"Src Message Size_rowCount_0"},"Dst Module":{"data":{"isDisable":"true","options":"--NONE--,ECAN,MEMORY,TMR0","text":"--NONE--","value":"--NONE--"},"id":"Dst Module_rowCount_0"},"Dst Region":{"data":{"isDisable":"true","options":"SFR,GPR","text":"GPR","value":"GPR"},"id":"Dst Region_rowCount_0"},"Dst SFR":{"Dst SFR":{"isDisable":"true","options":"","text":"","value":""},"data":{"isDisable":"true","options":"","text":"","value":""},"id":"Dst SFR_rowCount_0"},"Dst VarName":{"data":{"isDisable":"true","options":"","text":"DstVarName0","value":"DstVarName0"},"Dst VarName":{"isDisable":"true","options":"","text":"DstVarName0","value":"DstVarName0"},"id":"Dst VarName_rowCount_0"},"Dst VarSize":{"data":{"isDisable":"true","options":"","text":"10","value":"10"},"id":"Dst VarSize_rowCount_0","Dst VarSize":{"isDisable":"true",&Line truncated
|
||||||
</entry>
|
</entry>
|
||||||
<entry>
|
<entry>
|
||||||
<key class="com.microchip.mcc.core.tokenManager.CustomKey" moduleName="ECAN" name="ECAN_ERRIISRFunction"/>
|
<key class="com.microchip.mcc.core.tokenManager.CustomKey" moduleName="ECAN" name="ECAN_ERRIISRFunction"/>
|
||||||
@@ -17159,7 +17159,27 @@
|
|||||||
<value>Window delay time 87.5%</value>
|
<value>Window delay time 87.5%</value>
|
||||||
</entry>
|
</entry>
|
||||||
</tokenMap>
|
</tokenMap>
|
||||||
<generatedFileHashHistoryMap class="java.util.TreeMap">
|
<generatedFileHashHistoryMap class="java.util.HashMap">
|
||||||
|
<entry>
|
||||||
|
<file>mcc_generated_files\mcc.h</file>
|
||||||
|
<hash>aead6835bc73f4332d9abb5de6c2a40829de25cc98452c4c69960d51b52844e9</hash>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<file>mcc_generated_files\device_config.h</file>
|
||||||
|
<hash>2f04b3ff01bbe49769634d389433c7010ffb45d0f2973898e33988be7ab07d56</hash>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<file>mcc_generated_files\interrupt_manager.h</file>
|
||||||
|
<hash>313560861c27e0a0b39b2bbb6a64ac2068fd1937dc0339d7303ff241bbb52955</hash>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<file>mcc_generated_files\memory.c</file>
|
||||||
|
<hash>ae2dbb373f8f03dd013cde153de046ba7c3c41033c1dedb8545cde41837ca3da</hash>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<file>mcc_generated_files\tmr0.h</file>
|
||||||
|
<hash>68e2ba0f47166abd2da1a472d6a67bfde31f9be3edc8582ace93062a6a32f441</hash>
|
||||||
|
</entry>
|
||||||
<entry>
|
<entry>
|
||||||
<file>main.c</file>
|
<file>main.c</file>
|
||||||
<hash>91afd5df6694cfcd0279d66d9b5b3eb72a9c4eae825f0c0af82824e2ee66e35e</hash>
|
<hash>91afd5df6694cfcd0279d66d9b5b3eb72a9c4eae825f0c0af82824e2ee66e35e</hash>
|
||||||
@@ -17168,46 +17188,6 @@
|
|||||||
<file>mcc_generated_files\device_config.c</file>
|
<file>mcc_generated_files\device_config.c</file>
|
||||||
<hash>4288704a051756dce8bb92e77a82ba1285fc638cde56b3676b59406ba0fcea7b</hash>
|
<hash>4288704a051756dce8bb92e77a82ba1285fc638cde56b3676b59406ba0fcea7b</hash>
|
||||||
</entry>
|
</entry>
|
||||||
<entry>
|
|
||||||
<file>mcc_generated_files\device_config.h</file>
|
|
||||||
<hash>2f04b3ff01bbe49769634d389433c7010ffb45d0f2973898e33988be7ab07d56</hash>
|
|
||||||
</entry>
|
|
||||||
<entry>
|
|
||||||
<file>mcc_generated_files\ecan.c</file>
|
|
||||||
<hash>b60a119876875a2af386474d32176b8be0f47a074a2d8688e79251a2d7cdf6fa</hash>
|
|
||||||
</entry>
|
|
||||||
<entry>
|
|
||||||
<file>mcc_generated_files\ecan.h</file>
|
|
||||||
<hash>0473fedf57d1376193e049ba507abed0960af84f0e416bea25972c4dae59ca26</hash>
|
|
||||||
</entry>
|
|
||||||
<entry>
|
|
||||||
<file>mcc_generated_files\interrupt_manager.c</file>
|
|
||||||
<hash>bb0eaf9aec0554de0106cff27f66e56ae02a40bbdcb68d4d58d8a0d84d8929f6</hash>
|
|
||||||
</entry>
|
|
||||||
<entry>
|
|
||||||
<file>mcc_generated_files\interrupt_manager.h</file>
|
|
||||||
<hash>313560861c27e0a0b39b2bbb6a64ac2068fd1937dc0339d7303ff241bbb52955</hash>
|
|
||||||
</entry>
|
|
||||||
<entry>
|
|
||||||
<file>mcc_generated_files\mcc.c</file>
|
|
||||||
<hash>34fadc3a271040b358215ec477acf3e135b77137f9a1cc96def75fc2936d3ad6</hash>
|
|
||||||
</entry>
|
|
||||||
<entry>
|
|
||||||
<file>mcc_generated_files\mcc.h</file>
|
|
||||||
<hash>aead6835bc73f4332d9abb5de6c2a40829de25cc98452c4c69960d51b52844e9</hash>
|
|
||||||
</entry>
|
|
||||||
<entry>
|
|
||||||
<file>mcc_generated_files\memory.c</file>
|
|
||||||
<hash>ae2dbb373f8f03dd013cde153de046ba7c3c41033c1dedb8545cde41837ca3da</hash>
|
|
||||||
</entry>
|
|
||||||
<entry>
|
|
||||||
<file>mcc_generated_files\memory.h</file>
|
|
||||||
<hash>77a34d015c961db9ed465b4ca2d85ba910fb030ca14c3c2854428ab0b9b6fac2</hash>
|
|
||||||
</entry>
|
|
||||||
<entry>
|
|
||||||
<file>mcc_generated_files\pin_manager.c</file>
|
|
||||||
<hash>f8ace8a0b0d2a4f0ed3e209db056da57858e5a670ad7d514e44352d9187be806</hash>
|
|
||||||
</entry>
|
|
||||||
<entry>
|
<entry>
|
||||||
<file>mcc_generated_files\pin_manager.h</file>
|
<file>mcc_generated_files\pin_manager.h</file>
|
||||||
<hash>3e61569926ed5f184a2267965f2cf7ca26dc997d552c213ebd94dbd80da54891</hash>
|
<hash>3e61569926ed5f184a2267965f2cf7ca26dc997d552c213ebd94dbd80da54891</hash>
|
||||||
@@ -17217,8 +17197,28 @@
|
|||||||
<hash>f9702dc8c67433ffc3b8db9e12ee3a73fb0b152a792d26f6c7a89a3846bc4fc9</hash>
|
<hash>f9702dc8c67433ffc3b8db9e12ee3a73fb0b152a792d26f6c7a89a3846bc4fc9</hash>
|
||||||
</entry>
|
</entry>
|
||||||
<entry>
|
<entry>
|
||||||
<file>mcc_generated_files\tmr0.h</file>
|
<file>mcc_generated_files\pin_manager.c</file>
|
||||||
<hash>68e2ba0f47166abd2da1a472d6a67bfde31f9be3edc8582ace93062a6a32f441</hash>
|
<hash>f8ace8a0b0d2a4f0ed3e209db056da57858e5a670ad7d514e44352d9187be806</hash>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<file>mcc_generated_files\ecan.c</file>
|
||||||
|
<hash>b60a119876875a2af386474d32176b8be0f47a074a2d8688e79251a2d7cdf6fa</hash>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<file>mcc_generated_files\mcc.c</file>
|
||||||
|
<hash>34fadc3a271040b358215ec477acf3e135b77137f9a1cc96def75fc2936d3ad6</hash>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<file>mcc_generated_files\interrupt_manager.c</file>
|
||||||
|
<hash>bb0eaf9aec0554de0106cff27f66e56ae02a40bbdcb68d4d58d8a0d84d8929f6</hash>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<file>mcc_generated_files\ecan.h</file>
|
||||||
|
<hash>0473fedf57d1376193e049ba507abed0960af84f0e416bea25972c4dae59ca26</hash>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<file>mcc_generated_files\memory.h</file>
|
||||||
|
<hash>77a34d015c961db9ed465b4ca2d85ba910fb030ca14c3c2854428ab0b9b6fac2</hash>
|
||||||
</entry>
|
</entry>
|
||||||
</generatedFileHashHistoryMap>
|
</generatedFileHashHistoryMap>
|
||||||
</config>
|
</config>
|
||||||
Reference in new issue
Block a user