Index: output/bt_code.c =================================================================== --- /YC3121_demo/ModuleDemo/BlueTooth/BT_code_patch/print/branches/gezhiweixin/output/bt_code.c (revision 986) +++ /YC3121_demo/ModuleDemo/BlueTooth/BT_code_patch/print/branches/gezhiweixin/output/bt_code.c (working copy) @@ -121,7 +121,7 @@ 0x00,0x03,0x68,0x42,0x45,0x3b,0x98,0x40,0x84,0x00,0x60,0x42,0x45,0x3b,0x20,0x60, 0x00,0x00,0x1a,0x22,0x06,0x00,0xef,0xe2,0x00,0x03,0xc0,0x00,0x4f,0x1c,0xc0,0x00, 0xcf,0x1f,0xc0,0x01,0x4f,0x25,0xc0,0x01,0x81,0xe6,0x20,0x20,0x50,0x1c,0x58,0x00, -0x00,0x01,0x20,0x20,0x4f,0x20,0xd8,0x40,0x00,0x28,0x20,0x40,0x5b,0x4d,0x18,0xc0, +0x00,0x01,0x20,0x20,0x4f,0x20,0xd8,0x40,0x00,0x0c,0x20,0x40,0x5b,0x4d,0x18,0xc0, 0x8b,0xfe,0x58,0x00,0x00,0x00,0xe7,0xe4,0x00,0x05,0x20,0x20,0x50,0x1f,0x20,0x40, 0x01,0xf7,0x20,0x40,0x02,0x14,0x58,0x00,0x00,0x00,0xe7,0xe4,0x00,0x05,0x20,0x20, 0x02,0x26,0xef,0xe2,0x00,0x03,0x20,0x40,0x01,0xfb,0x20,0x40,0x02,0x02,0x20,0x20, @@ -292,7 +292,7 @@ 0x04,0xff,0xc0,0x20,0xe9,0x66,0xc0,0x20,0x69,0x6e,0xc0,0x38,0xe9,0xa7,0xc0,0x38, 0x04,0x8d,0xc0,0x24,0xe9,0xbe,0x20,0x20,0x6a,0x58,0x70,0x0a,0x95,0x08,0x20,0x40, 0x7b,0xab,0x20,0x40,0x69,0x72,0x20,0x20,0x69,0xba,0x6f,0xe2,0x44,0x90,0x20,0x3a, -0x5e,0xd0,0x20,0x40,0x74,0x38,0x20,0x20,0x79,0x32,0x3d,0x9a,0xaa,0x55,0x40,0x00, +0x5e,0xd0,0x20,0x40,0x74,0x38,0x20,0x20,0x79,0x32,0xd4,0xd9,0xaa,0x55,0x40,0x00, 0x00,0x40,0x02,0x00,0x00,0x00,0x00,0x00,0x10,0x20,0x00,0x00,0x20,0x00,0x01,0x00, 0x00,0x00,0x20,0x02,0x10,0x00,0x0c,0x12,0x00,0x19,0x00,0x00,0x00,0x00,0x00,0x08, 0x22,0x00,0xe8,0x09,0x18,0xd0,0x04,0x00,0x04,0x44,0x02,0x00,0x04,0x02,0x00,0x00, @@ -305,7 +305,7 @@ 0x55,0x06,0x00,0x57,0x46,0x04,0x30,0x30,0x30,0x30,0x30,0xaa,0x55,0x10,0x00,0xf0, 0x4f,0x00,0x1c,0xff,0x1f,0x00,0x1c,0x00,0x1c,0x00,0x4c,0xe0,0x4f,0x00,0x4c,0x00, 0x4c,0xaa,0x55,0x03,0x00,0xef,0x4b,0x00,0x80,0x02,0xaa,0x55,0x02,0x00,0x68,0x46, -0x10,0x0f,0xaa,0x55,0x01,0x00,0x6c,0x46,0x03,0xaa,0x55,0x01,0x00,0x6f,0x46,0x07, +0x10,0x11,0xaa,0x55,0x01,0x00,0x6c,0x46,0x03,0xaa,0x55,0x01,0x00,0x6f,0x46,0x07, 0xaa,0x55,0x03,0x00,0xaa,0x40,0x24,0x04,0x04,0xaa,0x55,0x01,0x00,0x79,0x46,0x00, 0xaa,0x55,0x01,0x00,0xcf,0x4a,0x00,0xaa,0x55,0x01,0x00,0x91,0x40,0x00,0xaa,0x55, 0x03,0x00,0x54,0x41,0x00,0x01,0x08,0xaa,0x55,0x01,0x00,0x74,0x41,0x02,0xaa,0x55, @@ -339,49 +339,35 @@ 0x35,0x05,0x19,0x00,0x03,0x08,0x01,0x09,0x00,0x06,0x35,0x09,0x09,0x65,0x6e,0x09, 0x00,0x6a,0x09,0x01,0x00,0x09,0x01,0x00,0x25,0x0a,0x53,0x50,0x50,0x20,0x73,0x6c, 0x61,0x76,0x65,0x00,0x00,0x00,0x01,0x00,0xaa,0x55,0x02,0x00,0x8e,0x44,0xaf,0x47, -0xaa,0x55,0x35,0x02,0xaf,0x47,0x01,0x00,0x02,0x00,0x28,0x02,0x00,0x18,0x02,0x00, -0x02,0x03,0x28,0x01,0x02,0x03,0x00,0x02,0x01,0x2a,0x02,0xc8,0x00,0x04,0x00,0x02, -0x03,0x28,0x01,0x0a,0x05,0x00,0x02,0x00,0x2a,0x14,0x41,0x73,0x74,0x20,0x4c,0x45, -0x20,0x4d,0x6f,0x75,0x73,0x65,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x06,0x00, -0x02,0x03,0x28,0x01,0x02,0x07,0x00,0x02,0x04,0x2a,0x08,0x06,0x00,0x06,0x00,0x64, -0x00,0x2c,0x01,0x08,0x00,0x02,0x03,0x28,0x01,0x02,0x09,0x00,0x02,0x02,0x2a,0x01, -0x01,0x0a,0x00,0x02,0x03,0x28,0x01,0x08,0x0b,0x00,0x02,0x03,0x2a,0x06,0x00,0x00, -0x00,0x00,0x00,0x00,0x0c,0x00,0x02,0x00,0x28,0x02,0x01,0x18,0x0d,0x00,0x02,0x03, -0x28,0x01,0x20,0x0e,0x00,0x02,0x05,0x2a,0x00,0x0f,0x00,0x02,0x02,0x29,0x02,0x00, -0x00,0x10,0x00,0x02,0x00,0x28,0x02,0x04,0x18,0x11,0x00,0x02,0x03,0x28,0x01,0x16, -0x12,0x00,0x02,0x07,0x2a,0x01,0x00,0x13,0x00,0x02,0x02,0x29,0x02,0x00,0x00,0x14, -0x00,0x02,0x00,0x28,0x02,0x0f,0x18,0x15,0x00,0x02,0x03,0x28,0x01,0x12,0x16,0x00, -0x02,0x19,0x2a,0x01,0x38,0x17,0x00,0x02,0x00,0x28,0x02,0x0a,0x18,0x18,0x00,0x02, -0x03,0x28,0x01,0x02,0x19,0x00,0x02,0x23,0x2a,0x03,0x00,0x00,0x00,0x1a,0x00,0x02, -0x03,0x28,0x01,0x02,0x1b,0x00,0x02,0x29,0x2a,0x08,0x46,0x6c,0x61,0x67,0x74,0x72, -0x69,0x70,0x1c,0x00,0x02,0x03,0x28,0x01,0x02,0x1d,0x00,0x02,0x24,0x2a,0x06,0x79, -0x69,0x63,0x68,0x69,0x70,0x1e,0x00,0x02,0x03,0x28,0x01,0x02,0x1f,0x00,0x02,0x25, -0x2a,0x04,0x63,0x6f,0x6d,0x33,0x20,0x00,0x02,0x03,0x28,0x01,0x02,0x21,0x00,0x02, -0x26,0x2a,0x03,0x31,0x2e,0x30,0x22,0x00,0x02,0x03,0x28,0x01,0x02,0x23,0x00,0x02, -0x28,0x2a,0x03,0x31,0x2e,0x30,0x24,0x00,0x02,0x03,0x28,0x01,0x02,0x25,0x00,0x02, -0x2a,0x2a,0x03,0x31,0x2e,0x30,0x26,0x00,0x02,0x03,0x28,0x01,0x02,0x27,0x00,0x02, -0x25,0x2a,0x04,0x63,0x6f,0x6d,0x33,0x28,0x00,0x02,0x00,0x28,0x10,0x55,0xe4,0x05, -0xd2,0xaf,0x9f,0xa9,0x8f,0xe5,0x4a,0x7d,0xfe,0x43,0x53,0x53,0x49,0x29,0x00,0x02, -0x03,0x28,0x01,0x12,0x2a,0x00,0x10,0x16,0x96,0x24,0x47,0xc6,0x23,0x61,0xba,0xd9, -0x4b,0x4d,0x1e,0x43,0x53,0x53,0x49,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x2b,0x00,0x02,0x02, -0x29,0x02,0x00,0x00,0x2c,0x00,0x02,0x03,0x28,0x01,0x08,0x2d,0x00,0x10,0xb3,0x9b, -0x72,0x34,0xbe,0xec,0xd4,0xa8,0xf4,0x43,0x41,0x88,0x43,0x53,0x53,0x49,0x14,0x00, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -0x00,0x00,0x00,0x2e,0x00,0x02,0x03,0x28,0x01,0x04,0x2f,0x00,0x10,0xfe,0x69,0xca, -0x9a,0x56,0x19,0xf6,0xab,0x02,0x4d,0xaa,0x6d,0x43,0x53,0x53,0x49,0x14,0x00,0x00, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -0x00,0x00,0x30,0x00,0x02,0x03,0x28,0x01,0x1a,0x31,0x00,0x10,0x18,0x03,0xa6,0x28, -0x5e,0xd8,0xec,0x91,0x1c,0x48,0xa3,0xac,0x43,0x53,0x53,0x49,0x14,0x00,0x00,0x00, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -0x00,0x32,0x00,0x02,0x02,0x29,0x02,0x00,0x00,0x00,0x00,0xaa,0x55,0x07,0x00,0x76, -0x41,0x0f,0x84,0xf0,0x0a,0x0b,0xb2,0x32,0xaa,0x55,0x02,0x00,0x57,0x41,0x8b,0x0b, -0xaa,0x55,0x08,0x00,0xa1,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xaa,0x55, -0x02,0x00,0xbd,0x40,0x02,0x24,0xaa,0x55,0x08,0x00,0xad,0x40,0x40,0x00,0x00,0x02, -0x32,0x00,0x00,0x02,0xaa,0x55,0x02,0x00,0xbb,0x40,0x20,0x00,0xaa,0x55,0x04,0x00, -0xb7,0x40,0x20,0x00,0x00,0x20,0xaa,0x55,0x04,0x00,0xbf,0x40,0x80,0x04,0x00,0x10, -0xaa,0x55,0x05,0x00,0xe2,0x44,0x08,0x0e,0x05,0x04,0x00,0xaa,0x55,0x02,0x00,0x02, -0x42,0x30,0x1f,0xaa,0x55,0x01,0x00,0x10,0x42,0x20,0xaa,0x55,0x01,0x00,0xe0,0x41, -0x01,0xaa,0x55,0x0f,0x00,0xde,0x4b,0x4b,0xba,0x55,0xd0,0x56,0xe0,0x57,0x88,0x58, -0x6c,0x59,0x10,0x07,0xff,0xff,0xaa,0x55,0x02,0x00,0xc3,0x40,0xde,0x4b,0x68,0x01 +0xaa,0x55,0x4e,0x01,0xaf,0x47,0x01,0x00,0x02,0x00,0x28,0x02,0x01,0x18,0x02,0x00, +0x02,0x03,0x28,0x01,0x20,0x03,0x00,0x02,0x05,0x2a,0x01,0x00,0x04,0x00,0x02,0x02, +0x29,0x02,0x01,0x00,0x05,0x00,0x02,0x00,0x28,0x02,0x00,0x18,0x06,0x00,0x02,0x03, +0x28,0x01,0x4e,0x07,0x00,0x02,0x00,0x2a,0x13,0x41,0x73,0x74,0x20,0x4c,0x45,0x20, +0x4d,0x6f,0x75,0x73,0x65,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x08,0x00,0x02,0x03, +0x28,0x01,0x4e,0x09,0x00,0x02,0x01,0x2a,0x02,0x00,0x00,0x0a,0x00,0x02,0x03,0x28, +0x01,0x02,0x0b,0x00,0x02,0x04,0x2a,0x08,0x10,0x00,0x20,0x00,0x05,0x00,0x2c,0x01, +0x0c,0x00,0x02,0x00,0x28,0x10,0x55,0xe4,0x05,0xd2,0xaf,0x9f,0xa9,0x8f,0xe5,0x4a, +0x7d,0xfe,0x43,0x53,0x53,0x49,0x0d,0x00,0x02,0x03,0x28,0x01,0x12,0x0e,0x00,0x10, +0x16,0x96,0x24,0x47,0xc6,0x23,0x61,0xba,0xd9,0x4b,0x4d,0x1e,0x43,0x53,0x53,0x49, +0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x0f,0x00,0x02,0x02,0x29,0x02,0x00,0x00,0x10,0x00,0x02, +0x03,0x28,0x01,0x08,0x11,0x00,0x10,0xb3,0x9b,0x72,0x34,0xbe,0xec,0xd4,0xa8,0xf4, +0x43,0x41,0x88,0x43,0x53,0x53,0x49,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x12,0x00,0x02,0x03, +0x28,0x01,0x04,0x13,0x00,0x10,0xfe,0x69,0xca,0x9a,0x56,0x19,0xf6,0xab,0x02,0x4d, +0xaa,0x6d,0x43,0x53,0x53,0x49,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x14,0x00,0x02,0x03,0x28, +0x01,0x1a,0x15,0x00,0x10,0x18,0x03,0xa6,0x28,0x5e,0xd8,0xec,0x91,0x1c,0x48,0xa3, +0xac,0x43,0x53,0x53,0x49,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x16,0x00,0x02,0x02,0x29,0x02, +0x00,0x00,0x00,0x00,0xaa,0x55,0x07,0x00,0x76,0x41,0x0f,0x84,0xf0,0x0a,0x0b,0xb2, +0x32,0xaa,0x55,0x02,0x00,0x57,0x41,0x8b,0x0b,0xaa,0x55,0x08,0x00,0xa1,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xaa,0x55,0x02,0x00,0xbd,0x40,0x02,0x24,0xaa, +0x55,0x08,0x00,0xad,0x40,0x40,0x00,0x00,0x02,0x32,0x00,0x00,0x02,0xaa,0x55,0x02, +0x00,0xbb,0x40,0x20,0x00,0xaa,0x55,0x04,0x00,0xb7,0x40,0x20,0x00,0x00,0x20,0xaa, +0x55,0x04,0x00,0xbf,0x40,0x80,0x04,0x00,0x10,0xaa,0x55,0x05,0x00,0xe2,0x44,0x08, +0x0e,0x05,0x04,0x00,0xaa,0x55,0x02,0x00,0x02,0x42,0x30,0x1f,0xaa,0x55,0x01,0x00, +0x10,0x42,0x20,0xaa,0x55,0x01,0x00,0xe0,0x41,0x01,0xaa,0x55,0x0f,0x00,0xde,0x4b, +0x4b,0xba,0x55,0xd0,0x56,0xe0,0x57,0x88,0x58,0x6c,0x59,0x10,0x07,0xff,0xff,0xaa, +0x55,0x02,0x00,0xc3,0x40,0xde,0x4b,0x7b,0xfc }; Index: patch/patch.prog =================================================================== --- /YC3121_demo/ModuleDemo/BlueTooth/BT_code_patch/print/branches/gezhiweixin/patch/patch.prog (revision 986) +++ /YC3121_demo/ModuleDemo/BlueTooth/BT_code_patch/print/branches/gezhiweixin/patch/patch.prog (working copy) @@ -643,7 +643,7 @@ branch module_hci_sspairing_mode module_hci_cmd_delete_customize_service: - arg 0x0028,temp + arg 0x000c,temp call le_att_get_handle_ptr2 add contr,-2,contw setarg 0x0000 Index: sched/DM_module.dat =================================================================== --- /YC3121_demo/ModuleDemo/BlueTooth/BT_code_patch/print/branches/gezhiweixin/sched/DM_module.dat (revision 986) +++ /YC3121_demo/ModuleDemo/BlueTooth/BT_code_patch/print/branches/gezhiweixin/sched/DM_module.dat (working copy) @@ -46,7 +46,7 @@ ##############BLUETOOTH CONFIG############## ###commom### -mem_soft_version_num:10 10 +mem_soft_version_num:10 11 mem_module_state:03 mem_module_bluetooth_stauts_by_command:07 mem_class:24 04 04 @@ -326,109 +326,51 @@ #attribute list: handle 2bytes, uuid 2bytes, length 1bytes, attribute Nbytes mem_module_le_att_list: -#Primary service GAP ------ -01 00 02 00 28 02 00 18 - +#Primary service yichip transmit ------ +01 00 02 00 28 02 01 18 +#Service Changed +02 00 02 03 28 01 20 +03 00 02 05 2a 01 00 +#Client Characteristic Configuration +04 00 02 02 29 02 01 00 -#Appearance -02 00 02 03 28 01 02 -03 00 02 01 2a 02 c8 00 #3c2=hid mouse +#Primary service GAP ------ +05 00 02 00 28 02 00 18 #Device name -04 00 02 03 28 01 0a -05 00 02 00 2a 14 41 73 74 20 4c 45 20 4d 6f 75 73 65 20 20 20 20 20 20 20 20 - - -#Peripheral Preferred Connection Parameters -06 00 02 03 28 01 02 -07 00 02 04 2a 08 06 00 06 00 64 00 2c 01 # interval 6ms, latency 100, timeout 300 +06 00 02 03 28 01 4e +07 00 02 00 2a 13 41 73 74 20 4c 45 20 4d 6f 75 73 65 20 20 20 20 20 20 20 +#Apperance +08 00 02 03 28 01 4e +09 00 02 01 2a 02 00 00 + +#Perpheral Preferred Connection Parameters +0a 00 02 03 28 01 02 +0b 00 02 04 2a 08 10 00 20 00 05 00 2c 01 -#privcy flag -08 00 02 03 28 01 02 -09 00 02 02 2a 01 01 - -#reconnecting addr -0a 00 02 03 28 01 08 -0b 00 02 03 2a 06 00 00 00 00 00 00 - -#Primary service GATT ------ -0c 00 02 00 28 02 01 18 - -#Service changed -0d 00 02 03 28 01 20 -0e 00 02 05 2a 00 -#Client Characteristic Configuration -0f 00 02 02 29 02 00 00 - -#Primary service TX power ------ -10 00 02 00 28 02 04 18 -#Characteristic Tx power level -11 00 02 03 28 01 16 -12 00 02 07 2a 01 00 -13 00 02 02 29 02 00 00 - -#Primary service Battery ------ -14 00 02 00 28 02 0f 18 -#Characteristic Battery level -15 00 02 03 28 01 12 -16 00 02 19 2a 01 38 - -#Primary service device infomation -17 00 02 00 28 02 0a 18 -#Characteristic system id -18 00 02 03 28 01 02 -19 00 02 23 2a 03 00 00 00 - -#Characteristic manufactor name -1a 00 02 03 28 01 02 -1b 00 02 29 2a 08 46 6c 61 67 74 72 69 70 - -#Characteristic module number -1c 00 02 03 28 01 02 -1d 00 02 24 2a 06 79 69 63 68 69 70 - -#Characteristic serial number -1e 00 02 03 28 01 02 -1f 00 02 25 2a 04 63 6f 6d 33 - -#Characteristic firmware version -20 00 02 03 28 01 02 -21 00 02 26 2a 03 31 2e 30 - -#Characteristic software version -22 00 02 03 28 01 02 -23 00 02 28 2a 03 31 2e 30 - -#Characteristic hardware version -24 00 02 03 28 01 02 -25 00 02 2a 2a 03 31 2e 30 - -#Characteristic regulatory version -26 00 02 03 28 01 02 -27 00 02 25 2a 04 63 6f 6d 33 #Primary service yichip transmit ------ -28 00 02 00 28 10 55 e4 05 d2 af 9f a9 8f e5 4a 7d fe 43 53 53 49 +0c 00 02 00 28 10 55 e4 05 d2 af 9f a9 8f e5 4a 7d fe 43 53 53 49 #Characteristic tx--notify read -29 00 02 03 28 01 12 -2a 00 10 16 96 24 47 C6 23 61 BA D9 4B 4D 1E 43 53 53 49 14 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +0d 00 02 03 28 01 12 +0e 00 10 16 96 24 47 C6 23 61 BA D9 4B 4D 1E 43 53 53 49 14 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 #Client Characteristic Configuration -2b 00 02 02 29 02 00 00 +0f 00 02 02 29 02 00 00 #Characteristic rx--write -2c 00 02 03 28 01 08 -2d 00 10 B3 9B 72 34 BE EC D4 A8 F4 43 41 88 43 53 53 49 14 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +10 00 02 03 28 01 08 +11 00 10 B3 9B 72 34 BE EC D4 A8 F4 43 41 88 43 53 53 49 14 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 #Characteristic rx-- write without Response -2e 00 02 03 28 01 04 -2f 00 10 fe 69 ca 9a 56 19 f6 ab 02 4d aa 6d 43 53 53 49 14 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +12 00 02 03 28 01 04 +13 00 10 fe 69 ca 9a 56 19 f6 ab 02 4d aa 6d 43 53 53 49 14 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 #Characteristic rx tx --read write notify -30 00 02 03 28 01 1a -31 00 10 18 03 A6 28 5E D8 EC 91 1C 48 A3 AC 43 53 53 49 14 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +14 00 02 03 28 01 1a +15 00 10 18 03 A6 28 5E D8 EC 91 1C 48 A3 AC 43 53 53 49 14 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 #Client Characteristic Configuration -32 00 02 02 29 02 00 00 +16 00 02 02 29 02 00 00 #End of Attribute list 00 00