merge issue resolving?
This commit is contained in:
parent
f48790e255
commit
ce814d7fc1
|
@ -76,7 +76,7 @@ unsigned short PT2001_code_RAM2[40] =
|
|||
};
|
||||
|
||||
// Data to be loaded into the Data RAM memory space
|
||||
unsigned short PT2001_data_RAM[128] =
|
||||
unsigned short PT2001_data_RAM[128] =
|
||||
{
|
||||
0x008D, 0x006D, 0x003A, 0x003C, 0x1068, 0x003C, 0x0168, 0xEA60, 0x0960, 0x0258,
|
||||
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
|
||||
|
@ -94,7 +94,7 @@ unsigned short PT2001_data_RAM[128] =
|
|||
};
|
||||
|
||||
// Data to be loaded into the Main register memory space
|
||||
unsigned short PT2001_main_config[29] =
|
||||
unsigned short PT2001_main_config[29] =
|
||||
{
|
||||
0x0003, 0x13FC, 0x0000, 0x1E00, 0x0000, 0x0000, 0x0001, 0x0000, 0x001F, 0x0000,
|
||||
0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
|
||||
|
@ -102,21 +102,21 @@ unsigned short PT2001_main_config[29] =
|
|||
};
|
||||
|
||||
// Data to be loaded into the CH1 register memory space
|
||||
unsigned short PT2001_ch1_config[19] =
|
||||
unsigned short PT2001_ch1_config[19] =
|
||||
{
|
||||
0x0008, 0x0000, 0x0000, 0x0000, 0x0303, 0x0000, 0x0000, 0x007A, 0x41B4, 0x9018,
|
||||
0x0000, 0x003D, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
};
|
||||
|
||||
// Data to be loaded into the CH2 register memory space
|
||||
unsigned short PT2001_ch2_config[19] =
|
||||
unsigned short PT2001_ch2_config[19] =
|
||||
{
|
||||
0x0008, 0x0000, 0x0000, 0x0000, 0x0C00, 0x0000, 0x0000, 0x0028, 0x2EFC, 0x6D78,
|
||||
0x0000, 0x0011, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
};
|
||||
|
||||
// Data to be loaded into the IO register memory space
|
||||
unsigned short PT2001_io_config[53] =
|
||||
unsigned short PT2001_io_config[53] =
|
||||
{
|
||||
0x0000, 0x0000, 0x0000, 0x0000, 0x0063, 0x018C, 0x0800, 0x0410, 0x0041, 0x0098,
|
||||
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
|
||||
|
@ -127,7 +127,7 @@ unsigned short PT2001_io_config[53] =
|
|||
};
|
||||
|
||||
// Data to be loaded into the Diag register memory space
|
||||
unsigned short PT2001_diag_config[44] =
|
||||
unsigned short PT2001_diag_config[44] =
|
||||
{
|
||||
0x0000, 0x0000, 0x001E, 0x0000, 0x0000, 0x001E, 0x0000, 0x0000, 0x001E, 0x0000,
|
||||
0x0000, 0x001E, 0x0000, 0x0000, 0x001E, 0x0000, 0x0000, 0x001E, 0x001E, 0x0000,
|
||||
|
|
Loading…
Reference in New Issue