FIX | 调试修改

master
yuliang 4 months ago
parent 528dc2223d
commit cd6991dc2a

@ -915,7 +915,7 @@ void cli_start(void const * argument)
if (!IS_MONITOR_BIT_SET(dev_config.flag, DEV_FLAG_ADJ) if (!IS_MONITOR_BIT_SET(dev_config.flag, DEV_FLAG_ADJ)
&& !IS_MONITOR_BIT_SET(dev_config.flag, DEV_FLAG_FACTORY)) && !IS_MONITOR_BIT_SET(dev_config.flag, DEV_FLAG_FACTORY))
{ {
wl_init(); //wl_init();
} }
/* 在这个标志置位前vty_print是原地循环等待,置位后变为任务调度. */ /* 在这个标志置位前vty_print是原地循环等待,置位后变为任务调度. */

@ -333,12 +333,13 @@ int32_t _dau_reg_write_port(uint32_t port)
/* 故障校准系数 */ /* 故障校准系数 */
addr = (port + 1) * DAU_REG_ADDR_PORT_BASE + DAU_REG_ADDR_PORT_FAULT_BASE; addr = (port + 1) * DAU_REG_ADDR_PORT_BASE + DAU_REG_ADDR_PORT_FAULT_BASE;
//*temp = dev_config.fault_base[i]; //*temp = dev_config.fault_base[i];
*temp = 34533; //*temp = 34533;
*temp = 34547;
E_RETURN(_dau_reg_write(addr, sizeof(uint16_t))); E_RETURN(_dau_reg_write(addr, sizeof(uint16_t)));
addr = (port + 1) * DAU_REG_ADDR_PORT_BASE + DAU_REG_ADDR_PORT_FAULT_ADJ; addr = (port + 1) * DAU_REG_ADDR_PORT_BASE + DAU_REG_ADDR_PORT_FAULT_ADJ;
//*temp = dev_config.fault_adj[i]; //*temp = dev_config.fault_adj[i];
*temp = 52428; *temp = 32768;
E_RETURN(_dau_reg_write(addr, sizeof(uint16_t))); E_RETURN(_dau_reg_write(addr, sizeof(uint16_t)));
return rv; return rv;
@ -466,24 +467,6 @@ void _dau_utc(void)
_dau_reg_write(DAU_REG_ADDR_GCUR, sizeof(uint32_t)); _dau_reg_write(DAU_REG_ADDR_GCUR, sizeof(uint32_t));
vty_print("#D Change %d %d %d %d\r\n", dau_ctrl.reg_global.GUR, dau_ctrl.reg_global.GNR, dau_ctrl.is_utc_valid, dau_ctrl.utc); vty_print("#D Change %d %d %d %d\r\n", dau_ctrl.reg_global.GUR, dau_ctrl.reg_global.GNR, dau_ctrl.is_utc_valid, dau_ctrl.utc);
} }
/* 开启故障定位 */
#if 0
if (dau_ctrl.is_utc_valid && FALSE == is_start)
{
vty_print("#D Start fault\r\n");
is_start = TRUE;
/* 触发阈值 */
*temp = 0x4000;
_dau_reg_write(DAU_REG_ADDR_GCFTTR, sizeof(uint16_t));
/* 开启 */
*temp = 1;
_dau_reg_write(0xf, sizeof(uint16_t));
osDelay(3000);
*temp = 0;
_dau_reg_write(0xf, sizeof(uint16_t));
}
#endif
} }
/* description: 寄存器触发波形采集开始 /* description: 寄存器触发波形采集开始
@ -840,18 +823,26 @@ void _dau_power_calculate(DAU_SOURCE_E source)
uint64_t square_sum = 0; uint64_t square_sum = 0;
int32_t mean = 0; int32_t mean = 0;
float temp = 0; float temp = 0;
int16_t min = 32767;
int16_t max = -32768;
/* 遍历通道, 计算有效值 */ /* 遍历通道, 计算有效值 */
for(ch = 0; ch < DAU_PORT_POWER_CNT; ch++) for(ch = 0; ch < DAU_PORT_POWER_CNT; ch++)
{ {
/* 计算所有值的算术平均值 */ /* 计算所有值的算术平均值 */
mean = 0; mean = 0;
min = 32767;
max = -32768;
for(i = 0; i < DAU_POWER_DATE_LEN; i++) for(i = 0; i < DAU_POWER_DATE_LEN; i++)
{ {
if (val[ch][i] < min)
min = val[ch][i];
if (val[ch][i] > max)
max = val[ch][i];
mean += val[ch][i]; mean += val[ch][i];
} }
mean = mean / DAU_POWER_DATE_LEN; mean = mean / DAU_POWER_DATE_LEN;
vty_print("#DP%d %d ", ch, mean); vty_print("#DP%d %d %d %d", ch, mean, min, max);
/* 遍历通道所有值, 求和, 并计算出最大值和最小值. */ /* 遍历通道所有值, 求和, 并计算出最大值和最小值. */
square_sum = 0; square_sum = 0;
@ -896,6 +887,7 @@ void _dau_power_calculate(DAU_SOURCE_E source)
/* 计算工频录波每个点的电流值 */ /* 计算工频录波每个点的电流值 */
#if 0
if (DAU_SOURCE_FAULT == source if (DAU_SOURCE_FAULT == source
|| IS_MONITOR_BIT_SET(dau_ctrl.col_flag, DAU_COL_FLAG_REG_POWER)) || IS_MONITOR_BIT_SET(dau_ctrl.col_flag, DAU_COL_FLAG_REG_POWER))
{ {
@ -907,6 +899,7 @@ void _dau_power_calculate(DAU_SOURCE_E source)
} }
} }
} }
#endif
} }
/* dau data base 自动计算. */ /* dau data base 自动计算. */
@ -990,6 +983,7 @@ int32_t _dau_wave_col_trigger_by_fault(void)
} }
dau_ctrl.fault_utc = dau_ctrl.reg_global.GFTUR; dau_ctrl.fault_utc = dau_ctrl.reg_global.GFTUR;
dau_ctrl.fault_ns = dau_ctrl.reg_global.GFTNR; dau_ctrl.fault_ns = dau_ctrl.reg_global.GFTNR;
vty_print("#D utc %d.%d\r\n", dau_ctrl.fault_utc, dau_ctrl.fault_ns);
/* 擦除 flash */ /* 擦除 flash */
addr = dau_ctrl.addr_fault; addr = dau_ctrl.addr_fault;
@ -1018,6 +1012,7 @@ int32_t _dau_wave_col_trigger_by_fault(void)
common_watchdog_set(COM_WDG_DAU); common_watchdog_set(COM_WDG_DAU);
vty_print("FAULT %x %d\r\n", addr, i); vty_print("FAULT %x %d\r\n", addr, i);
for(j = 0; j < DAU_PKT_FAULT_CNT; j++) for(j = 0; j < DAU_PKT_FAULT_CNT; j++)
//for(j = 0; j < 1; j++)
{ {
spi_flash_read(addr, &dau_ctrl.buf_dau_rx[2], 1024); spi_flash_read(addr, &dau_ctrl.buf_dau_rx[2], 1024);
addr += DAU_PKT_FAULT_BYTE_CNT; addr += DAU_PKT_FAULT_BYTE_CNT;
@ -1088,7 +1083,7 @@ int32_t _dau_wave_col_trigger_by_reg(void)
} }
E_RETURN(_dau_wave_col_start()); E_RETURN(_dau_wave_col_start());
E_RETURN(_dau_wave_col_defect()); //E_RETURN(_dau_wave_col_defect());
E_RETURN(_dau_wave_col_power(DAU_SOURCE_REG)); E_RETURN(_dau_wave_col_power(DAU_SOURCE_REG));
_dau_power_calculate(DAU_SOURCE_REG); _dau_power_calculate(DAU_SOURCE_REG);
@ -1131,19 +1126,18 @@ int32_t _dau_wave_col_trigger_by_reg(void)
vty_print("\r\n"); vty_print("\r\n");
} }
#endif #endif
#if 0 #if 1
uint16_t *buf = (uint16_t*)(&dau_ctrl.buf_dau_rx[2]); uint16_t *buf = (uint16_t*)(&dau_ctrl.buf_dau_rx[2]);
uint8_t i = 0; uint8_t i = 0;
uint8_t j = 0; uint8_t j = 0;
uint16_t k = 0; uint16_t k = 0;
//for(i = 5; i < DAU_PORT_POWER_CNT; i++) //for(i = 5; i < DAU_PORT_POWER_CNT; i++)
for(i = 2; i < 3; i++) for(i = 5; i < 6; i++)
{ {
common_watchdog_set(COM_WDG_DAU); common_watchdog_set(COM_WDG_DAU);
vty_print("POWER %d\r\n", i); vty_print("POWER %d\r\n", i);
buf = (uint16_t*)dau_ctrl.reg_power[i]; buf = (uint16_t*)dau_ctrl.reg_power[i];
for(j = 0; j < DAU_PKT_POWER_CNT; j++) for(j = 0; j < DAU_PKT_POWER_CNT; j++)
//for(j = 0; j < 1; j++)
{ {
for(k = 0; k < 512;) for(k = 0; k < 512;)
{ {
@ -1167,6 +1161,7 @@ int32_t _dau_wave_col_trigger_by_reg(void)
return: */ return: */
static void _dau_init(void) static void _dau_init(void)
{ {
uint16_t *temp = (uint16_t*)&dau_ctrl.buf_dau_tx[2];
char version[DEV_COMPILE_TIME_LEN] = {0}; char version[DEV_COMPILE_TIME_LEN] = {0};
uint8_t i = 0; uint8_t i = 0;
@ -1201,7 +1196,11 @@ static void _dau_init(void)
HAL_GPIO_WritePin(DAU_RST_GPIO_Port, DAU_RST_Pin, GPIO_PIN_SET); HAL_GPIO_WritePin(DAU_RST_GPIO_Port, DAU_RST_Pin, GPIO_PIN_SET);
HAL_GPIO_WritePin(POWER_DAU_GPIO_Port, POWER_DAU_Pin, GPIO_PIN_SET); HAL_GPIO_WritePin(POWER_DAU_GPIO_Port, POWER_DAU_Pin, GPIO_PIN_SET);
osDelay(3000); osDelay(2500);
//common_watchdog_set(COM_WDG_DAU);
//osDelay(10000);
//common_watchdog_set(COM_WDG_DAU);
//osDelay(10000);
/* 读取 FPGA 版本信息 */ /* 读取 FPGA 版本信息 */
if (HAL_OK == _dau_reg_read_global_state()) if (HAL_OK == _dau_reg_read_global_state())
@ -1219,6 +1218,14 @@ static void _dau_init(void)
{ {
_dau_reg_write_port(i); _dau_reg_write_port(i);
} }
/* 触发阈值 */
*temp = 0xFFFF;
_dau_reg_write(DAU_REG_ADDR_GCFTTR, sizeof(uint16_t));
osDelay(500);
/* 开启 */
*temp = 1;
_dau_reg_write(0xf, sizeof(uint16_t));
} }
/* description: DAU 主任务循环 /* description: DAU 主任务循环
@ -1230,6 +1237,7 @@ static void _dau_start(void *argument)
/* 状态初始化 */ /* 状态初始化 */
_dau_init(); _dau_init();
vty_print("DAU start...\r\n");
for (;;) for (;;)
{ {
@ -1244,7 +1252,7 @@ static void _dau_start(void *argument)
} }
/* utc 对时处理 */ /* utc 对时处理 */
_dau_utc(); //_dau_utc();
/* 处理升级 */ /* 处理升级 */
if (dau_ctrl.update_flag) if (dau_ctrl.update_flag)
@ -1272,8 +1280,8 @@ static void _dau_start(void *argument)
if (IS_MONITOR_BIT_SET(dau_ctrl.reg_flag, DAU_REG_PORT_WRITE)) if (IS_MONITOR_BIT_SET(dau_ctrl.reg_flag, DAU_REG_PORT_WRITE))
{ {
_dau_reg_write_port(dau_ctrl.reg_data);
MONITOR_BITMAP_RESET(dau_ctrl.reg_flag, DAU_REG_PORT_WRITE); MONITOR_BITMAP_RESET(dau_ctrl.reg_flag, DAU_REG_PORT_WRITE);
_dau_reg_write_port(dau_ctrl.reg_data);
} }
if (1 == _dau_spi_rw) if (1 == _dau_spi_rw)

File diff suppressed because it is too large Load Diff

@ -130,12 +130,6 @@
<ShowTimeSum>1</ShowTimeSum> <ShowTimeSum>1</ShowTimeSum>
<SumSortOrder>0</SumSortOrder> <SumSortOrder>0</SumSortOrder>
</EventLog> </EventLog>
<DisassembleMode>
<mode>0</mode>
</DisassembleMode>
<Breakpoints2>
<Count>0</Count>
</Breakpoints2>
<TermIOLog> <TermIOLog>
<LoggingEnabled>_ 0</LoggingEnabled> <LoggingEnabled>_ 0</LoggingEnabled>
<LogFile>_ ""</LogFile> <LogFile>_ ""</LogFile>
@ -145,13 +139,19 @@
<LogFile>_ ""</LogFile> <LogFile>_ ""</LogFile>
<Category>_ 0</Category> <Category>_ 0</Category>
</LogFile> </LogFile>
<Aliases>
<Count>0</Count>
<SuppressDialog>0</SuppressDialog>
</Aliases>
<PowerProbe> <PowerProbe>
<Frequency>10000</Frequency> <Frequency>10000</Frequency>
<Probe0>I0</Probe0> <Probe0>I0</Probe0>
<ProbeSetup0>2 1 1 2 0 0</ProbeSetup0> <ProbeSetup0>2 1 1 2 0 0</ProbeSetup0>
</PowerProbe> </PowerProbe>
<DisassembleMode>
<mode>0</mode>
</DisassembleMode>
<Breakpoints2>
<Count>0</Count>
</Breakpoints2>
<Aliases>
<Count>0</Count>
<SuppressDialog>0</SuppressDialog>
</Aliases>
</settings> </settings>

@ -11,7 +11,7 @@
<ColumnWidth0>19</ColumnWidth0> <ColumnWidth0>19</ColumnWidth0>
<ColumnWidth1>1868</ColumnWidth1> <ColumnWidth1>1868</ColumnWidth1>
<FilterLevel>2</FilterLevel> <FilterLevel>2</FilterLevel>
<LiveFile></LiveFile> <LiveFile />
<LiveLogEnabled>0</LiveLogEnabled> <LiveLogEnabled>0</LiveLogEnabled>
<LiveFilterLevel>-1</LiveFilterLevel> <LiveFilterLevel>-1</LiveFilterLevel>
</IarPane-34048> </IarPane-34048>
@ -76,7 +76,7 @@
</IarPane-34063> </IarPane-34063>
<ControlBarVersion> <ControlBarVersion>
<Major>14</Major> <Major>14</Major>
<Minor>38</Minor> <Minor>42</Minor>
</ControlBarVersion> </ControlBarVersion>
<MFCToolBarParameters> <MFCToolBarParameters>
<Tooltips>1</Tooltips> <Tooltips>1</Tooltips>
@ -86,11 +86,11 @@
<RecentlyUsedMenus>1</RecentlyUsedMenus> <RecentlyUsedMenus>1</RecentlyUsedMenus>
<MenuShadows>1</MenuShadows> <MenuShadows>1</MenuShadows>
<ShowAllMenusAfterDelay>1</ShowAllMenusAfterDelay> <ShowAllMenusAfterDelay>1</ShowAllMenusAfterDelay>
<CommandsUsage>FE0A00000E00598400000200000040E1000002000000108600001000000056840000020000005F860000070000000F810000010000000C810000B30A000055840000030000000E810000080000000B8100001100000005840000030000004681000001000000108400001A0000000D81000007000000</CommandsUsage> <CommandsUsage>2A0B00000E0040E10000020000005984000002000000568400000200000010860000100000000F810000010000005F860000070000000C810000DF0A000055840000030000000E810000080000000B810000110000000584000003000000108400001A00000046810000010000000D81000007000000</CommandsUsage>
</MFCToolBarParameters> </MFCToolBarParameters>
<CommandManager> <CommandManager>
<CommandsWithoutImages>49000D8400000F84000008840000FFFFFFFF54840000328100001C810000098400007784000007840000808C000044D50000538400000088000001880000028800000388000004880000058800001C8F00001D8F00001F8F0000208F0000218F00002AE10000118F000055840000568400005984000001B0000002B0000003B0000004B0000005B0000006B0000007B0000008B0000009B000000AB000000BB000000CB000000DB000000EB0000000B000002481000040E100000C840000338400007884000011840000008200001C820000018200006786000020DE000021DE000026DE000028DE000023DE000022DE000024DE000027DE000025DE000020920000289200002992000037920000389200003492000033920000259200001E9200001D920000</CommandsWithoutImages> <CommandsWithoutImages>49000D8400000F84000008840000FFFFFFFF54840000328100001C810000098400007784000007840000808C000044D50000538400000088000001880000028800000388000004880000058800001C8F00001D8F00001F8F0000208F0000218F00002AE10000118F000055840000568400005984000001B0000002B0000003B0000004B0000005B0000006B0000007B0000008B0000009B000000AB000000BB000000CB000000DB000000EB0000000B000002481000040E100000C840000338400007884000011840000008200001C820000018200006786000020DE000021DE000026DE000028DE000023DE000022DE000024DE000027DE000025DE000020920000289200002992000037920000389200003492000033920000259200001E9200001D920000</CommandsWithoutImages>
<MenuUserImages>3700048400004C000000268100002D000000048100001C0000002CE100004300000015810000250000003184000053000000239200000000000007E100003B0000000F81000023000000208100002B0000005F8600003400000004E10000390000000C8100002000000023E100003D0000000D8000001700000001E10000360000001982000015000000068400004E0000004A810000470000001682000013000000038400004B00000017810000270000002BE100004200000000840000480000001481000024000000449200001000000030840000520000000E8400005000000000810000190000000E810000220000001F8100002A00000025E100003F0000002F820000160000001F9200000D00000003E10000380000000B8100001F00000022E100003C0000002D9200000F00000000E1000035000000D18400000C0000001882000014000000058400004D00000041E1000045000000058100001D0000004981000046000000028400004A000000168100002600000032840000540000001084000051000000518400005600000005E100003A0000000D810000210000000A8400004F00000002E10000370000002C9200000E000000</MenuUserImages> <MenuUserImages>3700048400004C00000015810000250000002CE1000043000000048100001C000000268100002D00000007E100003B0000002392000000000000318400005300000004E10000390000005F86000034000000208100002B0000000F8100002300000001E10000360000000D8000001700000023E100003D0000000C81000020000000068400004E00000019820000150000001781000027000000038400004B00000016820000130000004A81000047000000148100002400000000840000480000002BE100004200000000810000190000000E840000500000003084000052000000449200001000000003E10000380000001F9200000D0000002F8200001600000025E100003F0000001F8100002A0000000E8100002200000000E10000350000002D9200000F00000022E100003C0000000B8100001F00000041E1000045000000058400004D0000001882000014000000D18400000C0000001681000026000000028400004A0000004981000046000000058100001D0000001084000051000000328400005400000005E100003A000000518400005600000002E10000370000000A8400004F0000000D810000210000002C9200000E000000</MenuUserImages>
</CommandManager> </CommandManager>
<Pane-59393> <Pane-59393>
<ID>0</ID> <ID>0</ID>
@ -123,7 +123,7 @@
<ID>4294967295</ID> <ID>4294967295</ID>
<RectRecentFloat>00000000D002000080070000F5030000</RectRecentFloat> <RectRecentFloat>00000000D002000080070000F5030000</RectRecentFloat>
<RectRecentDocked>00000000B902000080070000DE030000</RectRecentDocked> <RectRecentDocked>00000000B902000080070000DE030000</RectRecentDocked>
<RecentFrameAlignment>32768</RecentFrameAlignment> <RecentFrameAlignment>4096</RecentFrameAlignment>
<RecentRowIndex>0</RecentRowIndex> <RecentRowIndex>0</RecentRowIndex>
<IsFloating>0</IsFloating> <IsFloating>0</IsFloating>
<MRUWidth>32767</MRUWidth> <MRUWidth>32767</MRUWidth>
@ -186,7 +186,7 @@
<ColumnWidth1>95</ColumnWidth1> <ColumnWidth1>95</ColumnWidth1>
<ColumnWidth2>1142</ColumnWidth2> <ColumnWidth2>1142</ColumnWidth2>
<FilterLevel>2</FilterLevel> <FilterLevel>2</FilterLevel>
<LiveFile></LiveFile> <LiveFile />
<LiveLogEnabled>0</LiveLogEnabled> <LiveLogEnabled>0</LiveLogEnabled>
<LiveFilterLevel>-1</LiveFilterLevel> <LiveFilterLevel>-1</LiveFilterLevel>
</IarPane-34056> </IarPane-34056>
@ -208,7 +208,7 @@
<ColumnWidth1>95</ColumnWidth1> <ColumnWidth1>95</ColumnWidth1>
<ColumnWidth2>1142</ColumnWidth2> <ColumnWidth2>1142</ColumnWidth2>
<FilterLevel>2</FilterLevel> <FilterLevel>2</FilterLevel>
<LiveFile></LiveFile> <LiveFile />
<LiveLogEnabled>0</LiveLogEnabled> <LiveLogEnabled>0</LiveLogEnabled>
<LiveFilterLevel>-1</LiveFilterLevel> <LiveFilterLevel>-1</LiveFilterLevel>
</IarPane-34057> </IarPane-34057>
@ -231,7 +231,7 @@
<ColumnWidth2>856</ColumnWidth2> <ColumnWidth2>856</ColumnWidth2>
<ColumnWidth3>380</ColumnWidth3> <ColumnWidth3>380</ColumnWidth3>
<FilterLevel>2</FilterLevel> <FilterLevel>2</FilterLevel>
<LiveFile></LiveFile> <LiveFile />
<LiveLogEnabled>0</LiveLogEnabled> <LiveLogEnabled>0</LiveLogEnabled>
<LiveFilterLevel>-1</LiveFilterLevel> <LiveFilterLevel>-1</LiveFilterLevel>
</IarPane-34058> </IarPane-34058>
@ -253,7 +253,7 @@
<ColumnWidth1>95</ColumnWidth1> <ColumnWidth1>95</ColumnWidth1>
<ColumnWidth2>1142</ColumnWidth2> <ColumnWidth2>1142</ColumnWidth2>
<FilterLevel>2</FilterLevel> <FilterLevel>2</FilterLevel>
<LiveFile></LiveFile> <LiveFile />
<LiveLogEnabled>0</LiveLogEnabled> <LiveLogEnabled>0</LiveLogEnabled>
<LiveFilterLevel>-1</LiveFilterLevel> <LiveFilterLevel>-1</LiveFilterLevel>
</IarPane-34059> </IarPane-34059>
@ -272,7 +272,7 @@
</BasePane-34062> </BasePane-34062>
<IarPane-34062> <IarPane-34062>
<FilterLevel>2</FilterLevel> <FilterLevel>2</FilterLevel>
<LiveFile></LiveFile> <LiveFile />
<LiveLogEnabled>0</LiveLogEnabled> <LiveLogEnabled>0</LiveLogEnabled>
<LiveFilterLevel>-1</LiveFilterLevel> <LiveFilterLevel>-1</LiveFilterLevel>
</IarPane-34062> </IarPane-34062>
@ -381,7 +381,7 @@
</BasePane-34049> </BasePane-34049>
<MFCToolBar-34050> <MFCToolBar-34050>
<Name>Main</Name> <Name>Main</Name>
<Buttons>00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000031000000FFFEFF000000000000000000000000000100000001000000018001E100000000000032000000FFFEFF000000000000000000000000000100000001000000018003E100000000000034000000FFFEFF0000000000000000000000000001000000010000000180008100000000000015000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E100000000000037000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E100000000040039000000FFFEFF000000000000000000000000000100000001000000018022E100000000040038000000FFFEFF000000000000000000000000000100000001000000018025E10000000000003B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE10000000004003E000000FFFEFF00000000000000000000000000010000000100000001802CE10000000004003F000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0001000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF00960000000000000000000180218100000000040028000000FFFEFF000000000000000000000000000100000001000000018024E10000000000003A000000FFFEFF000000000000000000000000000100000001000000018028E10000000004003C000000FFFEFF000000000000000000000000000100000001000000018029E10000000000003D000000FFFEFF0000000000000000000000000001000000010000000180028100000000000017000000FFFEFF000000000000000000000000000100000001000000018029810000000000002C000000FFFEFF000000000000000000000000000100000001000000018027810000000000002A000000FFFEFF000000000000000000000000000100000001000000018028810000000000002B000000FFFEFF00000000000000000000000000010000000100000001801D8100000000040024000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040025000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000000000001B000000FFFEFF00000000000000000000000000010000000100000001800D810000000002001D000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000030000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E810000000000001E000000FFFEFF00000000000000000000000000010000000100000001800F810000000000001F000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00E8020000</Buttons> <Buttons>00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000035000000FFFEFF000000000000000000000000000100000001000000018001E100000000000036000000FFFEFF000000000000000000000000000100000001000000018003E100000000000038000000FFFEFF0000000000000000000000000001000000010000000180008100000000000019000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000003B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004003D000000FFFEFF000000000000000000000000000100000001000000018022E10000000004003C000000FFFEFF000000000000000000000000000100000001000000018025E10000000000003F000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040042000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040043000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0000000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000000018021810000000004002C000000FFFEFF000000000000000000000000000100000001000000018024E10000000000003E000000FFFEFF000000000000000000000000000100000001000000018028E100000000040040000000FFFEFF000000000000000000000000000100000001000000018029E100000000000041000000FFFEFF000000000000000000000000000100000001000000018002810000000000001B000000FFFEFF0000000000000000000000000001000000010000000180298100000000000030000000FFFEFF000000000000000000000000000100000001000000018027810000000000002E000000FFFEFF000000000000000000000000000100000001000000018028810000000000002F000000FFFEFF00000000000000000000000000010000000100000001801D8100000000040028000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040029000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000000000001F000000FFFEFF00000000000000000000000000010000000100000001800D8100000000020021000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000034000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E8100000000000022000000FFFEFF00000000000000000000000000010000000100000001800F8100000000000023000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00E8020000</Buttons>
</MFCToolBar-34050> </MFCToolBar-34050>
<Pane-34050> <Pane-34050>
<ID>34050</ID> <ID>34050</ID>
@ -419,7 +419,7 @@
</ChildIdMap> </ChildIdMap>
<MDIWindows> <MDIWindows>
<MDIClientArea-0> <MDIClientArea-0>
<MDITabsState>010000000300000001000000000000000000000001000000010000000200000000000000010000000100000000000000280000002800000001000000010000000000000001000000FFFEFF1A2400570053005F0044004900520024005C002E002E005C0043006F00720065005C005300720063005C0063006C0069002E00630001000000FFFF010014004966436F6E74656E7453746F72616765496D706CFFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003900350035003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0563006C0069002E00630000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000100000002000000AC0100004900000080070000CC020000</MDITabsState> <MDITabsState>010000000300000001000000000000000000000001000000010000000200000000000000010000000100000000000000280000002800000001000000010000000000000001000000FFFEFF1A2400570053005F0044004900520024005C002E002E005C0043006F00720065005C005300720063005C0063006C0069002E00630001000000FFFF010014004966436F6E74656E7453746F72616765496D706CFFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003900340036003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0563006C0069002E00630000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000100000002000000AC0100004900000080070000CC020000</MDITabsState>
</MDIClientArea-0> </MDIClientArea-0>
</MDIWindows> </MDIWindows>
</WindowStorage> </WindowStorage>

Loading…
Cancel
Save