Skip to content

H
HaoJin232
Commit 4d58b46d authored by 时昊's avatar 时昊
Browse files
Options

🎉 init:删除无用代码-硬线模块

parent 8fe74d55
Show whitespace changes
Inline Side-by-side
Showing with 4115 additions and 4616 deletions
HJ232_Source/Out/QJ300_circle.hex
View file @ 4d58b46d
This source diff could not be displayed because it is too large. You can view the blob instead.
HJ232_Source/Out/QJ300_circle.lnp
View file @ 4d58b46d
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
".\objects\tasks.o" ".\objects\tasks.o"
".\objects\sys_scheduler.o" ".\objects\sys_scheduler.o"
".\objects\init.o" ".\objects\init.o"
".\objects\line_in.o"
".\objects\powermanagement.o" ".\objects\powermanagement.o"
".\objects\powermanagement_user.o" ".\objects\powermanagement_user.o"
".\objects\system_monitor.o" ".\objects\system_monitor.o"
......
HJ232_Source/Out/QJ300_circle.map
View file @ 4d58b46d
This source diff could not be displayed because it is too large. You can view the blob instead.
HJ232_Source/source/Application/APPCan/CAN_User.c
View file @ 4d58b46d
...@@ -377,7 +377,7 @@ void Can_Set_Buff_502(uint8_t CopyData[]) ...@@ -377,7 +377,7 @@ void Can_Set_Buff_502(uint8_t CopyData[])
CopyData[6] = 0U; CopyData[6] = 0U;
CopyData[7] = 0U; CopyData[7] = 0U;
temp8 = LINE_IN_Get_TirePressure();
CopyData[0] = temp8 << 2; CopyData[0] = temp8 << 2;
......
HJ232_Source/source/Application/DataProcessor/Data_Gear.c
View file @ 4d58b46d
#include "Data_Gear.h" #include "Data_Gear.h"
#include "Line_in.h"
#include "Analog_Circuits.h" #include "Analog_Circuits.h"
#include "Analog_Signals.h" #include "Analog_Signals.h"
#include "gpio.h" #include "gpio.h"
......
HJ232_Source/source/Application/LINE_IN/Line_In.c deleted 100644 → 0
View file @ 8fe74d55
#include "common.h"
#include "gpio.h"
#include "Line_in.h"
/*硬线输入服务函数调用周期 单位：ms*/
#define LINE_IN_CYCLE 10U
/*---------------------------------------------------------------------------------------*/
const Line_In_Attribute_st_t g_stLineInAttribute[] =
{
{ LINE_IN_IG_ON, 20U, 0U, LINE_IN_Get_RightTurn,},
{ LINE_IN_IG_ON, 20U, 0U, LINE_IN_Get_LeftTurn,},
{ LINE_IN_IG_ON, 60U, 0U, LINE_IN_Get_HighBeam,},
{ LINE_IN_IG_ON, 300U, 0U, LINE_IN_Get_ABS,},
{ LINE_IN_IG_ON, 300U, 0U, LINE_IN_Get_AutoStarStop,},
{ LINE_IN_IG_ON, 100U, 0U, LINE_IN_Get_TirePressure,},
{ LINE_IN_IG_ON, 2000U, 0U, LINE_IN_Get_OilPressure,},
{ LINE_IN_IG_ON, 300U, 0U, LINE_IN_Get_OBD,},
};
uint8_t LINE_IN_Get_RightTurn(void){
uint8_t Res = 0;
if(PORT_GetBit(RightTurn_P_In)){
Res = 1;
}
return Res;
}
uint8_t LINE_IN_Get_LeftTurn(void){
uint8_t Res = 0;
if(PORT_GetBit(LeftTurn_P_In)){
Res = 1;
}
return Res;
}
uint8_t LINE_IN_Get_HighBeam(void){
uint8_t Res = 0;
if(PORT_GetBit(HighBeam_P_In) == 0){
Res = 1;
}
return Res;
}
uint8_t LINE_IN_Get_ABS(void){
uint8_t Res = 0;
if(PORT_GetBit(ABS_N_In) == 1){
Res = 1;
}
return Res;
}
uint8_t LINE_IN_Get_AutoStarStop(void){
uint8_t Res = 0;
if(PORT_GetBit(AutoStarStop_N_In) == 0){
Res = 1;
}
return Res;
}
uint8_t LINE_IN_Get_TirePressure(void){
uint8_t Res = 0;
if(PORT_GetBit(TirePressure_N_In) == 0){
Res = 1;
}
return Res;
}
uint8_t LINE_IN_Get_OilPressure(void){
uint8_t Res = 0;
if(PORT_GetBit(OilPressure_N_In) == 0){
Res = 1;
}
return Res;
}
uint8_t LINE_IN_Get_OBD(void){
uint8_t Res = 0;
if(PORT_GetBit(OBD_N_In) == 0){
Res = 1;
}
return Res;
}
//=========================================================================================
/*以下内容不要改*/
//=========================================================================================
typedef struct
{
LineIn_LogicLevel_en_t u8Status; /*硬线最后输出状态*/
uint16_t u16TimeCount; /*消抖计时变量*/
uint8_t u8PinInputLast; /*实际硬线输入引脚记忆的上一次状态*/
} Line_In_Control_st_t;
Line_In_Control_st_t g_stLineInControl[LINE_IN_NUMBER];
/*电源状态*/
LINE_IN_WorkSt_en_t g_enLineInPowerStatus;
static void Line_In_Debounce_Handle(uint8_t Channel);
static void Line_In_Debounce_Handle(uint8_t Channel)
{
uint8_t enRealtimeLevel;
uint8_t (*pRead)(void);
pRead = g_stLineInAttribute[Channel].pfnLineIn_Read_Cbk;
if (pRead != NULL)
{
enRealtimeLevel = pRead();
if (g_stLineInControl[Channel].u8PinInputLast != enRealtimeLevel)
{
g_stLineInControl[Channel].u16TimeCount = 0U;
g_stLineInControl[Channel].u8PinInputLast = enRealtimeLevel;
}
else
{
/*硬线输入等于有效电平*/
if (1 == enRealtimeLevel)
{
g_stLineInControl[Channel].u16TimeCount += LINE_IN_CYCLE;
if (g_stLineInControl[Channel].u16TimeCount >= g_stLineInAttribute[Channel].u16ValidTime)
{
g_stLineInControl[Channel].u16TimeCount = 0U;
g_stLineInControl[Channel].u8Status = LINE_IN_LOGIC_VALID;
}
}
else
{
g_stLineInControl[Channel].u16TimeCount += LINE_IN_CYCLE;
if (g_stLineInControl[Channel].u16TimeCount >= g_stLineInAttribute[Channel].u16InvalidTime)
{
g_stLineInControl[Channel].u16TimeCount = 0U;
g_stLineInControl[Channel].u8Status = LINE_IN_LOGIC_INVALID;
}
}
}
}
}
void Line_In_SetPowerSt(LINE_IN_WorkSt_en_t u8PowerSt)
{
g_enLineInPowerStatus = u8PowerSt;
}
/*推荐值10ms*/
void Line_In_Debounce_Service(void)
{
uint8_t i;
for (i = 0u; i < LINE_IN_NUMBER; i++)
{
if (g_stLineInAttribute[i].enPowerStatus == LINE_IN_IG_ONOFF)
{
Line_In_Debounce_Handle(i);
}
else if (g_stLineInAttribute[i].enPowerStatus == LINE_IN_IG_ON)
{
if (g_enLineInPowerStatus == LINE_IN_IG_ON)
{
Line_In_Debounce_Handle(i);
}
else /*切换电源状态时已经操作过了*/
{
}
}
else /* if(LINE_IN_IG_OFF==g_stLineInAttribute[i].enPowerStatus) */
{
if (g_enLineInPowerStatus == LINE_IN_IG_OFF)
{
Line_In_Debounce_Handle(i);
}
else /*切换电源状态时已经操作过了*/
{
}
}
}
}
LineIn_LogicLevel_en_t Line_In_Get_Status(uint8_t Channel)
{
return g_stLineInControl[Channel].u8Status;
}
void Line_In_KL30_Init(void)
{
uint8_t i = 0U;
g_enLineInPowerStatus = LINE_IN_IG_OFF;
for (i = 0U; i < LINE_IN_NUMBER; i++)
{
g_stLineInControl[i].u16TimeCount = 0U;
g_stLineInControl[i].u8PinInputLast = 0U;
g_stLineInControl[i].u8Status = LINE_IN_LOGIC_INVALID;
}
}
void Line_In_KL15_ON_Init(void)
{
uint8_t i = 0U;
g_enLineInPowerStatus = LINE_IN_IG_ON;
for (i = 0U; i < LINE_IN_NUMBER; i++)
{
/*硬线在当前电源状态下不工作*/
if (g_stLineInAttribute[i].enPowerStatus == LINE_IN_IG_OFF)
{
g_stLineInControl[i].u8Status = LINE_IN_LOGIC_INVALID;
g_stLineInControl[i].u16TimeCount = 0U;
}
}
}
void Line_In_KL15_OFF_Init(void)
{
uint8_t i = 0U;
g_enLineInPowerStatus = LINE_IN_IG_OFF;
for (i = 0U; i < LINE_IN_NUMBER; i++)
{
/*硬线在当前电源状态下不工作*/
if (g_stLineInAttribute[i].enPowerStatus == LINE_IN_IG_ON)
{
g_stLineInControl[i].u8Status = LINE_IN_LOGIC_INVALID;
g_stLineInControl[i].u16TimeCount = 0U;
}
}
}
HJ232_Source/source/Application/LINE_IN/Line_In.h deleted 100644 → 0
View file @ 8fe74d55
#ifndef LINE_IN_H__
#define LINE_IN_H__
#include "common.h"
#include "string.h"
/*
Note ! NOW LineIn only support 254 channel!!!!!
Note ! NOW LineIn only support 254 channel!!!!!
Note ! NOW LineIn only support 254 channel!!!!!
Note ! NOW LineIn only support 254 channel!!!!!
Note ! NOW LineIn only support 254 channel!!!!!
*/
/*?有硬线输入的索引*/
typedef enum
{
LINE_IN_RightTurn = 0u,
LINE_IN_LeftTurn,
LINE_IN_HighBeam,
LINE_IN_ABS,
LINE_IN_AutoStarStop,
LINE_IN_TirePressure,
LINE_IN_OilPressure,
LINE_IN_OBD,
LINE_IN_NUMBER,
} Line_In_Channel_en_t;
/*获取实时硬线电平函数指针*/
typedef struct
{
LINE_IN_WorkSt_en_t enPowerStatus; /*硬线工作的电源状?*/
uint16_t u16ValidTime; /*从无效到有效的消抖时? ms*/
uint16_t u16InvalidTime; /*从有效到无效的消抖时?*/
uint8_t (*pfnLineIn_Read_Cbk)(void); /*获取实时电平的回调函?*/
} Line_In_Attribute_st_t;
extern void Line_In_SetPowerSt(LINE_IN_WorkSt_en_t u8PowerSt);
/*10ms调用*/
extern void Line_In_Debounce_Service(void);
extern LineIn_LogicLevel_en_t Line_In_Get_Status(uint8_t Channel);
extern void Line_In_KL30_Init(void);
extern void Line_In_KL15_ON_Init(void);
extern void Line_In_KL15_OFF_Init(void);
extern uint8_t LINE_IN_Get_RightTurn(void);
extern uint8_t LINE_IN_Get_LeftTurn(void);
extern uint8_t LINE_IN_Get_HighBeam(void);
extern uint8_t LINE_IN_Get_ABS(void);
extern uint8_t LINE_IN_Get_AutoStarStop(void);
extern uint8_t LINE_IN_Get_TirePressure(void);
extern uint8_t LINE_IN_Get_OilPressure(void);
extern uint8_t LINE_IN_Get_OBD(void);
#endif
HJ232_Source/source/Application/PowerManagement/PowerManagement_user.c
View file @ 4d58b46d
#include "PowerManagement.h" #include "PowerManagement.h"
#include "PowerManagement_user.h" #include "PowerManagement_user.h"
#include "System_Monitor.h" #include "System_Monitor.h"
#include "Line_in.h"
#include "gpio.h" #include "gpio.h"
#include "Common_Interface.h" #include "Common_Interface.h"
#include "clk.h" #include "clk.h"
...@@ -37,7 +37,7 @@ uint16_t g_sleepDelay = 0; ...@@ -37,7 +37,7 @@ uint16_t g_sleepDelay = 0;
void Power_KL30_Init ( void ) void Power_KL30_Init ( void )
{ {
Sys_KL30_Init(); Sys_KL30_Init();
Line_In_KL30_Init();
// UART2_Init(115200); // UART2_Init(115200);
// uart2_User_KL30_Init(); // uart2_User_KL30_Init();
Telltales_Init(); Telltales_Init();
...@@ -190,7 +190,7 @@ void Power_Wakeup_Init ( void ) ...@@ -190,7 +190,7 @@ void Power_Wakeup_Init ( void )
Sys_Tick_Timer_Start(); Sys_Tick_Timer_Start();
Analog_Signal_Conv_Init(); Analog_Signal_Conv_Init();
Sys_WakeUp_Init(); Sys_WakeUp_Init();
Line_In_KL30_Init();
Telltales_Init(); Telltales_Init();
// UART2_Init(115200); // UART2_Init(115200);
// uart2_User_KL30_Init(); // uart2_User_KL30_Init();
...@@ -218,7 +218,7 @@ void Power_IG_OFF_Init(void) ...@@ -218,7 +218,7 @@ void Power_IG_OFF_Init(void)
SEG_LCD_Gear_Display(0, 0, 0); SEG_LCD_Gear_Display(0, 0, 0);
SEG_Coolant_Temp_Display(0, 0); SEG_Coolant_Temp_Display(0, 0);
Line_In_KL15_OFF_Init();
Common_Set_IG_Sts(COMMON_POWER_OFF); Common_Set_IG_Sts(COMMON_POWER_OFF);
Set_CanSleepDelayTime(8000); Set_CanSleepDelayTime(8000);
g_sleepDelay = 300;//延时30s休眠 g_sleepDelay = 300;//延时30s休眠
...@@ -226,7 +226,7 @@ void Power_IG_OFF_Init(void) ...@@ -226,7 +226,7 @@ void Power_IG_OFF_Init(void)
} }
void Power_IG_ON_Init(void) void Power_IG_ON_Init(void)
{ {
Line_In_KL15_ON_Init();
Telltales_KL15_Init(); Telltales_KL15_Init();
bsp_CAN_SleepRelease(); bsp_CAN_SleepRelease();
bsp_CAN_Init(); bsp_CAN_Init();
......
HJ232_Source/source/Application/Telltales/Telltales_user.c
View file @ 4d58b46d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "Telltales_user.h" #include "Telltales_user.h"
#include "Flash_synchronizer.h" #include "Flash_synchronizer.h"
#include "Common_Interface.h" #include "Common_Interface.h"
#include "Line_in.h"
#include "CAN_User.h" #include "CAN_User.h"
#include "SEG_LCD.h" #include "SEG_LCD.h"
...@@ -61,16 +61,7 @@ const LED_Attribute_st LED_Attribute[LED_Max] = ...@@ -61,16 +61,7 @@ const LED_Attribute_st LED_Attribute[LED_Max] =
uint16_t LED_RIGHT_Judgement(void) uint16_t LED_RIGHT_Judgement(void)
{ {
uint16_t u8Result = 0u; uint16_t u8Result = 0u;
uint8_t Get_LIne_Sta = 0u;
Get_LIne_Sta = (uint8_t)Line_In_Get_Status(LINE_IN_RightTurn);
if (Get_LIne_Sta == 1u)
{
u8Result = 1u;
}
else
{
u8Result = 0u;
}
return u8Result; return u8Result;
} }
void LED_RIGHT_Execution(uint16_t led_status) void LED_RIGHT_Execution(uint16_t led_status)
...@@ -96,7 +87,7 @@ uint16_t LED_LEFT_Judgement(void) ...@@ -96,7 +87,7 @@ uint16_t LED_LEFT_Judgement(void)
{ {
uint16_t u8Result = 0u; uint16_t u8Result = 0u;
uint8_t Get_LIne_Sta = 0u; uint8_t Get_LIne_Sta = 0u;
Get_LIne_Sta = (uint8_t)Line_In_Get_Status(LINE_IN_LeftTurn);
if (Get_LIne_Sta == LINE_IN_LOGIC_VALID) if (Get_LIne_Sta == LINE_IN_LOGIC_VALID)
{ {
u8Result = 1u; u8Result = 1u;
...@@ -131,7 +122,7 @@ uint16_t LED_HI_BEAM_Judgement(void) ...@@ -131,7 +122,7 @@ uint16_t LED_HI_BEAM_Judgement(void)
{ {
uint16_t u8Result = 0u; uint16_t u8Result = 0u;
uint8_t Get_LIne_Sta = 0u; uint8_t Get_LIne_Sta = 0u;
Get_LIne_Sta = (uint8_t)Line_In_Get_Status(LINE_IN_HighBeam);
if (Get_LIne_Sta == 1u) if (Get_LIne_Sta == 1u)
{ {
u8Result = 1u; u8Result = 1u;
...@@ -165,7 +156,7 @@ uint16_t LED_MIL_Judgement(void) ...@@ -165,7 +156,7 @@ uint16_t LED_MIL_Judgement(void)
{ {
uint16_t u8Result = 0u; uint16_t u8Result = 0u;
uint8_t Get_LIne_Sta = 0u; uint8_t Get_LIne_Sta = 0u;
Get_LIne_Sta = (uint8_t)Line_In_Get_Status(LINE_IN_OBD);
if (Get_LIne_Sta == 1u) if (Get_LIne_Sta == 1u)
{ {
u8Result = 1u; u8Result = 1u;
...@@ -199,7 +190,7 @@ uint16_t LED_ABS_Judgement(void) ...@@ -199,7 +190,7 @@ uint16_t LED_ABS_Judgement(void)
{ {
uint16_t u8Result = 0u; uint16_t u8Result = 0u;
uint8_t Get_LIne_Sta = 0u; uint8_t Get_LIne_Sta = 0u;
Get_LIne_Sta = (uint8_t)Line_In_Get_Status(LINE_IN_ABS);
if (Get_LIne_Sta == 1u) if (Get_LIne_Sta == 1u)
{ {
u8Result = 1u; u8Result = 1u;
...@@ -261,7 +252,7 @@ uint16_t LED_AutoStarStop_Judgement(void) ...@@ -261,7 +252,7 @@ uint16_t LED_AutoStarStop_Judgement(void)
{ {
uint16_t u8Result = 0u; uint16_t u8Result = 0u;
uint8_t Get_LIne_Sta = 0u; uint8_t Get_LIne_Sta = 0u;
Get_LIne_Sta = (uint8_t)Line_In_Get_Status(LINE_IN_AutoStarStop);
if (Get_LIne_Sta == 1u) if (Get_LIne_Sta == 1u)
{ {
u8Result = 1u; u8Result = 1u;
...@@ -401,7 +392,7 @@ uint16_t LED_ENGINE_OIL_LOW_Judgement(void) ...@@ -401,7 +392,7 @@ uint16_t LED_ENGINE_OIL_LOW_Judgement(void)
{ {
uint16_t u8Result = 0u; uint16_t u8Result = 0u;
uint8_t Get_LIne_Sta = 0u; uint8_t Get_LIne_Sta = 0u;
// Get_LIne_Sta = (uint8_t)Line_In_Get_Status(LINE_IN_OilPressure);
if (Get_LIne_Sta == 1u) if (Get_LIne_Sta == 1u)
{ {
u8Result = 1u; u8Result = 1u;
...@@ -435,7 +426,6 @@ uint16_t LED_TPMS_Judgement(void) ...@@ -435,7 +426,6 @@ uint16_t LED_TPMS_Judgement(void)
{ {
uint16_t u8Result = 0u; uint16_t u8Result = 0u;
uint8_t Get_LIne_Sta = 0u; uint8_t Get_LIne_Sta = 0u;
// Get_LIne_Sta = (uint8_t)Line_In_Get_Status(LINE_IN_OilPressure);
if (Get_LIne_Sta == 1u) if (Get_LIne_Sta == 1u)
{ {
u8Result = 1u; u8Result = 1u;
......
HJ232_Source/source/System/tasks.c
View file @ 4d58b46d
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#include "BAT32A239.h" #include "BAT32A239.h"
#include "common.h" #include "common.h"
#include "Sys_Scheduler.h" #include "Sys_Scheduler.h"
#include "Line_In.h"
#include "adc.h" #include "adc.h"
#include "Analog_Signals.h" #include "Analog_Signals.h"
...@@ -99,16 +98,11 @@ void Sys_Run_Mode_5ms_Tasks(void) ...@@ -99,16 +98,11 @@ void Sys_Run_Mode_5ms_Tasks(void)
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
void Sys_Run_Mode_10ms_Tasks(void) void Sys_Run_Mode_10ms_Tasks(void)
{ {
Common_SetSelfcheckStart(1); Common_SetSelfcheckStart(1);
Analog_Signal_Conv_Service(); Analog_Signal_Conv_Service();
BackLightDamp(10u); BackLightDamp(10u);
Line_In_Debounce_Service();
Telltales_Management(); Telltales_Management();
Can_BusOff_Fun(10u); Can_BusOff_Fun(10u);
} }
/*============================================================================*/ /*============================================================================*/
......
HJ232_Source/tim4DelayCounter.uvoptx
View file @ 4d58b46d
...@@ -795,30 +795,6 @@ ...@@ -795,30 +795,6 @@
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>.\source\Application\LINE_IN\Line_In.h</PathWithFileName>
<FilenameWithoutPath>Line_In.h</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>3</GroupNumber>
<FileNumber>47</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\source\Application\LINE_IN\Line_In.c</PathWithFileName>
<FilenameWithoutPath>Line_In.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>3</GroupNumber>
<FileNumber>48</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\source\Application\PowerManagement\PowerManagement.h</PathWithFileName> <PathWithFileName>.\source\Application\PowerManagement\PowerManagement.h</PathWithFileName>
<FilenameWithoutPath>PowerManagement.h</FilenameWithoutPath> <FilenameWithoutPath>PowerManagement.h</FilenameWithoutPath>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
...@@ -826,7 +802,7 @@ ...@@ -826,7 +802,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>49</FileNumber> <FileNumber>47</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -838,7 +814,7 @@ ...@@ -838,7 +814,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>50</FileNumber> <FileNumber>48</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -850,7 +826,7 @@ ...@@ -850,7 +826,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>51</FileNumber> <FileNumber>49</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -862,7 +838,7 @@ ...@@ -862,7 +838,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>52</FileNumber> <FileNumber>50</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -874,7 +850,7 @@ ...@@ -874,7 +850,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>53</FileNumber> <FileNumber>51</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -886,7 +862,7 @@ ...@@ -886,7 +862,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>54</FileNumber> <FileNumber>52</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -898,7 +874,7 @@ ...@@ -898,7 +874,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>55</FileNumber> <FileNumber>53</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -910,7 +886,7 @@ ...@@ -910,7 +886,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>56</FileNumber> <FileNumber>54</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -922,7 +898,7 @@ ...@@ -922,7 +898,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>57</FileNumber> <FileNumber>55</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -934,7 +910,7 @@ ...@@ -934,7 +910,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>58</FileNumber> <FileNumber>56</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -946,7 +922,7 @@ ...@@ -946,7 +922,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>59</FileNumber> <FileNumber>57</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -958,7 +934,7 @@ ...@@ -958,7 +934,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>60</FileNumber> <FileNumber>58</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -970,7 +946,7 @@ ...@@ -970,7 +946,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>61</FileNumber> <FileNumber>59</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -982,7 +958,7 @@ ...@@ -982,7 +958,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>62</FileNumber> <FileNumber>60</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -994,7 +970,7 @@ ...@@ -994,7 +970,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>63</FileNumber> <FileNumber>61</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1006,7 +982,7 @@ ...@@ -1006,7 +982,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>64</FileNumber> <FileNumber>62</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1018,7 +994,7 @@ ...@@ -1018,7 +994,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>65</FileNumber> <FileNumber>63</FileNumber>
<FileType>4</FileType> <FileType>4</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1030,7 +1006,7 @@ ...@@ -1030,7 +1006,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>66</FileNumber> <FileNumber>64</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1042,7 +1018,7 @@ ...@@ -1042,7 +1018,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>67</FileNumber> <FileNumber>65</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1054,7 +1030,7 @@ ...@@ -1054,7 +1030,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>68</FileNumber> <FileNumber>66</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1066,7 +1042,7 @@ ...@@ -1066,7 +1042,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>69</FileNumber> <FileNumber>67</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1078,7 +1054,7 @@ ...@@ -1078,7 +1054,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>70</FileNumber> <FileNumber>68</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1090,7 +1066,7 @@ ...@@ -1090,7 +1066,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>71</FileNumber> <FileNumber>69</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1102,7 +1078,7 @@ ...@@ -1102,7 +1078,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>72</FileNumber> <FileNumber>70</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1114,7 +1090,7 @@ ...@@ -1114,7 +1090,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>73</FileNumber> <FileNumber>71</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1126,7 +1102,7 @@ ...@@ -1126,7 +1102,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>74</FileNumber> <FileNumber>72</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1138,7 +1114,7 @@ ...@@ -1138,7 +1114,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>75</FileNumber> <FileNumber>73</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1150,7 +1126,7 @@ ...@@ -1150,7 +1126,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>76</FileNumber> <FileNumber>74</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1162,7 +1138,7 @@ ...@@ -1162,7 +1138,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>77</FileNumber> <FileNumber>75</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1174,7 +1150,7 @@ ...@@ -1174,7 +1150,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>78</FileNumber> <FileNumber>76</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1186,7 +1162,7 @@ ...@@ -1186,7 +1162,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>79</FileNumber> <FileNumber>77</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1198,7 +1174,7 @@ ...@@ -1198,7 +1174,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>80</FileNumber> <FileNumber>78</FileNumber>
<FileType>4</FileType> <FileType>4</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1210,7 +1186,7 @@ ...@@ -1210,7 +1186,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>81</FileNumber> <FileNumber>79</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1222,7 +1198,7 @@ ...@@ -1222,7 +1198,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>82</FileNumber> <FileNumber>80</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1234,7 +1210,7 @@ ...@@ -1234,7 +1210,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>83</FileNumber> <FileNumber>81</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1246,7 +1222,7 @@ ...@@ -1246,7 +1222,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>84</FileNumber> <FileNumber>82</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1266,7 +1242,7 @@ ...@@ -1266,7 +1242,7 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>4</GroupNumber> <GroupNumber>4</GroupNumber>
<FileNumber>85</FileNumber> <FileNumber>83</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1278,7 +1254,7 @@ ...@@ -1278,7 +1254,7 @@
</File> </File>
<File> <File>
<GroupNumber>4</GroupNumber> <GroupNumber>4</GroupNumber>
<FileNumber>86</FileNumber> <FileNumber>84</FileNumber>
<FileType>4</FileType> <FileType>4</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1298,7 +1274,7 @@ ...@@ -1298,7 +1274,7 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>5</GroupNumber> <GroupNumber>5</GroupNumber>
<FileNumber>87</FileNumber> <FileNumber>85</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1310,7 +1286,7 @@ ...@@ -1310,7 +1286,7 @@
</File> </File>
<File> <File>
<GroupNumber>5</GroupNumber> <GroupNumber>5</GroupNumber>
<FileNumber>88</FileNumber> <FileNumber>86</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1322,7 +1298,7 @@ ...@@ -1322,7 +1298,7 @@
</File> </File>
<File> <File>
<GroupNumber>5</GroupNumber> <GroupNumber>5</GroupNumber>
<FileNumber>89</FileNumber> <FileNumber>87</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1334,7 +1310,7 @@ ...@@ -1334,7 +1310,7 @@
</File> </File>
<File> <File>
<GroupNumber>5</GroupNumber> <GroupNumber>5</GroupNumber>
<FileNumber>90</FileNumber> <FileNumber>88</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1346,7 +1322,7 @@ ...@@ -1346,7 +1322,7 @@
</File> </File>
<File> <File>
<GroupNumber>5</GroupNumber> <GroupNumber>5</GroupNumber>
<FileNumber>91</FileNumber> <FileNumber>89</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1358,7 +1334,7 @@ ...@@ -1358,7 +1334,7 @@
</File> </File>
<File> <File>
<GroupNumber>5</GroupNumber> <GroupNumber>5</GroupNumber>
<FileNumber>92</FileNumber> <FileNumber>90</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1370,7 +1346,7 @@ ...@@ -1370,7 +1346,7 @@
</File> </File>
<File> <File>
<GroupNumber>5</GroupNumber> <GroupNumber>5</GroupNumber>
<FileNumber>93</FileNumber> <FileNumber>91</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1382,7 +1358,7 @@ ...@@ -1382,7 +1358,7 @@
</File> </File>
<File> <File>
<GroupNumber>5</GroupNumber> <GroupNumber>5</GroupNumber>
<FileNumber>94</FileNumber> <FileNumber>92</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1394,7 +1370,7 @@ ...@@ -1394,7 +1370,7 @@
</File> </File>
<File> <File>
<GroupNumber>5</GroupNumber> <GroupNumber>5</GroupNumber>
<FileNumber>95</FileNumber> <FileNumber>93</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1406,7 +1382,7 @@ ...@@ -1406,7 +1382,7 @@
</File> </File>
<File> <File>
<GroupNumber>5</GroupNumber> <GroupNumber>5</GroupNumber>
<FileNumber>96</FileNumber> <FileNumber>94</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1418,7 +1394,7 @@ ...@@ -1418,7 +1394,7 @@
</File> </File>
<File> <File>
<GroupNumber>5</GroupNumber> <GroupNumber>5</GroupNumber>
<FileNumber>97</FileNumber> <FileNumber>95</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1438,7 +1414,7 @@ ...@@ -1438,7 +1414,7 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>6</GroupNumber> <GroupNumber>6</GroupNumber>
<FileNumber>98</FileNumber> <FileNumber>96</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1450,7 +1426,7 @@ ...@@ -1450,7 +1426,7 @@
</File> </File>
<File> <File>
<GroupNumber>6</GroupNumber> <GroupNumber>6</GroupNumber>
<FileNumber>99</FileNumber> <FileNumber>97</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1462,7 +1438,7 @@ ...@@ -1462,7 +1438,7 @@
</File> </File>
<File> <File>
<GroupNumber>6</GroupNumber> <GroupNumber>6</GroupNumber>
<FileNumber>100</FileNumber> <FileNumber>98</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1474,7 +1450,7 @@ ...@@ -1474,7 +1450,7 @@
</File> </File>
<File> <File>
<GroupNumber>6</GroupNumber> <GroupNumber>6</GroupNumber>
<FileNumber>101</FileNumber> <FileNumber>99</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1486,7 +1462,7 @@ ...@@ -1486,7 +1462,7 @@
</File> </File>
<File> <File>
<GroupNumber>6</GroupNumber> <GroupNumber>6</GroupNumber>
<FileNumber>102</FileNumber> <FileNumber>100</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1498,7 +1474,7 @@ ...@@ -1498,7 +1474,7 @@
</File> </File>
<File> <File>
<GroupNumber>6</GroupNumber> <GroupNumber>6</GroupNumber>
<FileNumber>103</FileNumber> <FileNumber>101</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1510,7 +1486,7 @@ ...@@ -1510,7 +1486,7 @@
</File> </File>
<File> <File>
<GroupNumber>6</GroupNumber> <GroupNumber>6</GroupNumber>
<FileNumber>104</FileNumber> <FileNumber>102</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1522,7 +1498,7 @@ ...@@ -1522,7 +1498,7 @@
</File> </File>
<File> <File>
<GroupNumber>6</GroupNumber> <GroupNumber>6</GroupNumber>
<FileNumber>105</FileNumber> <FileNumber>103</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1534,7 +1510,7 @@ ...@@ -1534,7 +1510,7 @@
</File> </File>
<File> <File>
<GroupNumber>6</GroupNumber> <GroupNumber>6</GroupNumber>
<FileNumber>106</FileNumber> <FileNumber>104</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1546,7 +1522,7 @@ ...@@ -1546,7 +1522,7 @@
</File> </File>
<File> <File>
<GroupNumber>6</GroupNumber> <GroupNumber>6</GroupNumber>
<FileNumber>107</FileNumber> <FileNumber>105</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
......
HJ232_Source/tim4DelayCounter.uvprojx
View file @ 4d58b46d
...@@ -618,16 +618,6 @@ ...@@ -618,16 +618,6 @@
<Group> <Group>
<GroupName>Application</GroupName> <GroupName>Application</GroupName>
<Files> <Files>
<File>
<FileName>Line_In.h</FileName>
<FileType>5</FileType>
<FilePath>.\source\Application\LINE_IN\Line_In.h</FilePath>
</File>
<File>
<FileName>Line_In.c</FileName>
<FileType>1</FileType>
<FilePath>.\source\Application\LINE_IN\Line_In.c</FilePath>
</File>
<File> <File>
<FileName>PowerManagement.h</FileName> <FileName>PowerManagement.h</FileName>
<FileType>5</FileType> <FileType>5</FileType>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment