Skip to content

Z
Z3dev-AllToOneFanPanel
Commit 1de4b7b1 authored by limm's avatar limm
Browse files
Options

1，调整单板产测，接近感应触发后全亮，整机产测，接近感应触发正常显示 

Signed-off-by: limm's avatarli.mengmeng@ikonke.com <li.mengmeng@ikonke.com>
parent ee6712da
Hide whitespace changes
Inline Side-by-side
Showing with 151 additions and 251 deletions
Code/海顿-多合一新风面板/APP/AllToOneThernmostatPannel.uvgui.11730
View file @ 1de4b7b1
......@@ -11,17 +11,17 @@
<View>
<WinId>38003</WinId>
<ViewName>Registers</ViewName>
<TableColWidths>115 179</TableColWidths>
<TableColWidths>115 321</TableColWidths>
</View>
<View>
<WinId>346</WinId>
<ViewName>Code Coverage</ViewName>
<TableColWidths>670 932</TableColWidths>
<TableColWidths>1090 160</TableColWidths>
</View>
<View>
<WinId>204</WinId>
<ViewName>Performance Analyzer</ViewName>
<TableColWidths>1272 115 115 100</TableColWidths>
<TableColWidths>1250</TableColWidths>
</View>
</SECTreeCtrl>
......@@ -36,19 +36,19 @@
<WinId>1936</WinId>
<ViewName>Watch 1</ViewName>
<UserString></UserString>
<TableColWidths>373 404 184</TableColWidths>
<TableColWidths>53 53 53</TableColWidths>
</View>
<View>
<WinId>1937</WinId>
<ViewName>Watch 2</ViewName>
<UserString></UserString>
<TableColWidths>241 324 134</TableColWidths>
<TableColWidths>53 53 53</TableColWidths>
</View>
<View>
<WinId>1935</WinId>
<ViewName>Call Stack + Locals</ViewName>
<UserString></UserString>
<TableColWidths>219 144 53</TableColWidths>
<TableColWidths>53 53 53</TableColWidths>
</View>
<View>
<WinId>2506</WinId>
......@@ -77,25 +77,25 @@
<flags>2</flags>
<showCmd>3</showCmd>
<MinPosition>
<xPos>-32000</xPos>
<yPos>-32000</yPos>
<xPos>-1</xPos>
<yPos>-1</yPos>
</MinPosition>
<MaxPosition>
<xPos>-1</xPos>
<yPos>-1</yPos>
</MaxPosition>
<NormalPosition>
<Top>62</Top>
<Left>-1616</Left>
<Right>-327</Right>
<Bottom>751</Bottom>
<Top>0</Top>
<Left>0</Left>
<Right>1289</Right>
<Bottom>689</Bottom>
</NormalPosition>
</WindowPosition>
<MDIClientArea>
<RegID>0</RegID>
<MDITabState>
<Len>3940</Len>
<Data>01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000013000000010000000100000095443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFFA6443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C7372635C636F6E74726F6C5F636F6D6D2E63000000000E636F6E74726F6C5F636F6D6D2E6300000000FFDC7800FFFFFFFF9D443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C7372635C4B65792E6300000000054B65792E6300000000BECEA100FFFFFFFFB4443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C7372635C4343323533305F7472616E73706172656E745F616E616C797A652E63000000001C4343323533305F7472616E73706172656E745F616E616C797A652E6300000000F0A0A100FFFFFFFFA7443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C7372635C68617264776172655F696E69742E63000000000F68617264776172655F696E69742E6300000000BCA8E100FFFFFFFFA6443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4C6962726172795C5374644472697665725C696E635C7379732E6800000000057379732E68000000009CC1B600FFFFFFFFAB443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4C6962726172795C5374644472697665725C7372635C72657461726765742E63000000000A72657461726765742E6300000000F7B88600FFFFFFFFA8443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C7372635C646973706C61795F636F6D6D6F6E2E630000000010646973706C61795F636F6D6D6F6E2E6300000000D9ADC200FFFFFFFFA7443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4C6962726172795C5374644472697665725C7372635C756172742E630000000006756172742E6300000000A5C2D700FFFFFFFFD0443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4C6962726172795C4465766963655C4E75766F746F6E5C4D696E6935385365726965735C536F757263655C41524D5C737461727475705F4D696E6935385365726965732E730000000016737461727475705F4D696E6935385365726965732E7300000000B3A6BE00FFFFFFFF9D443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C696E635C4B65792E6800000000054B65792E6800000000EAD6A300FFFFFFFFA8443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C696E635C646973706C61795F636F6D6D6F6E2E680000000010646973706C61795F636F6D6D6F6E2E6800000000F6FA7D00FFFFFFFFA6443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C696E635C636F6E74726F6C5F636F6D6D2E68000000000E636F6E74726F6C5F636F6D6D2E6800000000B5E99D00FFFFFFFFA2443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C7372635C424C3535303732412E63000000000A424C3535303732412E63000000005FC3CF00FFFFFFFFA2443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C696E635C424C3535303732412E68000000000A424C3535303732412E6800000000C1838300FFFFFFFF9F443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C7372635C53485443332E63000000000753485443332E6300000000CACAD500FFFFFFFF9F443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C696E635C53485443332E68000000000753485443332E6800000000C5D4F200FFFFFFFFAB443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C7372635C6932635F736F6674776172655F6770696F2E6300000000136932635F736F6674776172655F6770696F2E6300000000FFDC7800FFFFFFFFB4443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C696E635C4343323533305F7472616E73706172656E745F616E616C797A652E68000000001C4343323533305F7472616E73706172656E745F616E616C797A652E6800000000BECEA100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD50001000000000000000200000042FAFFFFC1FFFFFF0000000074020000</Data>
<Len>2781</Len>
<Data>01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000013000000010000000100000058453A5CB9A4B3CCCFEEC4BF5C416C6C546F4F6E655F46616E50616E656C5C5A336465762D416C6C546F4F6E6546616E50616E656C5C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C6D61696E2E6300000000066D61696E2E6300000000FFDC7800FFFFFFFF69453A5CB9A4B3CCCFEEC4BF5C416C6C546F4F6E655F46616E50616E656C5C5A336465762D416C6C546F4F6E6546616E50616E656C5C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C7372635C636F6E74726F6C5F636F6D6D2E63000000000E636F6E74726F6C5F636F6D6D2E6300000000BECEA100FFFFFFFF60453A5CB9A4B3CCCFEEC4BF5C416C6C546F4F6E655F46616E50616E656C5C5A336465762D416C6C546F4F6E6546616E50616E656C5C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C7372635C4B65792E6300000000054B65792E6300000000F0A0A100FFFFFFFF77453A5CB9A4B3CCCFEEC4BF5C416C6C546F4F6E655F46616E50616E656C5C5A336465762D416C6C546F4F6E6546616E50616E656C5C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C7372635C4343323533305F7472616E73706172656E745F616E616C797A652E63000000001C4343323533305F7472616E73706172656E745F616E616C797A652E6300000000BCA8E100FFFFFFFF6A453A5CB9A4B3CCCFEEC4BF5C416C6C546F4F6E655F46616E50616E656C5C5A336465762D416C6C546F4F6E6546616E50616E656C5C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C7372635C68617264776172655F696E69742E63000000000F68617264776172655F696E69742E63000000009CC1B600FFFFFFFF69453A5CB9A4B3CCCFEEC4BF5C416C6C546F4F6E655F46616E50616E656C5C5A336465762D416C6C546F4F6E6546616E50616E656C5C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4C6962726172795C5374644472697665725C696E635C7379732E6800000000057379732E6800000000F7B88600FFFFFFFF6E453A5CB9A4B3CCCFEEC4BF5C416C6C546F4F6E655F46616E50616E656C5C5A336465762D416C6C546F4F6E6546616E50616E656C5C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4C6962726172795C5374644472697665725C7372635C72657461726765742E63000000000A72657461726765742E6300000000D9ADC200FFFFFFFF6B453A5CB9A4B3CCCFEEC4BF5C416C6C546F4F6E655F46616E50616E656C5C5A336465762D416C6C546F4F6E6546616E50616E656C5C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C7372635C646973706C61795F636F6D6D6F6E2E630000000010646973706C61795F636F6D6D6F6E2E6300000000A5C2D700FFFFFFFF6A453A5CB9A4B3CCCFEEC4BF5C416C6C546F4F6E655F46616E50616E656C5C5A336465762D416C6C546F4F6E6546616E50616E656C5C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4C6962726172795C5374644472697665725C7372635C756172742E630000000006756172742E6300000000B3A6BE00FFFFFFFF93453A5CB9A4B3CCCFEEC4BF5C416C6C546F4F6E655F46616E50616E656C5C5A336465762D416C6C546F4F6E6546616E50616E656C5C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4C6962726172795C4465766963655C4E75766F746F6E5C4D696E6935385365726965735C536F757263655C41524D5C737461727475705F4D696E6935385365726965732E730000000016737461727475705F4D696E6935385365726965732E7300000000EAD6A300FFFFFFFF60453A5CB9A4B3CCCFEEC4BF5C416C6C546F4F6E655F46616E50616E656C5C5A336465762D416C6C546F4F6E6546616E50616E656C5C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C696E635C4B65792E6800000000054B65792E6800000000F6FA7D00FFFFFFFF6B453A5CB9A4B3CCCFEEC4BF5C416C6C546F4F6E655F46616E50616E656C5C5A336465762D416C6C546F4F6E6546616E50616E656C5C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C696E635C646973706C61795F636F6D6D6F6E2E680000000010646973706C61795F636F6D6D6F6E2E6800000000B5E99D00FFFFFFFF69453A5CB9A4B3CCCFEEC4BF5C416C6C546F4F6E655F46616E50616E656C5C5A336465762D416C6C546F4F6E6546616E50616E656C5C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C696E635C636F6E74726F6C5F636F6D6D2E68000000000E636F6E74726F6C5F636F6D6D2E68000000005FC3CF00FFFFFFFF65453A5CB9A4B3CCCFEEC4BF5C416C6C546F4F6E655F46616E50616E656C5C5A336465762D416C6C546F4F6E6546616E50616E656C5C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C7372635C424C3535303732412E63000000000A424C3535303732412E6300000000C1838300FFFFFFFF65453A5CB9A4B3CCCFEEC4BF5C416C6C546F4F6E655F46616E50616E656C5C5A336465762D416C6C546F4F6E6546616E50616E656C5C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C696E635C424C3535303732412E68000000000A424C3535303732412E6800000000CACAD500FFFFFFFF62453A5CB9A4B3CCCFEEC4BF5C416C6C546F4F6E655F46616E50616E656C5C5A336465762D416C6C546F4F6E6546616E50616E656C5C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C7372635C53485443332E63000000000753485443332E6300000000C5D4F200FFFFFFFF62453A5CB9A4B3CCCFEEC4BF5C416C6C546F4F6E655F46616E50616E656C5C5A336465762D416C6C546F4F6E6546616E50616E656C5C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C696E635C53485443332E68000000000753485443332E6800000000FFDC7800FFFFFFFF6E453A5CB9A4B3CCCFEEC4BF5C416C6C546F4F6E655F46616E50616E656C5C5A336465762D416C6C546F4F6E6546616E50616E656C5C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C7372635C6932635F736F6674776172655F6770696F2E6300000000136932635F736F6674776172655F6770696F2E6300000000BECEA100FFFFFFFF77453A5CB9A4B3CCCFEEC4BF5C416C6C546F4F6E655F46616E50616E656C5C5A336465762D416C6C546F4F6E6546616E50616E656C5C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C696E635C4343323533305F7472616E73706172656E745F616E616C797A652E68000000001C4343323533305F7472616E73706172656E745F616E616C797A652E6800000000F0A0A100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F80000004A0000000005000013020000</Data>
</MDITabState>
</MDIClientArea>
<ViewEx>
......@@ -118,7 +118,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
<Data>24F9FFFFDDFFFFFF10FEFFFF6C000000</Data>
<Data>A40000006600000090050000F5000000</Data>
</RectRecentFloat>
</Window>
<Window>
......@@ -134,7 +134,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
<Data>030000004A000000BB010000CD020000</Data>
<Data>030000004A000000F1000000E3010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
......@@ -154,7 +154,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
<Data>030000004A000000BB010000CD020000</Data>
<Data>030000004A000000F1000000E3010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
......@@ -434,7 +434,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
<Data>030000004A000000BB010000CD020000</Data>
<Data>030000004A000000F1000000E3010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
......@@ -454,7 +454,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
<Data>030000004A000000BB010000CD020000</Data>
<Data>030000004A000000F1000000E3010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
......@@ -474,7 +474,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
<Data>03000000010300007D070000D7030000</Data>
<Data>0300000017020000FD0400006E020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
......@@ -514,7 +514,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
<Data>03000000010300007D070000D7030000</Data>
<Data>0300000017020000FD0400006E020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
......@@ -1134,7 +1134,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
<Data>03000000010300007D070000D7030000</Data>
<Data>0300000017020000FD0400006E020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
......@@ -1154,7 +1154,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
<Data>03000000010300007D070000D7030000</Data>
<Data>03000000170200007D070000ED020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
......@@ -1614,7 +1614,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
<Data>DA01000000000000910500001C000000</Data>
<Data>DA01000000000000000500001C000000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
......@@ -1634,7 +1634,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
<Data>00000000F00300008007000003040000</Data>
<Data>0000000087020000000500009A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
......@@ -1683,14 +1683,14 @@
</Window>
<DockMan>
<Len>3119</Len>
<Data>000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFA4000000DE00000090050000E2000000000000000100000004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E65002000000000000024F9FFFFDDFFFFFF10FEFFFF6C000000A40000004F00000090050000DE0000000000000040280046060000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFEC0400004F000000F004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C300000180004000000000000070FDFFFFDDFFFFFF10FEFFFFB7010000F00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFBE01000033000000C2010000E60200000100000002000010040000000100000062FFFFFFD7060000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000080F8FFFFC1FFFFFF3EFAFFFF740200000000000033000000BE010000E60200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000015020000900500001902000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0E0000008F070000930700009407000095070000960700009007000091070000B5010000B8010000B9050000BA050000BB050000BC050000CB0900000180008000000000000080F8FFFFA701000010FEFFFF4A020000000000001902000090050000BC02000000000000404100460E0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BC02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000E602000080070000EA02000001000000010000100400000001000000E1FDFFFF93010000FFFFFFFF04000000C5000000C7000000B4010000779400000180008000000100000080F8FFFF78020000000000007E03000000000000EA02000080070000F00300000000000040820056040000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0742726F77736572010000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data>
<Data>000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFA4000000DE00000090050000E2000000000000000100000004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E650020000000000000A40000006600000090050000F5000000A40000004F00000090050000DE0000000000000040280046060000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFEC0400004F000000F004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000F0040000660000009005000040020000F00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF400000033000000F8000000FC0100000100000002000010040000000100000044FEFFFF39030000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000000000004A000000BE010000FD0200000000000033000000F4000000FC0100000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000015020000900500001902000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0E0000008F070000930700009407000095070000960700009007000091070000B5010000B8010000B9050000BA050000BB050000BC050000CB09000001800080000000000000000000003002000090050000D3020000000000001902000090050000BC02000000000000404100460E0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BC02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000FC010000000500000002000001000000010000100400000001000000BBFEFFFF04010000FFFFFFFF04000000C5000000C7000000B4010000779400000180008000000100000000000000010300008007000007040000000000000002000000050000870200000000000040820056040000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0742726F77736572010000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data>
</DockMan>
<ToolBar>
<RegID>59392</RegID>
<Name>File</Name>
<Buttons>
<Len>2442</Len>
<Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000001066696C7465725F776173685F74696D65960000000000000014001544656C61795F4F46465F52656C5F446973706C6179107265616C5F74656D70657261747572651652657365745F556172745F4465746563745F466C61670E5365745F4572726F725F436F6465164F7065726174696F6E204A6F696E204E6574776F726B18B9D8B1D5BFC9C4DCCFD4CABEB5C4C9E3D6C6B6C8D7D6B7FB0E424C3535303732415F436C6561720A7461736B5F636F6D7073096D61696E5F7461736B0F7461736B5F72657472616E736D6974127370616B655F636F6E74726F6C5F6C6F6F701373656E736F725F6D6561737572655F6C6F6F700A6167696E675F746573740D73657475705F68616E646C65721146616E5F53706565645F436F6E74726F6C1066696C7465725F776173685F74696D651973687463335F73656E736F725F6D6561737572655F6C6F6F7015446973706C61795F706F7765726F66665F74696D65056572726F720D646973706C61795F6572726F720000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020000001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000</Data>
<Len>2101</Len>
<Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000001E4F6C65645F446973706C61795F496E666F2E726563765F6C63645F6F6666960000000000000003001E4F6C65645F446973706C61795F496E666F2E726563765F6C63645F6F66661243616C69625F54656D705F436F6E74726F6C067072696E7466000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020000001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000</Data>
</Buttons>
<OriginalItems>
<Len>1423</Len>
......@@ -1722,7 +1722,7 @@
<Name>Debug</Name>
<Buttons>
<Len>2373</Len>
<Data>00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data>
<Data>00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data>
</Buttons>
<OriginalItems>
<Len>898</Len>
......@@ -3399,9 +3399,9 @@
</Doc>
<Doc>
<Name>.\User\src\control_comm.c</Name>
<ColumnNumber>1</ColumnNumber>
<TopLine>772</TopLine>
<CurrentLine>794</CurrentLine>
<ColumnNumber>13</ColumnNumber>
<TopLine>775</TopLine>
<CurrentLine>789</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
......@@ -3434,7 +3434,7 @@
<PaneID>0</PaneID>
</Doc>
<Doc>
<Name>..\Library\StdDriver\inc\sys.h</Name>
<Name>E:\工程项目\AllToOne_FanPanel\Z3dev-AllToOneFanPanel\Code\海顿-多合一新风面板\Library\StdDriver\inc\sys.h</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>88</TopLine>
<CurrentLine>105</CurrentLine>
......@@ -3445,7 +3445,7 @@
<Doc>
<Name>..\Library\StdDriver\src\retarget.c</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>1</TopLine>
<TopLine>3</TopLine>
<CurrentLine>22</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
......@@ -3453,9 +3453,9 @@
</Doc>
<Doc>
<Name>.\User\src\display_common.c</Name>
<ColumnNumber>49</ColumnNumber>
<TopLine>2169</TopLine>
<CurrentLine>18</CurrentLine>
<ColumnNumber>2</ColumnNumber>
<TopLine>18</TopLine>
<CurrentLine>19</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
......@@ -3479,7 +3479,7 @@
<PaneID>0</PaneID>
</Doc>
<Doc>
<Name>.\User\inc\Key.h</Name>
<Name>E:\工程项目\AllToOne_FanPanel\Z3dev-AllToOneFanPanel\Code\海顿-多合一新风面板\APP\User\inc\Key.h</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>183</TopLine>
<CurrentLine>199</CurrentLine>
......@@ -3488,18 +3488,18 @@
<PaneID>0</PaneID>
</Doc>
<Doc>
<Name>.\User\inc\display_common.h</Name>
<Name>E:\工程项目\AllToOne_FanPanel\Z3dev-AllToOneFanPanel\Code\海顿-多合一新风面板\APP\User\inc\display_common.h</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>49</TopLine>
<TopLine>160</TopLine>
<CurrentLine>180</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
</Doc>
<Doc>
<Name>.\User\inc\control_comm.h</Name>
<Name>E:\工程项目\AllToOne_FanPanel\Z3dev-AllToOneFanPanel\Code\海顿-多合一新风面板\APP\User\inc\control_comm.h</Name>
<ColumnNumber>20</ColumnNumber>
<TopLine>32</TopLine>
<TopLine>35</TopLine>
<CurrentLine>54</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
......@@ -3515,9 +3515,9 @@
<PaneID>0</PaneID>
</Doc>
<Doc>
<Name>.\User\inc\BL55072A.h</Name>
<Name>E:\工程项目\AllToOne_FanPanel\Z3dev-AllToOneFanPanel\Code\海顿-多合一新风面板\APP\User\inc\BL55072A.h</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>87</TopLine>
<TopLine>100</TopLine>
<CurrentLine>119</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
......@@ -3533,9 +3533,9 @@
<PaneID>0</PaneID>
</Doc>
<Doc>
<Name>.\User\inc\SHTC3.h</Name>
<Name>E:\工程项目\AllToOne_FanPanel\Z3dev-AllToOneFanPanel\Code\海顿-多合一新风面板\APP\User\inc\SHTC3.h</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>1</TopLine>
<TopLine>3</TopLine>
<CurrentLine>22</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
......@@ -3551,7 +3551,7 @@
<PaneID>0</PaneID>
</Doc>
<Doc>
<Name>.\User\inc\CC2530_transparent_analyze.h</Name>
<Name>E:\工程项目\AllToOne_FanPanel\Z3dev-AllToOneFanPanel\Code\海顿-多合一新风面板\APP\User\inc\CC2530_transparent_analyze.h</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>114</TopLine>
<CurrentLine>131</CurrentLine>
......
Code/海顿-多合一新风面板/APP/AllToOneThernmostatPannel.uvopt
View file @ 1de4b7b1
......@@ -519,7 +519,7 @@
<Group>
<GroupName>User</GroupName>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
......
Code/海顿-多合一新风面板/APP/User/src/Key.c
View file @ 1de4b7b1
......@@ -308,8 +308,6 @@ u8 KeyScanState( KeyScan_t* Buttion_T, u8 ButtonState )
Buttion_T->PreKeyEvent = ButtonLongEvent;
EventReturn = ButtonLongEvent;//InputKeyEvent( Key_Button, ModeButtonLongEvent );
}
printf("EventReturn = 0x%x\n",EventReturn);
}
///**** 按键计时，用于消除抖动和判断长/短按事件 *****/
......@@ -330,15 +328,9 @@ u8 KeyScanState( KeyScan_t* Buttion_T, u8 ButtonState )
}
}
///**** 状态更新 *****/
if( Buttion_T->LastState != Buttion_T->PreState ) Buttion_T->PreState = Buttion_T->LastState;
//DBG_PRINT("Buttion_T->LastState = 0x%x\n",Buttion_T->LastState);
//DBG_PRINT("Buttion_T->PreState = 0x%x\n",Buttion_T->PreState);
//DBG_PRINT("Buttion_T->KeyTime = 0x%x\n",Buttion_T->KeyTime);
//if( EventReturn ) printf("EventReturn = 0x%x\t\n",EventReturn);
return EventReturn;
}
......@@ -385,7 +377,7 @@ static void LED_BEEP_Feedback(u8 key_id)
}
void KeyProcess_Handler_Callbacks(u8 key_id,u8 KeyPressEvent)
{
printf("####KeyProcess_Handler_Callbacks,keyid = %d,Key_Event = %x\r\n",key_id,KeyPressEvent);
//printf("####KeyProcess_Handler_Callbacks,keyid = %d,Key_Event = %x\r\n",key_id,KeyPressEvent);
if(Key_Operate_Config_Operation(key_id,KeyPressEvent))
{
LED_BEEP_Feedback(key_id);
......@@ -595,6 +587,25 @@ void Delay_OFF_Rel_Display(u8 stop_flash,u8 delay_timer,u8 dispaly_data,u8 H_cha
LCDShowTemp_state_t.LCD_state = OFF;
LcdShowCTR(LCDShowTemp_state_t);
}
void Calib_Temp_Control(u8 control_type,u16 flashing_time_ms,u16 flash_interval_time_ms,u16 show_num)
{
LCDShowTemp_state_t.LCD_place = CALIBRATE_TEMPER_DISPLAY;
if(control_type == FLASHING)
{
LCDShowTemp_state_t.LCD_state = FLASHING;
LCDShowTemp_state_t.LCD_display_count = flashing_time_ms/flash_interval_time_ms; //15s
LCDShowTemp_state_t.LCD_display_timer = flash_interval_time_ms/10;
}
else
{
LCDShowTemp_state_t.LCD_state = control_type;
LCDShowTemp_state_t.LCD_display_count = 0;
LCDShowTemp_state_t.LCD_display_timer = 0;
}
LCDShowTemp_state_t.LCD_code_data = show_num;
LcdShowCTR(LCDShowTemp_state_t);
}
void Control_OnOff_handler(u8 device_type,u8 onoff)
{
switch(device_type)
......@@ -649,7 +660,6 @@ void Control_OnOff_handler(u8 device_type,u8 onoff)
{
Oled_Display_whole();
Oled_Display_Info.FAN_Device.on_off = 1;
Fan_Speed_Control(Oled_Display_Info.FAN_Device.wind_speed);
#if DEVICE_TYPE_FAN
Fan_PassbyONOFF_By_Mode_Trans(Oled_Display_Info.FAN_Device.system_type,1);
Fan_Speed_Control(Oled_Display_Info.FAN_Device.wind_speed);
......@@ -717,13 +727,8 @@ static void KEY1_Botton_Process_Handler(u8 KeyPressEvent)
operate_calibrate_temper_delay_2s_off_Task_Start();
delay_operate_calibrate_temper_Task_Stop(); //15s 计时取消
LCDShowTemp_state_t.LCD_place = CALIBRATE_TEMPER_DISPLAY;
LCDShowTemp_state_t.LCD_state = ON;
display_data = Oled_Display_Info.Air_Device.real_temperature - Oled_Display_Info.Air_Device.correct_temperature + sKey_Operation[0].operate_calibrate_temp;
LCDShowTemp_state_t.LCD_code_data =display_data;
LcdShowCTR(LCDShowTemp_state_t);
Calib_Temp_Control(ON,0,0,display_data);
Oled_Display_Info.Air_Device.real_temperature = Oled_Display_Info.Air_Device.real_temperature - Oled_Display_Info.Air_Device.correct_temperature + sKey_Operation[0].operate_calibrate_temp;
Oled_Display_Info.Air_Device.correct_temperature = sKey_Operation[0].operate_calibrate_temp;
......@@ -775,12 +780,8 @@ static void KEY1_Botton_Process_Handler(u8 KeyPressEvent)
operate_calibrate_temper_delay_2s_off_Task_Start(); //2s计时开启
delay_operate_calibrate_temper_Task_Stop(); //15s 计时取消
LCDShowTemp_state_t.LCD_place = CALIBRATE_TEMPER_DISPLAY;
LCDShowTemp_state_t.LCD_state = ON;
display_data = Oled_Display_Info.FLOOR_Device.real_temperature - Oled_Display_Info.FLOOR_Device.correct_temperature + sKey_Operation[1].operate_calibrate_temp;
LCDShowTemp_state_t.LCD_code_data = display_data;
LcdShowCTR(LCDShowTemp_state_t);
Calib_Temp_Control(ON,0,0,display_data);
Oled_Display_Info.FLOOR_Device.real_temperature = Oled_Display_Info.FLOOR_Device.real_temperature - Oled_Display_Info.FLOOR_Device.correct_temperature + sKey_Operation[1].operate_calibrate_temp;
Oled_Display_Info.FLOOR_Device.correct_temperature = sKey_Operation[1].operate_calibrate_temp;
......@@ -832,11 +833,8 @@ static void KEY1_Botton_Process_Handler(u8 KeyPressEvent)
delay_operate_calibrate_temper_Task_Stop(); //15s 计时取消
LCDShowTemp_state_t.LCD_place = CALIBRATE_TEMPER_DISPLAY;
LCDShowTemp_state_t.LCD_state = ON;
display_data = Oled_Display_Info.FAN_Device.real_temperature - Oled_Display_Info.FAN_Device.correct_temperature + sKey_Operation[2].operate_calibrate_temp;
LCDShowTemp_state_t.LCD_code_data = display_data;
LcdShowCTR(LCDShowTemp_state_t);
Calib_Temp_Control(ON,0,0,display_data);
Oled_Display_Info.FAN_Device.real_temperature = Oled_Display_Info.FAN_Device.real_temperature - Oled_Display_Info.FAN_Device.correct_temperature + sKey_Operation[2].operate_calibrate_temp;
Oled_Display_Info.FAN_Device.correct_temperature = sKey_Operation[2].operate_calibrate_temp;
......@@ -943,8 +941,9 @@ static void KEY2_Botton_Process_Handler(u8 KeyPressEvent)
显示当前风速
*********************************************/
display_set_temp(1,Oled_Display_Info.FAN_Device.wind_speed,1);
#if DEVICE_TYPE_FAN
Fan_Speed_Control(Oled_Display_Info.FAN_Device.wind_speed);
#endif
state_change_report(OPCODE_GENERAL_REPORT_STATUS,3); //状态改变通知
}
}
......@@ -975,7 +974,7 @@ static void KEY3_Botton_Process_Handler(u8 KeyPressEvent)
if(Oled_Display_Info.Air_Device.on_off == 0) //开机模式才能操作
return;
system_mode_temp = System_Mode_Trans(AIR_CONDITION,0);
Oled_Display_Info.Air_Device.system_type = system_mode_temp;
}
else if(Oled_Display_Info.screen_page == FLOOR_HEATING)
{
......@@ -999,9 +998,9 @@ static void KEY3_Botton_Process_Handler(u8 KeyPressEvent)
system_mode_temp = System_Mode_Trans(FAN,0);
Oled_Display_Info.FAN_Device.system_type = system_mode_temp;
#if DEVICE_TYPE_FAN
Fan_PassbyONOFF_By_Mode_Trans(system_mode_temp,1);
#endif
state_change_report(OPCODE_GENERAL_REPORT_STATUS,3); //状态改变通知
}
}
......@@ -1016,16 +1015,9 @@ static void KEY3_Botton_Process_Handler(u8 KeyPressEvent)
delay_operate_calibrate_temper_Task_Start();
sKey_Operation[0].operate_calibrate_temper = 1;
LCDShowTemp_state_t.LCD_place = CALIBRATE_TEMPER_DISPLAY;
LCDShowTemp_state_t.LCD_state = FLASHING;
LCDShowTemp_state_t.LCD_display_count = 15*1000/800; //15s
LCDShowTemp_state_t.LCD_display_timer = 800/10;
sKey_Operation[0].operate_calibrate_temp = Oled_Display_Info.Air_Device.correct_temperature;
display_data = Oled_Display_Info.Air_Device.real_temperature;
LCDShowTemp_state_t.LCD_code_data = display_data;
LcdShowCTR(LCDShowTemp_state_t);
//printf("operate calibrate,real temper =%d,%d,%d\r\n",Oled_Display_Info.Air_Device.real_temperature,Oled_Display_Info.Air_Device.correct_temperature,LCDShowTemp_state_t.LCD_code_data);
Calib_Temp_Control(FLASHING,15*1000,800,display_data);
return;
}
......@@ -1047,16 +1039,9 @@ static void KEY3_Botton_Process_Handler(u8 KeyPressEvent)
delay_operate_calibrate_temper_Task_Start();
sKey_Operation[1].operate_calibrate_temper = 1;
LCDShowTemp_state_t.LCD_place = CALIBRATE_TEMPER_DISPLAY;
LCDShowTemp_state_t.LCD_state = FLASHING;
LCDShowTemp_state_t.LCD_display_count = 15*1000/800; //15s
LCDShowTemp_state_t.LCD_display_timer = 800/10;
sKey_Operation[1].operate_calibrate_temp = Oled_Display_Info.FLOOR_Device.correct_temperature;
display_data = Oled_Display_Info.FLOOR_Device.real_temperature;
LCDShowTemp_state_t.LCD_code_data = display_data;
LcdShowCTR(LCDShowTemp_state_t);
//printf("operate calibrate,real temper =%d,%d\r\n",Oled_Display_Info.FLOOR_Device.real_temperature,Oled_Display_Info.FLOOR_Device.correct_temperature);
Calib_Temp_Control(FLASHING,15*1000,800,display_data);
return;
}
......@@ -1078,16 +1063,9 @@ static void KEY3_Botton_Process_Handler(u8 KeyPressEvent)
delay_operate_calibrate_temper_Task_Start();
sKey_Operation[2].operate_calibrate_temper = 1;
LCDShowTemp_state_t.LCD_place = CALIBRATE_TEMPER_DISPLAY;
LCDShowTemp_state_t.LCD_state = FLASHING;
LCDShowTemp_state_t.LCD_display_count = 15*1000/800; //15s
LCDShowTemp_state_t.LCD_display_timer = 800/10;
sKey_Operation[2].operate_calibrate_temp = Oled_Display_Info.FAN_Device.correct_temperature;
display_data = Oled_Display_Info.FAN_Device.real_temperature;
LCDShowTemp_state_t.LCD_code_data = display_data;
LcdShowCTR(LCDShowTemp_state_t);
//printf("operate calibrate,real temper =%d,%d\r\n",Oled_Display_Info.FAN_Device.real_temperature,Oled_Display_Info.FAN_Device.correct_temperature);
Calib_Temp_Control(FLASHING,15*1000,800,display_data);
return;
}
......@@ -1165,17 +1143,9 @@ static void KEY5_Botton_Process_Handler(u8 KeyPressEvent)
if(sKey_Operation[0].operate_calibrate_temp< 90)
sKey_Operation[0].operate_calibrate_temp +=5;
LCDShowTemp_state_t.LCD_place = CALIBRATE_TEMPER_DISPLAY;
LCDShowTemp_state_t.LCD_state = ON;
LcdShowCTR(LCDShowTemp_state_t);
LCDShowTemp_state_t.LCD_state = FLASHING;
LCDShowTemp_state_t.LCD_display_count = 15*1000/800; //15s
LCDShowTemp_state_t.LCD_display_timer = 800/10;
display_data = Oled_Display_Info.Air_Device.real_temperature -Oled_Display_Info.Air_Device.correct_temperature + sKey_Operation[0].operate_calibrate_temp;
LCDShowTemp_state_t.LCD_code_data = display_data;
LcdShowCTR(LCDShowTemp_state_t);
Calib_Temp_Control(ON,0,0,display_data);
Calib_Temp_Control(FLASHING,15*1000,800,display_data);
}
break;
}
......@@ -1253,13 +1223,11 @@ static void KEY5_Botton_Process_Handler(u8 KeyPressEvent)
sKey_Operation[0].set_temper_temp += 5;
if(sKey_Operation[0].set_temper_temp >= 300)
sKey_Operation[0].set_temper_temp = 300;
display_set_temp(0,sKey_Operation[0].set_temper_temp,0); //显示设置温度
display_set_temp(0,sKey_Operation[0].set_temper_temp,0); //显示设置温度
if( (sKey_Operation[0].set_temper_temp /10) == (Oled_Display_Info.Air_Device.set_temperature/10)) //26.0调整到26.6度时，不管空调的反馈，直接上报
{
Oled_Display_Info.Air_Device.set_temperature = sKey_Operation[0].set_temper_temp;
state_change_report(OPCODE_GENERAL_REPORT_STATUS,1); //状态改变通知
}
Oled_Display_Info.Air_Device.set_temperature = sKey_Operation[0].set_temper_temp;
}
}
else if(Oled_Display_Info.screen_page == FLOOR_HEATING)
......@@ -1272,18 +1240,10 @@ static void KEY5_Botton_Process_Handler(u8 KeyPressEvent)
delay_operate_calibrate_temper_Task_Start();
if(sKey_Operation[1].operate_calibrate_temp< 90)
sKey_Operation[1].operate_calibrate_temp +=5;
LCDShowTemp_state_t.LCD_place = CALIBRATE_TEMPER_DISPLAY;
LCDShowTemp_state_t.LCD_state = ON;
LcdShowCTR(LCDShowTemp_state_t);
LCDShowTemp_state_t.LCD_state = FLASHING;
LCDShowTemp_state_t.LCD_display_count = 15*1000/800; //15s
LCDShowTemp_state_t.LCD_display_timer = 800/10;
display_data = Oled_Display_Info.FLOOR_Device.real_temperature-Oled_Display_Info.FLOOR_Device.correct_temperature + sKey_Operation[1].operate_calibrate_temp;
LCDShowTemp_state_t.LCD_code_data = display_data;
LcdShowCTR(LCDShowTemp_state_t);
Calib_Temp_Control(ON,0,0,display_data);
Calib_Temp_Control(FLASHING,15*1000,800,display_data);
}
break;
}
......@@ -1333,18 +1293,10 @@ static void KEY5_Botton_Process_Handler(u8 KeyPressEvent)
delay_operate_calibrate_temper_Task_Start();
if(sKey_Operation[2].operate_calibrate_temp< 90)
sKey_Operation[2].operate_calibrate_temp +=5;
LCDShowTemp_state_t.LCD_place = CALIBRATE_TEMPER_DISPLAY;
LCDShowTemp_state_t.LCD_state = ON;
LcdShowCTR(LCDShowTemp_state_t);
LCDShowTemp_state_t.LCD_state = FLASHING;
LCDShowTemp_state_t.LCD_display_count = 15*1000/800; //15s
LCDShowTemp_state_t.LCD_display_timer = 800/10;
display_data = Oled_Display_Info.FAN_Device.real_temperature- Oled_Display_Info.FAN_Device.correct_temperature + sKey_Operation[2].operate_calibrate_temp;
LCDShowTemp_state_t.LCD_code_data = display_data;
LcdShowCTR(LCDShowTemp_state_t);
Calib_Temp_Control(ON,0,0,display_data);
Calib_Temp_Control(FLASHING,15*1000,800,display_data);
}
break;
}
......@@ -1406,19 +1358,9 @@ static void KEY6_Botton_Process_Handler(u8 KeyPressEvent)
if(sKey_Operation[0].operate_calibrate_temp> -90)
sKey_Operation[0].operate_calibrate_temp -=5;
LCDShowTemp_state_t.LCD_place = CALIBRATE_TEMPER_DISPLAY;
LCDShowTemp_state_t.LCD_state = ON;
LcdShowCTR(LCDShowTemp_state_t);
LCDShowTemp_state_t.LCD_state = FLASHING;
LCDShowTemp_state_t.LCD_display_count = 15*1000/800; //15s
LCDShowTemp_state_t.LCD_display_timer = 800/10;
display_data = Oled_Display_Info.Air_Device.real_temperature- Oled_Display_Info.Air_Device.correct_temperature + sKey_Operation[0].operate_calibrate_temp;
LCDShowTemp_state_t.LCD_code_data = display_data;
LcdShowCTR(LCDShowTemp_state_t);
//printf("real temp = %d,cali_temp = %d",Oled_Display_Info.Air_Device.real_temperature,sKey_Operation[0].operate_calibrate_temp);
Calib_Temp_Control(ON,0,0,display_data);
Calib_Temp_Control(FLASHING,15*1000,800,display_data);
}
break;
}
......@@ -1451,29 +1393,29 @@ static void KEY6_Botton_Process_Handler(u8 KeyPressEvent)
break;
}
else if(gKey_Press_Info.adjust_fan_speed_status == 2)
{
u8 speed_direct = 0;
speed_direct = Get_NextOne_By_Current_wind_direct(0,Oled_Display_Info.Air_Device.air_wind_direct);
switch(speed_direct) //显示当前风向
{
case 0:
display_wind_direct(1,0,0);
break;
case 1:
display_wind_direct(0,1,0);
break;
case 2:
display_wind_direct(0,0,1);
break;
default:
break;
}
Oled_Display_Info.Air_Device.air_wind_direct = speed_direct;
state_change_report(OPCODE_GENERAL_REPORT_STATUS,1); //状态改变通知
break;
}
// else if(gKey_Press_Info.adjust_fan_speed_status == 2)
// {
// u8 speed_direct = 0;
// speed_direct = Get_NextOne_By_Current_wind_direct(0,Oled_Display_Info.Air_Device.air_wind_direct);
// switch(speed_direct) //显示当前风向
// {
// case 0:
// display_wind_direct(1,0,0);
// break;
// case 1:
// display_wind_direct(0,1,0);
// break;
// case 2:
// display_wind_direct(0,0,1);
// break;
// default:
// break;
// }
// Oled_Display_Info.Air_Device.air_wind_direct = speed_direct;
//
// state_change_report(OPCODE_GENERAL_REPORT_STATUS,1); //状态改变通知
// break;
// }
if(sKey_Operation[0].operate_delay_off_status)
{
......@@ -1491,14 +1433,12 @@ static void KEY6_Botton_Process_Handler(u8 KeyPressEvent)
sKey_Operation[0].set_temper_temp -= 5;
if(sKey_Operation[0].set_temper_temp <= 160) //美的空调温度调节范围 17度 - 30度
sKey_Operation[0].set_temper_temp = 160;
display_set_temp(0,sKey_Operation[0].set_temper_temp,0); //显示设置温度
display_set_temp(0,sKey_Operation[0].set_temper_temp,0); //显示设置温度
if( (sKey_Operation[0].set_temper_temp /10) == (Oled_Display_Info.Air_Device.set_temperature/10)) //26.5调整到26度时，不管空调的反馈，直接上报
{
Oled_Display_Info.Air_Device.set_temperature = sKey_Operation[0].set_temper_temp;
state_change_report(OPCODE_GENERAL_REPORT_STATUS,1); //状态改变通知
}
state_change_report(OPCODE_GENERAL_REPORT_STATUS,1); //状态改变通知
Oled_Display_Info.Air_Device.set_temperature = sKey_Operation[0].set_temper_temp;
}
}
else if(Oled_Display_Info.screen_page == FLOOR_HEATING)
......@@ -1513,17 +1453,9 @@ static void KEY6_Botton_Process_Handler(u8 KeyPressEvent)
if(sKey_Operation[1].operate_calibrate_temp> -90)
sKey_Operation[1].operate_calibrate_temp -=5;
LCDShowTemp_state_t.LCD_place = CALIBRATE_TEMPER_DISPLAY;
LCDShowTemp_state_t.LCD_state = ON;
LcdShowCTR(LCDShowTemp_state_t);
LCDShowTemp_state_t.LCD_state = FLASHING;
LCDShowTemp_state_t.LCD_display_count = 15*1000/800; //15s
LCDShowTemp_state_t.LCD_display_timer = 800/10;
display_data = Oled_Display_Info.FLOOR_Device.real_temperature- Oled_Display_Info.FLOOR_Device.correct_temperature + sKey_Operation[1].operate_calibrate_temp;
LCDShowTemp_state_t.LCD_code_data = display_data;
LcdShowCTR(LCDShowTemp_state_t);
Calib_Temp_Control(ON,0,0,display_data);
Calib_Temp_Control(FLASHING,15*1000,800,display_data);
}
break;
}
......@@ -1557,6 +1489,7 @@ static void KEY6_Botton_Process_Handler(u8 KeyPressEvent)
state_change_report(OPCODE_GENERAL_REPORT_STATUS,2); //状态改变通知
}
}
else if(Oled_Display_Info.screen_page == FAN)
{
......@@ -1570,17 +1503,9 @@ static void KEY6_Botton_Process_Handler(u8 KeyPressEvent)
if(sKey_Operation[2].operate_calibrate_temp> -90)
sKey_Operation[2].operate_calibrate_temp -=5;
LCDShowTemp_state_t.LCD_place = CALIBRATE_TEMPER_DISPLAY;
LCDShowTemp_state_t.LCD_state = ON;
LcdShowCTR(LCDShowTemp_state_t);
LCDShowTemp_state_t.LCD_state = FLASHING;
LCDShowTemp_state_t.LCD_display_count = 15*1000/800; //15s
LCDShowTemp_state_t.LCD_display_timer = 800/10;
display_data = Oled_Display_Info.FAN_Device.real_temperature- Oled_Display_Info.FAN_Device.correct_temperature + sKey_Operation[2].operate_calibrate_temp;
LCDShowTemp_state_t.LCD_code_data = display_data;
LcdShowCTR(LCDShowTemp_state_t);
Calib_Temp_Control(ON,0,0,display_data);
Calib_Temp_Control(FLASHING,15*1000,800,display_data);
}
break;
}
......
Code/海顿-多合一新风面板/APP/User/src/control_comm.c
View file @ 1de4b7b1
......@@ -695,16 +695,19 @@ static void sensor_measure_loop(void)
CurrentValue = VCNL3040_Get_Current_Data();
if( (CurrentValue > LastValue)&&( (CurrentValue - LastValue) >= PERSON_TRAGGER_MIN_RANGE ))
{
u8 board_test_flag = Oled_Display_Info.recv_lcd_off &0x80;
u8 report_times = Oled_Display_Info.recv_lcd_off&0x0f;
Reload_Save_Time();
if((First_Exit_Factory_Mode == 0)&&(Oled_Display_Info.recv_lcd_off == 0))
if((First_Exit_Factory_Mode == 0)&&(board_test_flag == 0))
Detect_Human_Dispaly();
if(Oled_Display_Info.recv_lcd_off >0)
if(report_times >0)
{
//Oled_Display_Info.recv_lcd_off--;
BL55072A_DisplayALL();
delay_300ms_report_start(); //延时上报接近感应任务开启
if(board_test_flag)
BL55072A_DisplayALL();
else
Oled_Display_Info.recv_lcd_off--;
}
}
LastValue = CurrentValue;
}
......@@ -1122,7 +1125,7 @@ struct task_components_t task_comps[] =
{8, SWITCH_OFF, RUN_FLAG_0, SET_FLAG_0, Sec_2,Sec_2, operate_calibrate_temper_delay_2s_off }, //确认校准温度后延时2s关机
#if DEVICE_TYPE_AIR_CONDITION
{9, SWITCH_OFF, RUN_FLAG_0, SET_FLAG_0, Sec_1,Sec_1, task_retransmit }, //重传
{10,SWITCH_OFF, RUN_FLAG_0, SET_FLAG_0, Sec_15,Sec_15, task_poll_check } , //查询空调状态15s
{10,SWITCH_ON, RUN_FLAG_0, SET_FLAG_0, Sec_15,Sec_15, task_poll_check } , //查询空调状态15s
#else
{9, SWITCH_OFF, RUN_FLAG_0, SET_FLAG_0, Sec_1,Sec_1, NULL }, //重传
{10,SWITCH_OFF, RUN_FLAG_0, SET_FLAG_0, Sec_15,Sec_15, NULL } , //查询空调状态15s
......@@ -2165,46 +2168,6 @@ void not_transparent_data_analyze(PROTOCOL_DEAL recv_data)
}
}
}
/////***********************************************************************
////* 函 数 名: task_CC2530_state_check
////* 功能说明: 查询2530网络状态任务，每隔2s
////* 形 参：无
////* 返 回 值: 无
////***********************************************************************/
//// void task_CC2530_state_check(void)
////{
//// if ( net_leave_flage == 0)
//// {
//// PROTOCOL_SEND send_data;
//// TP_u16 send_data_SEQ;
//// serial_num[3]++;
//// send_data.ARG = 0;
//// send_data.ARG_len = 1;
//// send_data.Channel_ID = 0x00;
//// send_data.ControlField = 0xA0; //非透传控制域
//// send_data.Opcode = _OPCODE_INQUIRE_NET_STATE;
//// send_data_SEQ = serial_num[3];
//// if(serial_num[3] == 0xffff)
//// {
//// serial_num[3] = 0;
//// }
//// transparent_protocol_send(send_data, send_data_SEQ);
//// CC2530_state_check_times ++;
//// if(CC2530_state_check_times == 5)
//// {
//// CC2530_state_check_times = 0;
//// display_error(1);
//// }
//// }
////}
/***********************************************************************
* 函 数 名: key_state_change_report
* 功能说明: 触发状态上报
......
Code/海顿-多合一新风面板/APP/User/src/display_common.c
View file @ 1de4b7b1
......@@ -708,6 +708,10 @@ void PowerOff(void)
LCDShowTemp_state_t.LCD_place = SET_MIDDLE_DIGITRON_DISPLAY_03;
LCDShowTemp_state_t.LCD_code_data = 0x0F;
LCDShowTemp_state_t.LCD_state = ON;
LcdShowCTR(LCDShowTemp_state_t);
LCDShowTemp_state_t.LCD_place = MIDDLE_POINT_DISPLAY;
LCDShowTemp_state_t.LCD_state = OFF;
LcdShowCTR(LCDShowTemp_state_t);
/********************************************
......@@ -1307,10 +1311,10 @@ void Set_CMD_Handler(u8 device_type,u16 opcode,u8 *arg,u8 arg_len)
sKey_Operation[0].set_temper_temp = set_temper;
arg[0] = 0;
if( (sKey_Operation[0].set_temper_temp /10) == (Oled_Display_Info.Air_Device.set_temperature/10)) //26.5调整到26度时，不管空调的反馈，直接上报
{
Oled_Display_Info.Air_Device.set_temperature = sKey_Operation[0].set_temper_temp;
state_change_report(OPCODE_GENERAL_REPORT_STATUS,1); //状态改变通知
}
//else
//Control_AIR_CONDITION_By_RS485(AIR_CMD_SET_TEMPER,set_temper); //控制空调目标温度
Oled_Display_Info.Air_Device.set_temperature = sKey_Operation[0].set_temper_temp;
}
else
arg[0] = 0xff;
......@@ -1663,8 +1667,10 @@ void Set_CMD_Handler(u8 device_type,u16 opcode,u8 *arg,u8 arg_len)
}
Displayt_System_Mode(system_mode);
#if DEVICE_TYPE_FAN
if(Oled_Display_Info.FAN_Device.system_type != system_mode)
Fan_PassbyONOFF_By_Mode_Trans(system_mode,1);
#endif
Oled_Display_Info.FAN_Device.system_type = system_mode;
arg[0] = 0;
state_change_report(OPCODE_GENERAL_REPORT_STATUS,3);
......@@ -1689,8 +1695,10 @@ void Set_CMD_Handler(u8 device_type,u16 opcode,u8 *arg,u8 arg_len)
break;
}
Oled_Display_Info.FAN_Device.wind_speed = wind_speed;
Oled_Display_Info.FAN_Device.wind_speed = wind_speed;
#if DEVICE_TYPE_FAN
Fan_Speed_Control(wind_speed);
#endif
if(Get_Display_Status())
display_set_temp(1,Oled_Display_Info.FAN_Device.wind_speed,1);
state_change_report(OPCODE_GENERAL_REPORT_STATUS,3);
......@@ -1890,11 +1898,13 @@ u8 Key_Operate_Config_Operation(u8 keyid,u8 keyEvent)
local_config_operate.config_page = 2;
switch(local_config_operate.config_page1_func_value)
{
#if (DEVICE_TYPE_AIR_CONDITION &&(DEV_TYPE == 1 ))
case LOCAL_FUNC_FAN_PANEL_SETTING:
{
local_config_operate.config_page2_value = 0;
}
break;
#endif
case LOCAL_FUNC_CALIBRATE_TEMPER:
break;
case LOCAL_FUNC_IS_DISPLAY_CURRENT_TEMPER:
......@@ -1951,12 +1961,14 @@ u8 Key_Operate_Config_Operation(u8 keyid,u8 keyEvent)
{
switch(local_config_operate.config_page1_func_value)
{
#if (DEVICE_TYPE_AIR_CONDITION &&(DEV_TYPE == 1 ))
case LOCAL_FUNC_FAN_PANEL_SETTING:
{
Oled_Display_Info.Air_Device.operation_mode = local_config_operate.config_page2_value;
save_data();
}
break;
#endif
case LOCAL_FUNC_CALIBRATE_TEMPER:
break;
case LOCAL_FUNC_IS_DISPLAY_CURRENT_TEMPER:
......@@ -2019,7 +2031,7 @@ u8 Key_Operate_Config_Operation(u8 keyid,u8 keyEvent)
{
switch(local_config_operate.config_page1_func_value)
{
#if DEVICE_TYPE_AIR_CONDITION
#if (DEVICE_TYPE_AIR_CONDITION &&(DEV_TYPE == 1 ))
case LOCAL_FUNC_FAN_PANEL_SETTING:
{
switch(local_config_operate.config_page2_value)
......
Code/海顿-多合一新风面板/APP/User/src/mfg_factort.c
View file @ 1de4b7b1
......@@ -192,7 +192,7 @@ u8 Usart_recive_deal(TP_uc8 *data,TP_uc16 len)
Operate_Led_Button(Oled_Display_Info.device_type,0);
arg_data[0] = 0;
arg_data[1] = 0;
Oled_Display_Info.recv_lcd_off = 5;
Oled_Display_Info.recv_lcd_off = 0x85;
ack_info(Usart_protocol_deal,arg_data,2);
}
break;
......
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