添加顶部电源状态保存
This commit is contained in:
parent
211fd7e895
commit
31f43d05cc
|
@ -520,7 +520,13 @@ void ptz_data_pack_process(char dev, PTZ_DATA_PACK *pack)
|
|||
break;
|
||||
}
|
||||
// ptz_aux_switch(pack->data[1], POWER_ON);
|
||||
ptz_reply(dev, CMD_RIGHT);
|
||||
// ptz_reply(dev, CMD_RIGHT);
|
||||
if(aux_switch_cfg_save())
|
||||
{
|
||||
ptz_reply(dev, CMD_RIGHT);
|
||||
}else{
|
||||
ptz_reply(dev, CMD_FAIL);
|
||||
}
|
||||
break;
|
||||
|
||||
case HYT_PACK_CMD_1_FUNC_CONTROL_TOP_POWER_OFF: //0x0b://关闭辅助开关
|
||||
|
@ -536,7 +542,13 @@ void ptz_data_pack_process(char dev, PTZ_DATA_PACK *pack)
|
|||
break;
|
||||
}
|
||||
// ptz_aux_switch(pack->data[1], POWER_OFF);
|
||||
ptz_reply(dev, CMD_RIGHT);
|
||||
// ptz_reply(dev, CMD_RIGHT);
|
||||
if(aux_switch_cfg_save())
|
||||
{
|
||||
ptz_reply(dev, CMD_RIGHT);
|
||||
}else{
|
||||
ptz_reply(dev, CMD_FAIL);
|
||||
}
|
||||
break;
|
||||
|
||||
/********************************* flash擦除 ********************************/
|
||||
|
|
|
@ -71,6 +71,11 @@ extern "C" {
|
|||
#define CFG_FILE_ADDR_END (1024*4*7-1)
|
||||
#define CFG_FILE_SECTOR_BEGIN (CFG_FILE_ADDR_BEGIN / EXT_FLASH_SECTOR_SIZE)//配置文件
|
||||
|
||||
//顶部开关状态保存在7扇区
|
||||
#define AUX_SWITCH_ADDR_BEGIN (1024*4*7)
|
||||
#define AUX_SWITCH_ADDR_END (1024*4*8-1)
|
||||
#define AUX_SWITCH_SECTOR_BEGIN 7
|
||||
|
||||
////应用程序包头存储地址信息,在应用程序前2个sector保存
|
||||
//#define APP_PKG_HEAD_BEGIN (APP_ADDR_BEGIN - ON_CHIP_FLASH_SECTOR_SIZE)
|
||||
//#define APP_PKG_HEAD_END (APP_ADDR_BEGIN-1)
|
||||
|
|
|
@ -7,6 +7,34 @@
|
|||
//用于保存云台的各项状态和数据
|
||||
PtzState g_ptz;
|
||||
|
||||
char aux_switch_cfg_read()
|
||||
{
|
||||
Flash_Read((u_int8_t *)&g_ptz.power,AUX_SWITCH_ADDR_BEGIN,sizeof(g_ptz.power));
|
||||
if(g_ptz.power.crc == ((~(g_ptz.power.aux_switch_1+g_ptz.power.aux_switch_2+g_ptz.power.aux_switch_3+g_ptz.power.aux_switch_4))&0xFF))
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
char aux_switch_cfg_save()
|
||||
{
|
||||
AuxSwitchPower aux_cfg={0x00};
|
||||
char crc=0;
|
||||
crc = ~(g_ptz.power.aux_switch_1+g_ptz.power.aux_switch_2+g_ptz.power.aux_switch_3+g_ptz.power.aux_switch_4)&0xFF;
|
||||
g_ptz.power.crc=crc;
|
||||
Flash_Erase_Sector(0,7);
|
||||
Flash_Write_MorePage((u_int8_t *)&g_ptz.power, AUX_SWITCH_ADDR_BEGIN, sizeof(g_ptz.power));
|
||||
|
||||
Flash_Read((u_int8_t *)&aux_cfg,AUX_SWITCH_ADDR_BEGIN,sizeof(aux_cfg));
|
||||
|
||||
if(aux_cfg.crc == (~(aux_cfg.aux_switch_1+aux_cfg.aux_switch_2+aux_cfg.aux_switch_3+aux_cfg.aux_switch_4)&0xFF))
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
//电源控制初始化
|
||||
void ptz_aux_switch_init()
|
||||
{
|
||||
|
@ -19,11 +47,32 @@ void ptz_aux_switch_init()
|
|||
gpio_mode_set(GPIOE, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, GPIO_PIN_2);
|
||||
gpio_output_options_set(GPIOE, GPIO_OTYPE_PP, GPIO_OSPEED_50MHZ, GPIO_PIN_2);
|
||||
|
||||
PHOTO_POWER_PHOTO_OFF;
|
||||
g_ptz.power.aux_switch_3 = POWER_OFF;
|
||||
|
||||
FARIR_POWER_FARIR_OFF;
|
||||
g_ptz.power.aux_switch_4 = POWER_OFF;
|
||||
if(aux_switch_cfg_read())
|
||||
{
|
||||
if(g_ptz.power.aux_switch_3 == POWER_ON)
|
||||
{
|
||||
PHOTO_POWER_PHOTO_ON;
|
||||
}
|
||||
if(g_ptz.power.aux_switch_3 == POWER_OFF)
|
||||
{
|
||||
PHOTO_POWER_PHOTO_OFF;
|
||||
}
|
||||
if(g_ptz.power.aux_switch_4 == POWER_ON)
|
||||
{
|
||||
FARIR_POWER_FARIR_ON;
|
||||
}
|
||||
if(g_ptz.power.aux_switch_4 == POWER_OFF)
|
||||
{
|
||||
FARIR_POWER_FARIR_OFF;
|
||||
}
|
||||
}else{
|
||||
//¶Áȡʧ°Ü
|
||||
PHOTO_POWER_PHOTO_OFF;
|
||||
g_ptz.power.aux_switch_3 = POWER_OFF;
|
||||
|
||||
FARIR_POWER_FARIR_OFF;
|
||||
g_ptz.power.aux_switch_4 = POWER_OFF;
|
||||
}
|
||||
}
|
||||
|
||||
void ptz_return_clear()
|
||||
|
|
|
@ -287,9 +287,9 @@ typedef struct _AuxSwitchPower_
|
|||
char aux_switch_2;
|
||||
char aux_switch_3;
|
||||
char aux_switch_4;
|
||||
char crc;
|
||||
}AuxSwitchPower;
|
||||
|
||||
|
||||
///ÔÆÌ¨0Î»Æ«ÒÆ½Ç¶È
|
||||
typedef struct _PtzZeroOffsetAngle_
|
||||
{
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
/*-Editor annotation file-*/
|
||||
/* IcfEditorFile="$TOOLKIT_DIR$\config\ide\IcfEditor\cortex_v1_0.xml" */
|
||||
/*-Specials-*/
|
||||
define symbol __ICFEDIT_intvec_start__ = 0x08010000;
|
||||
define symbol __ICFEDIT_intvec_start__ = 0x08000000;
|
||||
/*-Memory Regions-*/
|
||||
define symbol __ICFEDIT_region_ROM_start__ = 0x08010000;
|
||||
define symbol __ICFEDIT_region_ROM_start__ = 0x08000000;
|
||||
define symbol __ICFEDIT_region_ROM_end__ = 0x0807FFFF;
|
||||
define symbol __ICFEDIT_region_RAM_start__ = 0x20000000;
|
||||
define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF;
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
206
PROJECT/OS2.ewd
206
PROJECT/OS2.ewd
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project>
|
||||
<fileVersion>3</fileVersion>
|
||||
<fileVersion>4</fileVersion>
|
||||
<configuration>
|
||||
<name>Debug</name>
|
||||
<toolchain>
|
||||
|
@ -11,7 +11,7 @@
|
|||
<name>C-SPY</name>
|
||||
<archiveVersion>2</archiveVersion>
|
||||
<data>
|
||||
<version>32</version>
|
||||
<version>33</version>
|
||||
<wantNonLocal>1</wantNonLocal>
|
||||
<debug>1</debug>
|
||||
<option>
|
||||
|
@ -44,7 +44,7 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>MemFile</name>
|
||||
<state>$TOOLKIT_DIR$\CONFIG\debugger\GigaDevice\GD32F450xE.ddf</state>
|
||||
<state>$TOOLKIT_DIR$\config\debugger\GigaDevice\GD32F450xE.ddf</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>RunToEnable</name>
|
||||
|
@ -88,7 +88,7 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>OCLastSavedByProductVersion</name>
|
||||
<state>9.20.1.43525</state>
|
||||
<state>9.40.2.67586</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>UseFlashLoader</name>
|
||||
|
@ -112,7 +112,7 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>FlashLoadersV3</name>
|
||||
<state>$TOOLKIT_DIR$\config\flashloader\GigaDevice\FlashGD32F4xxxE.board</state>
|
||||
<state>$TOOLKIT_DIR$/config/flashloader/GigaDevice/FlashGD32F4xxxE.board</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>OCImagesSuppressCheck1</name>
|
||||
|
@ -222,6 +222,38 @@
|
|||
<name>OCTpiuBaseOption</name>
|
||||
<state>1</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>OCOverrideSlave</name>
|
||||
<state>0</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>OCOverrideSlavePath</name>
|
||||
<state></state>
|
||||
</option>
|
||||
<option>
|
||||
<name>C_32_64Device</name>
|
||||
<state>1</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>AuthEnable</name>
|
||||
<state>0</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>AuthSdmSelection</name>
|
||||
<state>1</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>AuthSdmManifest</name>
|
||||
<state></state>
|
||||
</option>
|
||||
<option>
|
||||
<name>AuthSdmExplicitLib</name>
|
||||
<state></state>
|
||||
</option>
|
||||
<option>
|
||||
<name>AuthEnforce</name>
|
||||
<state>0</state>
|
||||
</option>
|
||||
</data>
|
||||
</settings>
|
||||
<settings>
|
||||
|
@ -457,6 +489,39 @@
|
|||
</option>
|
||||
</data>
|
||||
</settings>
|
||||
<settings>
|
||||
<name>E2_ID</name>
|
||||
<archiveVersion>2</archiveVersion>
|
||||
<data>
|
||||
<version>0</version>
|
||||
<wantNonLocal>1</wantNonLocal>
|
||||
<debug>1</debug>
|
||||
<option>
|
||||
<name>E2PowerFromProbe</name>
|
||||
<state>1</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>CE2UsbSerialNo</name>
|
||||
<state></state>
|
||||
</option>
|
||||
<option>
|
||||
<name>CE2IdCodeEditB</name>
|
||||
<state>0xFFFF'FFFF'FFFF'FFFF'FFFF'FFFF'FFFF'FFFF</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>CE2LogFileCheck</name>
|
||||
<state>0</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>CE2LogFileEditB</name>
|
||||
<state>$PROJ_DIR$\cspycomm.log</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>OCDriverInfo</name>
|
||||
<state>1</state>
|
||||
</option>
|
||||
</data>
|
||||
</settings>
|
||||
<settings>
|
||||
<name>GDBSERVER_ID</name>
|
||||
<archiveVersion>2</archiveVersion>
|
||||
|
@ -1072,7 +1137,7 @@
|
|||
<name>STLINK_ID</name>
|
||||
<archiveVersion>2</archiveVersion>
|
||||
<data>
|
||||
<version>7</version>
|
||||
<version>8</version>
|
||||
<wantNonLocal>1</wantNonLocal>
|
||||
<debug>1</debug>
|
||||
<option>
|
||||
|
@ -1187,9 +1252,17 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>CCSTLinkProbeList</name>
|
||||
<version>1</version>
|
||||
<version>2</version>
|
||||
<state>0</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>CCSTLinkTargetVccEnable</name>
|
||||
<state>1</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>CCSTLinkTargetVoltage</name>
|
||||
<state>###Uninitialized###</state>
|
||||
</option>
|
||||
</data>
|
||||
</settings>
|
||||
<settings>
|
||||
|
@ -1417,7 +1490,7 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>CCXds100ResetList</name>
|
||||
<version>0</version>
|
||||
<version>1</version>
|
||||
<state>0</state>
|
||||
</option>
|
||||
<option>
|
||||
|
@ -1506,17 +1579,25 @@
|
|||
<loadFlag>0</loadFlag>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9.ewplugin</file>
|
||||
<loadFlag>0</loadFlag>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9BE.ewplugin</file>
|
||||
<file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9a.ewplugin</file>
|
||||
<loadFlag>0</loadFlag>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
|
||||
<loadFlag>0</loadFlag>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
|
||||
<loadFlag>0</loadFlag>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
|
||||
<loadFlag>0</loadFlag>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
|
||||
<loadFlag>0</loadFlag>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
|
||||
<loadFlag>0</loadFlag>
|
||||
|
@ -1541,7 +1622,7 @@
|
|||
<name>C-SPY</name>
|
||||
<archiveVersion>2</archiveVersion>
|
||||
<data>
|
||||
<version>32</version>
|
||||
<version>33</version>
|
||||
<wantNonLocal>1</wantNonLocal>
|
||||
<debug>0</debug>
|
||||
<option>
|
||||
|
@ -1752,6 +1833,38 @@
|
|||
<name>OCTpiuBaseOption</name>
|
||||
<state>1</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>OCOverrideSlave</name>
|
||||
<state>0</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>OCOverrideSlavePath</name>
|
||||
<state></state>
|
||||
</option>
|
||||
<option>
|
||||
<name>C_32_64Device</name>
|
||||
<state>1</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>AuthEnable</name>
|
||||
<state>0</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>AuthSdmSelection</name>
|
||||
<state>1</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>AuthSdmManifest</name>
|
||||
<state></state>
|
||||
</option>
|
||||
<option>
|
||||
<name>AuthSdmExplicitLib</name>
|
||||
<state></state>
|
||||
</option>
|
||||
<option>
|
||||
<name>AuthEnforce</name>
|
||||
<state>0</state>
|
||||
</option>
|
||||
</data>
|
||||
</settings>
|
||||
<settings>
|
||||
|
@ -1987,6 +2100,39 @@
|
|||
</option>
|
||||
</data>
|
||||
</settings>
|
||||
<settings>
|
||||
<name>E2_ID</name>
|
||||
<archiveVersion>2</archiveVersion>
|
||||
<data>
|
||||
<version>0</version>
|
||||
<wantNonLocal>1</wantNonLocal>
|
||||
<debug>0</debug>
|
||||
<option>
|
||||
<name>E2PowerFromProbe</name>
|
||||
<state>1</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>CE2UsbSerialNo</name>
|
||||
<state></state>
|
||||
</option>
|
||||
<option>
|
||||
<name>CE2IdCodeEditB</name>
|
||||
<state>0xFFFF'FFFF'FFFF'FFFF'FFFF'FFFF'FFFF'FFFF</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>CE2LogFileCheck</name>
|
||||
<state>0</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>CE2LogFileEditB</name>
|
||||
<state>$PROJ_DIR$\cspycomm.log</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>OCDriverInfo</name>
|
||||
<state>1</state>
|
||||
</option>
|
||||
</data>
|
||||
</settings>
|
||||
<settings>
|
||||
<name>GDBSERVER_ID</name>
|
||||
<archiveVersion>2</archiveVersion>
|
||||
|
@ -2602,7 +2748,7 @@
|
|||
<name>STLINK_ID</name>
|
||||
<archiveVersion>2</archiveVersion>
|
||||
<data>
|
||||
<version>7</version>
|
||||
<version>8</version>
|
||||
<wantNonLocal>1</wantNonLocal>
|
||||
<debug>0</debug>
|
||||
<option>
|
||||
|
@ -2717,9 +2863,17 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>CCSTLinkProbeList</name>
|
||||
<version>1</version>
|
||||
<version>2</version>
|
||||
<state>0</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>CCSTLinkTargetVccEnable</name>
|
||||
<state>1</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>CCSTLinkTargetVoltage</name>
|
||||
<state>###Uninitialized###</state>
|
||||
</option>
|
||||
</data>
|
||||
</settings>
|
||||
<settings>
|
||||
|
@ -2947,7 +3101,7 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>CCXds100ResetList</name>
|
||||
<version>0</version>
|
||||
<version>1</version>
|
||||
<state>0</state>
|
||||
</option>
|
||||
<option>
|
||||
|
@ -3036,17 +3190,25 @@
|
|||
<loadFlag>0</loadFlag>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9.ewplugin</file>
|
||||
<loadFlag>0</loadFlag>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9BE.ewplugin</file>
|
||||
<file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9a.ewplugin</file>
|
||||
<loadFlag>0</loadFlag>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
|
||||
<loadFlag>0</loadFlag>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
|
||||
<loadFlag>0</loadFlag>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
|
||||
<loadFlag>0</loadFlag>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
|
||||
<loadFlag>0</loadFlag>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
|
||||
<loadFlag>0</loadFlag>
|
||||
|
|
150
PROJECT/OS2.ewp
150
PROJECT/OS2.ewp
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project>
|
||||
<fileVersion>3</fileVersion>
|
||||
<fileVersion>4</fileVersion>
|
||||
<configuration>
|
||||
<name>Debug</name>
|
||||
<toolchain>
|
||||
|
@ -11,7 +11,7 @@
|
|||
<name>General</name>
|
||||
<archiveVersion>3</archiveVersion>
|
||||
<data>
|
||||
<version>34</version>
|
||||
<version>36</version>
|
||||
<wantNonLocal>1</wantNonLocal>
|
||||
<debug>1</debug>
|
||||
<option>
|
||||
|
@ -62,7 +62,7 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>RTDescription</name>
|
||||
<state>Use the normal configuration of the C/C++ runtime library. No locale interface, C locale, no file descriptor support, no multibytes in printf and scanf, and no hex floats in strtod.</state>
|
||||
<state>A compact configuration of the C/C++14 runtime library. No locale interface, C locale, no file descriptor support, no multibytes in printf and scanf, and no hex floats in strtod.</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>OGProductVersion</name>
|
||||
|
@ -70,7 +70,7 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>OGLastSavedByProductVersion</name>
|
||||
<state>9.20.1.43525</state>
|
||||
<state>9.40.2.67586</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>OGChipSelectEditMenu</name>
|
||||
|
@ -98,7 +98,7 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>GBECoreSlave</name>
|
||||
<version>31</version>
|
||||
<version>33</version>
|
||||
<state>39</state>
|
||||
</option>
|
||||
<option>
|
||||
|
@ -115,7 +115,7 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>CoreVariant</name>
|
||||
<version>31</version>
|
||||
<version>33</version>
|
||||
<state>39</state>
|
||||
</option>
|
||||
<option>
|
||||
|
@ -138,7 +138,7 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>GFPUCoreSlave2</name>
|
||||
<version>31</version>
|
||||
<version>33</version>
|
||||
<state>39</state>
|
||||
</option>
|
||||
<option>
|
||||
|
@ -203,13 +203,26 @@
|
|||
<name>BuildFilesPath</name>
|
||||
<state>Debug</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>PointerAuthentication</name>
|
||||
<state>0</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>FPU64</name>
|
||||
<state>1</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>OG_32_64DeviceCoreSlave</name>
|
||||
<version>33</version>
|
||||
<state>39</state>
|
||||
</option>
|
||||
</data>
|
||||
</settings>
|
||||
<settings>
|
||||
<name>ICCARM</name>
|
||||
<archiveVersion>2</archiveVersion>
|
||||
<data>
|
||||
<version>37</version>
|
||||
<version>38</version>
|
||||
<wantNonLocal>1</wantNonLocal>
|
||||
<debug>1</debug>
|
||||
<option>
|
||||
|
@ -511,13 +524,21 @@
|
|||
<name>CCStackProtection</name>
|
||||
<state>0</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>CCPointerAutentiction</name>
|
||||
<state>0</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>CCBranchTargetIdentification</name>
|
||||
<state>0</state>
|
||||
</option>
|
||||
</data>
|
||||
</settings>
|
||||
<settings>
|
||||
<name>AARM</name>
|
||||
<archiveVersion>2</archiveVersion>
|
||||
<data>
|
||||
<version>11</version>
|
||||
<version>12</version>
|
||||
<wantNonLocal>1</wantNonLocal>
|
||||
<debug>1</debug>
|
||||
<option>
|
||||
|
@ -677,6 +698,10 @@
|
|||
<name>PreInclude</name>
|
||||
<state></state>
|
||||
</option>
|
||||
<option>
|
||||
<name>A_32_64Device</name>
|
||||
<state>1</state>
|
||||
</option>
|
||||
</data>
|
||||
</settings>
|
||||
<settings>
|
||||
|
@ -719,19 +744,11 @@
|
|||
<buildSequence>inputOutputBased</buildSequence>
|
||||
</data>
|
||||
</settings>
|
||||
<settings>
|
||||
<name>BUILDACTION</name>
|
||||
<archiveVersion>1</archiveVersion>
|
||||
<data>
|
||||
<prebuild></prebuild>
|
||||
<postbuild></postbuild>
|
||||
</data>
|
||||
</settings>
|
||||
<settings>
|
||||
<name>ILINK</name>
|
||||
<archiveVersion>0</archiveVersion>
|
||||
<data>
|
||||
<version>26</version>
|
||||
<version>27</version>
|
||||
<wantNonLocal>1</wantNonLocal>
|
||||
<debug>1</debug>
|
||||
<option>
|
||||
|
@ -808,7 +825,7 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>IlinkIcfFile</name>
|
||||
<state>I:\HY-2.0\HY2.0\trunk\iar9_2\4.0 LW21-01B\Hyt2\BSP\IAR\GD32F450xE.icf</state>
|
||||
<state>D:\psx\Pan-Tilt\1.software\HY\6.0 MW22-01A\BSP\IAR\GD32F450xE_APP.icf</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>IlinkIcfFileSlave</name>
|
||||
|
@ -1091,6 +1108,14 @@
|
|||
<name>IlinkWrapperFile</name>
|
||||
<state></state>
|
||||
</option>
|
||||
<option>
|
||||
<name>IlinkProcessor</name>
|
||||
<state>1</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>IlinkFpuProcessor</name>
|
||||
<state>1</state>
|
||||
</option>
|
||||
</data>
|
||||
</settings>
|
||||
<settings>
|
||||
|
@ -1114,6 +1139,11 @@
|
|||
</option>
|
||||
</data>
|
||||
</settings>
|
||||
<settings>
|
||||
<name>BUILDACTION</name>
|
||||
<archiveVersion>2</archiveVersion>
|
||||
<data />
|
||||
</settings>
|
||||
</configuration>
|
||||
<configuration>
|
||||
<name>Release</name>
|
||||
|
@ -1125,7 +1155,7 @@
|
|||
<name>General</name>
|
||||
<archiveVersion>3</archiveVersion>
|
||||
<data>
|
||||
<version>34</version>
|
||||
<version>36</version>
|
||||
<wantNonLocal>1</wantNonLocal>
|
||||
<debug>0</debug>
|
||||
<option>
|
||||
|
@ -1184,7 +1214,7 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>OGLastSavedByProductVersion</name>
|
||||
<state>9.20.1.43525</state>
|
||||
<state>9.40.2.67586</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>OGChipSelectEditMenu</name>
|
||||
|
@ -1212,7 +1242,7 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>GBECoreSlave</name>
|
||||
<version>31</version>
|
||||
<version>33</version>
|
||||
<state>39</state>
|
||||
</option>
|
||||
<option>
|
||||
|
@ -1229,7 +1259,7 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>CoreVariant</name>
|
||||
<version>31</version>
|
||||
<version>33</version>
|
||||
<state>39</state>
|
||||
</option>
|
||||
<option>
|
||||
|
@ -1252,7 +1282,7 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>GFPUCoreSlave2</name>
|
||||
<version>31</version>
|
||||
<version>33</version>
|
||||
<state>39</state>
|
||||
</option>
|
||||
<option>
|
||||
|
@ -1317,13 +1347,26 @@
|
|||
<name>BuildFilesPath</name>
|
||||
<state>Release</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>PointerAuthentication</name>
|
||||
<state>0</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>FPU64</name>
|
||||
<state>1</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>OG_32_64DeviceCoreSlave</name>
|
||||
<version>33</version>
|
||||
<state>39</state>
|
||||
</option>
|
||||
</data>
|
||||
</settings>
|
||||
<settings>
|
||||
<name>ICCARM</name>
|
||||
<archiveVersion>2</archiveVersion>
|
||||
<data>
|
||||
<version>37</version>
|
||||
<version>38</version>
|
||||
<wantNonLocal>1</wantNonLocal>
|
||||
<debug>0</debug>
|
||||
<option>
|
||||
|
@ -1610,13 +1653,21 @@
|
|||
<name>CCStackProtection</name>
|
||||
<state>0</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>CCPointerAutentiction</name>
|
||||
<state>0</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>CCBranchTargetIdentification</name>
|
||||
<state>0</state>
|
||||
</option>
|
||||
</data>
|
||||
</settings>
|
||||
<settings>
|
||||
<name>AARM</name>
|
||||
<archiveVersion>2</archiveVersion>
|
||||
<data>
|
||||
<version>11</version>
|
||||
<version>12</version>
|
||||
<wantNonLocal>1</wantNonLocal>
|
||||
<debug>0</debug>
|
||||
<option>
|
||||
|
@ -1776,6 +1827,10 @@
|
|||
<name>PreInclude</name>
|
||||
<state></state>
|
||||
</option>
|
||||
<option>
|
||||
<name>A_32_64Device</name>
|
||||
<state>1</state>
|
||||
</option>
|
||||
</data>
|
||||
</settings>
|
||||
<settings>
|
||||
|
@ -1818,19 +1873,11 @@
|
|||
<buildSequence>inputOutputBased</buildSequence>
|
||||
</data>
|
||||
</settings>
|
||||
<settings>
|
||||
<name>BUILDACTION</name>
|
||||
<archiveVersion>1</archiveVersion>
|
||||
<data>
|
||||
<prebuild></prebuild>
|
||||
<postbuild></postbuild>
|
||||
</data>
|
||||
</settings>
|
||||
<settings>
|
||||
<name>ILINK</name>
|
||||
<archiveVersion>0</archiveVersion>
|
||||
<data>
|
||||
<version>26</version>
|
||||
<version>27</version>
|
||||
<wantNonLocal>1</wantNonLocal>
|
||||
<debug>0</debug>
|
||||
<option>
|
||||
|
@ -2190,6 +2237,14 @@
|
|||
<name>IlinkWrapperFile</name>
|
||||
<state></state>
|
||||
</option>
|
||||
<option>
|
||||
<name>IlinkProcessor</name>
|
||||
<state>1</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>IlinkFpuProcessor</name>
|
||||
<state>1</state>
|
||||
</option>
|
||||
</data>
|
||||
</settings>
|
||||
<settings>
|
||||
|
@ -2213,6 +2268,11 @@
|
|||
</option>
|
||||
</data>
|
||||
</settings>
|
||||
<settings>
|
||||
<name>BUILDACTION</name>
|
||||
<archiveVersion>2</archiveVersion>
|
||||
<data />
|
||||
</settings>
|
||||
</configuration>
|
||||
<group>
|
||||
<name>APP</name>
|
||||
|
@ -2375,7 +2435,7 @@
|
|||
<settings>
|
||||
<name>ICCARM</name>
|
||||
<data>
|
||||
<version>37</version>
|
||||
<version>38</version>
|
||||
<wantNonLocal>0</wantNonLocal>
|
||||
<debug>1</debug>
|
||||
<option>
|
||||
|
@ -2669,6 +2729,14 @@
|
|||
<name>CCStackProtection</name>
|
||||
<state>0</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>CCPointerAutentiction</name>
|
||||
<state>0</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>CCBranchTargetIdentification</name>
|
||||
<state>0</state>
|
||||
</option>
|
||||
</data>
|
||||
</settings>
|
||||
</configuration>
|
||||
|
@ -2900,7 +2968,7 @@
|
|||
<settings>
|
||||
<name>ICCARM</name>
|
||||
<data>
|
||||
<version>37</version>
|
||||
<version>38</version>
|
||||
<wantNonLocal>0</wantNonLocal>
|
||||
<debug>1</debug>
|
||||
<option>
|
||||
|
@ -3192,6 +3260,14 @@
|
|||
<name>CCStackProtection</name>
|
||||
<state>0</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>CCPointerAutentiction</name>
|
||||
<state>0</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>CCBranchTargetIdentification</name>
|
||||
<state>0</state>
|
||||
</option>
|
||||
</data>
|
||||
</settings>
|
||||
</configuration>
|
||||
|
|
4150
PROJECT/OS2.ewt
4150
PROJECT/OS2.ewt
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue