diff --git a/CAN.C b/CAN.C index 3351a00..972c676 100644 --- a/CAN.C +++ b/CAN.C @@ -150,19 +150,15 @@ void CAN_vInit(void) /// General Configuration of the Node 0: /// - set INIT and CCE - /// - enable interrupt generation upon a change of BOFF or EWARN or upon a - /// set of LLE, LOE or INIT - /// - alert interrupt node pointer: MultiCAN SRN 0 - //-----------CAN_NCR0 = 0x00000049------------------------------------- + //-----------CAN_NCR0 = 0x00000041------------------------------------- CAN_vWriteCANAddress(CAN_NCR0); // Addressing CAN_NCR0 - CAN_DATA0 = 0x49; // load NODE 0 control register[7-0] + CAN_DATA0 = 0x41; // load NODE 0 control register[7-0] CAN_vWriteEN(D0_VALID+ADR_INC); // Data0 is Valid for transmission and // Write is EnabledCAN Address pointing // to the CAN_NSR0. - // CAN Address pointing to the CAN_NIPR0 CAN_ADCON = ADR_INC; // Auto Increment the current address(+1) @@ -198,15 +194,15 @@ void CAN_vInit(void) /// Configuration of the Node 0 Baud Rate: /// - required baud rate = 250.000 kbaud /// - real baud rate = 250.000 kbaud - /// - sample point = 75.00 % - /// - there are 11 time quanta before sample point - /// - there are 4 time quanta after sample point + /// - sample point = 83.33 % + /// - there are 9 time quanta before sample point + /// - there are 2 time quanta after sample point /// - the (re)synchronization jump width is 2 time quanta - //-----------CAN_NBTR0 = 0x00003A4B------------------------------------- + //-----------CAN_NBTR0 = 0x0000184F------------------------------------- - CAN_DATA0 = 0x4B; // load NBTR0_SJW, BRP - CAN_DATA1 = 0x3A; // load NBTR0_DIV8, TSEG2, TSEG1 + CAN_DATA0 = 0x4F; // load NBTR0_SJW, BRP + CAN_DATA1 = 0x18; // load NBTR0_DIV8, TSEG2, TSEG1 CAN_vWriteEN(D0_VALID+D1_VALID+ADR_INC); // Data0, 1 are valid for // transmission and Write is // Enabled with Auto @@ -401,11 +397,11 @@ void CAN_vInit(void) /// - priority class 3; transmit acceptance filtering is based on the list /// order (like class 1) /// - extended 29-bit identifier - /// - identifier 29-bit: 0x12000023 + /// - identifier 29-bit: 0x11000023 - //--------------MOAR6 = 0xF2000023--------------------------------------- + //--------------MOAR6 = 0xF1000023--------------------------------------- - CAN_vWriteAMData(0xF2000023); // load MO6 arbitration register + CAN_vWriteAMData(0xF1000023); // load MO6 arbitration register // CAN Address pointing to the CAN_MODATAH6 CAN_ADCON = ADR_DEC; // Auto Decrement the current address(-1) @@ -478,11 +474,11 @@ void CAN_vInit(void) /// - priority class 3; transmit acceptance filtering is based on the list /// order (like class 1) /// - extended 29-bit identifier - /// - identifier 29-bit: 0x11000123 + /// - identifier 29-bit: 0x11000124 - //--------------MOAR7 = 0xF1000123--------------------------------------- + //--------------MOAR7 = 0xF1000124--------------------------------------- - CAN_vWriteAMData(0xF1000123); // load MO7 arbitration register + CAN_vWriteAMData(0xF1000124); // load MO7 arbitration register // CAN Address pointing to the CAN_MODATAH7 CAN_ADCON = ADR_DEC; // Auto Decrement the current address(-1) @@ -710,11 +706,11 @@ void CAN_vInit(void) /// - priority class 3; transmit acceptance filtering is based on the list /// order (like class 1) /// - extended 29-bit identifier - /// - identifier 29-bit: 0x12000024 + /// - identifier 29-bit: 0x11000024 - //--------------MOAR10 = 0xF2000024--------------------------------------- + //--------------MOAR10 = 0xF1000024--------------------------------------- - CAN_vWriteAMData(0xF2000024); // load MO10 arbitration register + CAN_vWriteAMData(0xF1000024); // load MO10 arbitration register // CAN Address pointing to the CAN_MODATAH10 CAN_ADCON = ADR_DEC; // Auto Decrement the current address(-1) diff --git a/CL2.0.uvgui.liuminVir b/CL2.0.uvgui.liuminVir index 6ba5862..4c0fc40 100644 --- a/CL2.0.uvgui.liuminVir +++ b/CL2.0.uvgui.liuminVir @@ -6,7 +6,7 @@
### uVision Project, (C) Keil Software
- + C:\Users\liuminVir\Desktop\20250115_IO閲囬泦 @@ -15,17 +15,17 @@ 38003 Registers - 140 89 + 140 113 346 Code Coverage - 1007 160 + 883 160 204 Performance Analyzer - 1167 + 1043 @@ -70,7 +70,7 @@ 466 Source Browser 500 - 300 + 166 @@ -101,17 +101,17 @@ -1 - 0 - -7 - 950 - 938 + 138 + 841 + 1798 + 1076 0 - 403 - 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000003000000020000000100000031433A5C55736572735C6C69756D696E5669725C4465736B746F705C32303235303131355F494FB2C9BCAF5C554152542E430000000006554152542E4300000000C5D4F200FFFFFFFF38433A5C55736572735C6C69756D696E5669725C4465736B746F705C32303235303432392D314D2DD6D5B6CBD2A3BFD8C6F75C557365722E630000000006557365722E6300000000FFDC7800FFFFFFFF37433A5C55736572735C6C69756D696E5669725C4465736B746F705C32303235303432392D314D2DD6D5B6CBD2A3BFD8C6F75C43414E2E43000000000543414E2E4300000000BECEA100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F3000000650000007A07000049030000 + 490 + 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000004000000010000000100000038433A5C55736572735C6C69756D696E5669725C4465736B746F705C32303235303432392D314D2DD6D5B6CBD2A3BFD8C6F75C4D41494E2E4300000000064D41494E2E4300000000C5D4F200FFFFFFFF37433A5C55736572735C6C69756D696E5669725C4465736B746F705C32303235303432392D314D2DD6D5B6CBD2A3BFD8C6F75C43414E2E43000000000543414E2E4300000000FFDC7800FFFFFFFF38433A5C55736572735C6C69756D696E5669725C4465736B746F705C32303235303432392D314D2DD6D5B6CBD2A3BFD8C6F75C557365722E630000000006557365722E6300000000BECEA100FFFFFFFF38433A5C55736572735C6C69756D696E5669725C4465736B746F705C32303235303432392D314D2DD6D5B6CBD2A3BFD8C6F75C757365722E480000000006757365722E4800000000F0A0A100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000000B010000650000007A07000049030000 @@ -130,11 +130,11 @@ 0 16 - F30000004F0000008C050000C7000000 + DA0000004F000000F7040000C7000000 16 - F3000000650000008C050000DD000000 + 2B040000F7000000480800006F010000 @@ -150,11 +150,11 @@ 0 16 - 0300000066000000EC0000001A030000 + 0300000066000000040100001A030000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -170,11 +170,11 @@ 0 16 - 0300000066000000EC0000001A030000 + 0300000066000000040100001A030000 16 - 3A000000500000005601000033020000 + B7000000CD000000B5010000B0020000 @@ -190,11 +190,11 @@ 0 16 - 03000000D3010000890500002F020000 + 03000000D3010000F40400002F020000 16 - 3A0000005000000000030000C8000000 + B7000000CD0000003203000045010000 @@ -210,11 +210,11 @@ 0 16 - 03000000D3010000890500002F020000 + 03000000D3010000F40400002F020000 16 - 3A0000005000000000030000C8000000 + B7000000CD0000003203000045010000 @@ -230,11 +230,11 @@ 0 16 - 03000000D3010000890500002F020000 + 03000000D3010000F40400002F020000 16 - 3A0000005000000000030000C8000000 + B7000000CD0000003203000045010000 @@ -250,11 +250,11 @@ 0 16 - 03000000D3010000890500002F020000 + 03000000D3010000F40400002F020000 16 - 3A0000005000000000030000C8000000 + B7000000CD0000003203000045010000 @@ -270,11 +270,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -290,11 +290,11 @@ 0 16 - F60000006600000089050000AE000000 + DD00000066000000F4040000AE000000 16 - 3A0000005000000000030000C8000000 + B7000000CD0000003203000045010000 @@ -310,11 +310,11 @@ 0 16 - 03000000D3010000890500002F020000 + 03000000D3010000F40400002F020000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -330,11 +330,11 @@ 0 16 - 03000000D3010000890500002F020000 + 03000000D3010000F40400002F020000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -350,11 +350,11 @@ 0 16 - 03000000D3010000890500002F020000 + 03000000D3010000F40400002F020000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -370,11 +370,11 @@ 0 16 - 03000000D3010000890500002F020000 + 03000000D3010000F40400002F020000 16 - 3A0000005000000000030000C8000000 + B7000000CD0000003203000045010000 @@ -390,11 +390,11 @@ 0 16 - 03000000D3010000890500002F020000 + 03000000D3010000F40400002F020000 16 - 3A0000005000000000030000C8000000 + B7000000CD0000003203000045010000 @@ -410,11 +410,11 @@ 0 16 - 03000000D3010000890500002F020000 + 03000000D3010000F40400002F020000 16 - 3A0000005000000000030000C8000000 + B7000000CD0000003203000045010000 @@ -430,11 +430,11 @@ 0 16 - 03000000D3010000890500002F020000 + 03000000D3010000F40400002F020000 16 - 3A0000005000000000030000C8000000 + B7000000CD0000003203000045010000 @@ -450,11 +450,11 @@ 0 16 - 0300000066000000EC0000001A030000 + 0300000066000000040100001A030000 16 - 3A000000500000005601000033020000 + B7000000CD000000B5010000B0020000 @@ -470,11 +470,11 @@ 0 16 - 0300000066000000EC0000001A030000 + 0300000066000000040100001A030000 16 - 3A000000500000005601000033020000 + B7000000CD000000B5010000B0020000 @@ -490,11 +490,11 @@ 0 16 - 00000000400300007A07000044040000 + 0000000036040000AD03000011050000 16 - 3A0000005000000000030000C8000000 + B7000000CD0000003203000045010000 @@ -510,11 +510,11 @@ 0 16 - 00000000BC0100008C05000048020000 + 00000000BC010000F704000048020000 16 - 3A0000005000000000030000C8000000 + B7000000CD0000003203000045010000 @@ -526,15 +526,15 @@ 0 32767 0 - 4096 + 32768 0 16 - 03000000480200007707000030030000 + 000000005B030000AD03000036040000 16 - 3A0000005000000000030000C8000000 + B7000000CD0000003203000045010000 @@ -550,11 +550,11 @@ 0 16 - F60000006600000089050000AE000000 + DD00000066000000F4040000AE000000 16 - 3A0000005000000000030000C8000000 + B7000000CD0000003203000045010000 @@ -570,11 +570,11 @@ 0 16 - F60000006600000089050000AE000000 + DD00000066000000F4040000AE000000 16 - 3A0000005000000000030000C8000000 + B7000000CD0000003203000045010000 @@ -610,11 +610,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -630,11 +630,11 @@ 0 16 - 03000000D3010000890500002F020000 + 03000000D3010000F40400002F020000 16 - 3A0000005000000000030000C8000000 + B7000000CD0000003203000045010000 @@ -650,11 +650,11 @@ 0 16 - F60000006600000089050000AE000000 + DD00000066000000F4040000AE000000 16 - 3A0000005000000000030000C8000000 + B7000000CD0000003203000045010000 @@ -670,11 +670,11 @@ 0 16 - F60000006600000089050000AE000000 + DD00000066000000F4040000AE000000 16 - 3A0000005000000000030000C8000000 + B7000000CD0000003203000045010000 @@ -690,11 +690,11 @@ 0 16 - F60000006600000089050000AE000000 + DD00000066000000F4040000AE000000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -710,11 +710,11 @@ 0 16 - F60000006600000089050000AE000000 + DD00000066000000F4040000AE000000 16 - 3A0000005000000000030000C8000000 + B7000000CD0000003203000045010000 @@ -730,11 +730,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -750,11 +750,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -770,11 +770,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -790,11 +790,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -810,11 +810,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -830,11 +830,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -850,11 +850,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -870,11 +870,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -890,11 +890,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -910,11 +910,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -930,11 +930,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -950,11 +950,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -970,11 +970,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -990,11 +990,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1010,11 +1010,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1030,11 +1030,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1050,11 +1050,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1070,11 +1070,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1090,11 +1090,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1110,11 +1110,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1130,11 +1130,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1150,11 +1150,11 @@ 0 16 - 0300000066000000EC0000001A030000 + 0300000066000000040100000A030000 16 - 3A000000500000005601000033020000 + B7000000CD000000B5010000B0020000 @@ -1166,15 +1166,15 @@ 0 32767 0 - 4096 + 32768 0 16 - 03000000480200007707000030030000 + 03000000F90200007D070000B8030000 16 - 3A0000005000000000030000C8000000 + B7000000CD0000003203000045010000 @@ -1186,15 +1186,15 @@ 0 32767 0 - 4096 + 32768 0 16 - 03000000480200007707000030030000 + 03000000F90200007D070000B8030000 16 - 3A000000500000005601000033020000 + B7000000CD000000B5010000B0020000 @@ -1210,11 +1210,11 @@ 0 16 - 03000000D3010000890500002F020000 + 03000000D3010000F40400002F020000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1230,11 +1230,11 @@ 0 16 - 03000000D3010000890500002F020000 + 03000000D3010000F40400002F020000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1246,15 +1246,15 @@ 0 32767 0 - 4096 + 32768 0 16 - 03000000480200007707000030030000 + 03000000F90200007D070000B8030000 16 - 3A000000500000005601000033020000 + B7000000CD000000B5010000B0020000 @@ -1266,15 +1266,15 @@ 0 32767 0 - 4096 + 32768 0 16 - 03000000480200007707000030030000 + 03000000F90200007D070000B8030000 16 - 3A000000500000005601000033020000 + B7000000CD000000B5010000B0020000 @@ -1290,11 +1290,11 @@ 0 16 - F60000006600000089050000AE000000 + DD00000066000000F4040000AE000000 16 - 3A0000005000000000030000C8000000 + B7000000CD0000003203000045010000 @@ -1310,11 +1310,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1330,11 +1330,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1350,11 +1350,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1370,11 +1370,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1390,11 +1390,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1410,11 +1410,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1430,11 +1430,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1450,11 +1450,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1470,11 +1470,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1490,11 +1490,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1510,11 +1510,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1530,11 +1530,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1550,11 +1550,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1570,11 +1570,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1590,11 +1590,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1610,11 +1610,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1630,11 +1630,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1650,11 +1650,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1670,11 +1670,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1690,11 +1690,11 @@ 0 16 - A00400006600000089050000B3010000 + 2404000066000000F4040000B3010000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 @@ -1790,23 +1790,23 @@ 0 16 - 03000000D3010000890500002F020000 + 03000000D3010000F40400002F020000 16 - 3A0000005000000029010000FC000000 + B7000000CD0000008D01000078010000 - 3315 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF3000000C70000008C050000CB000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000F3000000650000008C050000DD000000F30000004F0000008C050000C70000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF990400004F0000009D040000CC010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000009D040000650000008C050000E20100009D0400004F0000008C050000CC01000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFEF0000004F000000F300000033030000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000065000000EF00000049030000000000004F000000EF000000330300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF00000000B80100008C050000BC01000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB0900000180008000000000000000000000D20100008C0500005E02000000000000BC0100008C0500004802000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC6020000BC010000CA0200004802000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF000000002D0200007A070000310200000000000001000000040000000100000087FDFFFF76000000FFFFFFFF05000000C7000000B4010000D2010000CF010000779400000180008000000000000000000000470200007A0700005F03000000000000310200007A070000490300000000000040820046050000000D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC700000001000000FFFFFFFFC70000000000000001000000C5000000008000000100000000000000560300007A0700005A04000001000000010000000100000000000000 + 3316 + 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFDA000000C7000000F7040000CB000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E6500200000000000002B040000F7000000480800006F010000DA0000004F000000F7040000C70000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF1D0400004F00000021040000CC010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C300000180004000000000000072070000F70000004808000074020000210400004F000000F7040000CC01000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF070100004F0000000B01000033030000010000000200001004000000010000002CFFFFFFD5050000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000051030000F700000058040000CB030000000000004F00000007010000330300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF00000000B8010000F7040000BC01000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000510300006402000048080000F002000000000000BC010000F70400004802000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF7C020000BC010000800200004802000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF00000000DE02000080070000E20200000000000001000000040000000100000089FDFFFF76000000FFFFFFFF04000000B4010000D2010000CF0100007794000001800080000000000000510300008A030000D10A00007904000000000000E202000080070000D10300000000000040820046040000000A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFB401000001000000FFFFFFFFB40100000000000002000000C700000000800000010000000000000071030000AD0300004C040000010000000100000001000000C50000000080000001000000000000004C040000AD0300002705000001000000010000000100000000000000 59392 File - 2864 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000C556E537753616D706C655F31960000000000000014000C556E537753616D706C655F310231320B44465F5377547854656D7016756E5F696E665F63616E5F6B67665F6F7574707574311C556E496E6643616E5F312E417272446174612E4172725B305D5B345D1C556E496E6643616E5F312E417272446174612E4172725B305D5B355D0743616E52585458056954656D70064D41584E554D0C4F575F52656164324269747306526F6D4E756D16556E496E6643616E5F312E417272446174612E4172720450335F350A556E496E6643616E5F310450315F3204736269740450305F320753774F757431340F496E697443616E5472616E736D69740650315F4449520000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 2901 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000D63616E5F6572726F725F636E74960000000000000014000D63616E5F6572726F725F636E740A556E496E6643616E5F311C556E496E6643616E5F312E417272446174612E4172725B305D5B335D0C556E537753616D706C655F3102CEDE06504D434F4E300D626D3835363347657454696D650E626D38353633536574416C61726D0231320B44465F5377547854656D7016756E5F696E665F63616E5F6B67665F6F7574707574311C556E496E6643616E5F312E417272446174612E4172725B305D5B345D1C556E496E6643616E5F312E417272446174612E4172725B305D5B355D0743616E52585458056954656D70064D41584E554D0C4F575F52656164324269747306526F6D4E756D16556E496E6643616E5F312E417272446174612E4172720450335F350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -1862,30 +1862,39 @@ 0 100 - 2 + 1 - ..\20250115_IO閲囬泦\UART.C - 0 - 21 - 22 - 1 - - 0 - - - .\User.c - 5 - 269 - 337 + .\MAIN.C + 36 + 14 + 15 1 0 .\CAN.C - 41 - 166 - 12 + 33 + 678 + 617 + 1 + + 0 + + + .\User.c + 24 + 468 + 506 + 1 + + 0 + + + user.H + 0 + 18 + 30 1 0 diff --git a/CL2.0.uvopt b/CL2.0.uvopt index dcb2fd5..7f28f08 100644 --- a/CL2.0.uvopt +++ b/CL2.0.uvopt @@ -281,7 +281,7 @@ 1 5 1 - 0 + 1 0 1 .\CAN.C diff --git a/User.c b/User.c index 54885d5..12ad108 100644 --- a/User.c +++ b/User.c @@ -17,9 +17,6 @@ bit FlgOneTime = 0; ubyte uart2RxFlag = 0; uword RgCanPerid = 50; -ubyte can_error_cnt = 0; -ubyte can_error_flg = 0; - //PWM 20181227 ubyte PwmH[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; //----------------------------------------------------------------------- @@ -261,7 +258,7 @@ void sbusCanDecode(void) SBUS2CANdecodeTemp = (float)(sbus_data.channels[0]); SBUS2CANdecodeTemp = (DF_ZeroValue - SBUS2CANdecodeTemp)*23;//需要变换一下符号，因为加油是正 DF_Curvature = (int16_t)SBUS2CANdecodeTemp;//曲率 - if( (DF_Curvature > (-50)) && (DF_Curvature < 50) ) //增加回0的死区，解决会中问题。 + if( (DF_Curvature > (-200)) && (DF_Curvature < 200) ) //增加回0的死区，解决会中问题。 { DF_Curvature = 0; } @@ -276,17 +273,17 @@ void sbusCanDecode(void) } //备用 - SBUS2CANdecodeTemp = (float)(sbus_data.channels[7]); + SBUS2CANdecodeTemp = (float)(sbus_data.channels[11]); SBUS2CANdecodeTemp = (DF_ZeroValue - SBUS2CANdecodeTemp);//需要变换一下符号，因为加油是正 DF_Reserve = (int16_t)SBUS2CANdecodeTemp;//转速 if( (DF_Reserve > (-50)) && (DF_Reserve < 50) ) //增加回0的死区，解决会中问题。 { DF_Reserve = 0; } - + //SwA - if(sbus_data.channels[1] >= 1700)//按下 + if(sbus_data.channels[12] >= 1700)//按下 { DF_SwA = 1; } @@ -296,11 +293,11 @@ void sbusCanDecode(void) } //SwB - if(sbus_data.channels[6] >= 1700)//第三档 + if(sbus_data.channels[4] >= 1700)//第三档 { DF_SwB = 2; } - else if(sbus_data.channels[6] <= 250)//第二档 + else if(sbus_data.channels[4] <= 500)//第二档 { DF_SwB = 0; } @@ -310,11 +307,11 @@ void sbusCanDecode(void) } //SwC - if(sbus_data.channels[4] >= 1700)//第三档 + if(sbus_data.channels[7] >= 1700)//第三档 { DF_SwC = 2; } - else if(sbus_data.channels[4] <= 250)//第二档 + else if(sbus_data.channels[7] <= 500)//第二档 { DF_SwC = 0; } @@ -324,7 +321,7 @@ void sbusCanDecode(void) } //SwD - if(sbus_data.channels[5] >= 1700)//按下 + if(sbus_data.channels[13] >= 1700)//按下 { DF_SwD = 1; } @@ -347,13 +344,41 @@ void sbusCanDecode(void) SBUS2CANdecodeTemp = (float)(sbus_data.channels[3]); UnRemoteControlOutput_2.bit_data.curvature = (int16_t)SBUS2CANdecodeTemp;//保留轴 - - } - - UnRemoteControlOutput_2.bit_data.switch_a = P1_2;// - UnRemoteControlOutput_2.bit_data.switch_d = P1_3;// -} + + UnRemoteControlOutput_2.bit_data.reserve1 = (uint16_t)(sbus_data.channels[10]); + + + //SwB + if(sbus_data.channels[5] >= 1700)//第三档 + { + UnRemoteControlOutput_2.bit_data.switch_b = 2; + } + else if(sbus_data.channels[5] <= 500)//第二档 + { + UnRemoteControlOutput_2.bit_data.switch_b = 0; + } + else//第一档 + { + UnRemoteControlOutput_2.bit_data.switch_b = 1; + } + + //SwC + if(sbus_data.channels[6] >= 1700)//第三档 + { + UnRemoteControlOutput_2.bit_data.switch_c = 2; + } + else if(sbus_data.channels[6] <= 500)//第二档 + { + UnRemoteControlOutput_2.bit_data.switch_c = 0; + } + else//第一档 + { + UnRemoteControlOutput_2.bit_data.switch_c = 1; + } + } + +} //CAN发送接收 void CanRXTX(void) @@ -478,18 +503,11 @@ void CanRXTX(void) } CanTransmit(DF_SwTx,(ubyte *)&UnRemoteControlOutput_1.arr[0]); - CanTransmit(DF_SwTx1,(ubyte *)&UnRemoteControlOutput_2.arr[0]); + CanTransmit(DF_SwTx1,(ubyte *)&UnRemoteControlOutput_2.arr[0]); + + + } - - if( (0x40 == can_error_cnt) || (0x80 == can_error_cnt) )//20250625判断是否出现总线错误 - { - can_error_flg = can_error_cnt; - CAN_vInit(); - can_error_cnt = 0; - } - - - } diff --git a/user.H b/user.H index 4cf5f6f..a670ef1 100644 --- a/user.H +++ b/user.H @@ -149,7 +149,6 @@ extern bit FlgCan_1; extern ubyte rxbuf[25]; extern ubyte uart2RxFlag; -extern ubyte can_error_cnt; void CanRXTX(void);