Skip to content

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

V1.4

parent deb06860
Hide whitespace changes
Inline Side-by-side
Showing with 136 additions and 65 deletions
Code/海顿-多合一新风面板/APP/AllToOneThernmostatPannel.uvgui.11730
View file @ a5affd19
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<WindowPosition> <WindowPosition>
<length>44</length> <length>44</length>
<flags>2</flags> <flags>2</flags>
<showCmd>2</showCmd> <showCmd>3</showCmd>
<MinPosition> <MinPosition>
<xPos>-32000</xPos> <xPos>-32000</xPos>
<yPos>-32000</yPos> <yPos>-32000</yPos>
...@@ -85,17 +85,17 @@ ...@@ -85,17 +85,17 @@
<yPos>-1</yPos> <yPos>-1</yPos>
</MaxPosition> </MaxPosition>
<NormalPosition> <NormalPosition>
<Top>138</Top> <Top>50</Top>
<Left>1</Left> <Left>-1345</Left>
<Right>1290</Right> <Right>-262</Right>
<Bottom>827</Bottom> <Bottom>749</Bottom>
</NormalPosition> </NormalPosition>
</WindowPosition> </WindowPosition>
<MDIClientArea> <MDIClientArea>
<RegID>0</RegID> <RegID>0</RegID>
<MDITabState> <MDITabState>
<Len>1616</Len> <Len>1976</Len>
<Data>010000000400000001000000010000000100000001000000000000000200000000000000010000000100000000000000280000002800000001000000070000000500000001000000A8443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C7372635C646973706C61795F636F6D6D6F6E2E630000000010646973706C61795F636F6D6D6F6E2E6300000000C5D4F200FFFFFFFFA6443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C7372635C636F6E74726F6C5F636F6D6D2E63000000000E636F6E74726F6C5F636F6D6D2E6300000000FFDC7800FFFFFFFFB4443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C696E635C4343323533305F7472616E73706172656E745F616E616C797A652E68000000001C4343323533305F7472616E73706172656E745F616E616C797A652E6800000000BECEA100FFFFFFFFA7443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C7372635C68617264776172655F696E69742E63000000000F68617264776172655F696E69742E6300000000F0A0A100FFFFFFFFB4443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C7372635C4343323533305F7472616E73706172656E745F616E616C797A652E63000000001C4343323533305F7472616E73706172656E745F616E616C797A652E6300000000BCA8E100FFFFFFFFA5443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C7372635C6D66675F666163746F72742E63000000000D6D66675F666163746F72742E63000000009CC1B600FFFFFFFFA5443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C696E635C6D66675F666163746F72792E68000000000D6D66675F666163746F72792E6800000000F7B88600FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000001384FFFF4F83FFFF0088FFFFC484FFFF</Data> <Data>010000000400000001000000010000000100000001000000000000000200000000000000010000000100000000000000280000002800000001000000090000000000000001000000A8443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C7372635C646973706C61795F636F6D6D6F6E2E630000000010646973706C61795F636F6D6D6F6E2E6300000000FFDC7800FFFFFFFFA6443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C7372635C636F6E74726F6C5F636F6D6D2E63000000000E636F6E74726F6C5F636F6D6D2E6300000000BECEA100FFFFFFFFB4443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C696E635C4343323533305F7472616E73706172656E745F616E616C797A652E68000000001C4343323533305F7472616E73706172656E745F616E616C797A652E6800000000F0A0A100FFFFFFFFA7443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C7372635C68617264776172655F696E69742E63000000000F68617264776172655F696E69742E6300000000BCA8E100FFFFFFFFB4443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C7372635C4343323533305F7472616E73706172656E745F616E616C797A652E63000000001C4343323533305F7472616E73706172656E745F616E616C797A652E63000000009CC1B600FFFFFFFFA5443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C7372635C6D66675F666163746F72742E63000000000D6D66675F666163746F72742E6300000000F7B88600FFFFFFFFA5443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C696E635C6D66675F666163746F72792E68000000000D6D66675F666163746F72792E6800000000D9ADC200FFFFFFFF9D443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C7372635C4B65792E6300000000054B65792E6300000000A5C2D700FFFFFFFF9D443A5C55736572735C31313733305C53696D706C696369747953747564696F5C76345F776F726B73706163655C4B4B416C6C2D496E2D4F6E65546865726D6F7374617450616E656C4D47323156315C7A33735F746865726D6F73746174616C6C696E6F6E656D67323173646B36363576325C436F64655CBAA3B6D92DB6E0BACFD2BBD0C2B7E7C3E6B0E55C4150505C557365725C696E635C4B65792E6800000000054B65792E6800000000B3A6BE00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD50001000000000000000200000093F9FFFFDDFFFFFF00000000BB020000</Data>
</MDITabState> </MDITabState>
</MDIClientArea> </MDIClientArea>
<ViewEx> <ViewEx>
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
<RecentRowIndex>0</RecentRowIndex> <RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked> <RectRecentDocked>
<Len>16</Len> <Len>16</Len>
<Data>03000000660000000C010000AB010000</Data> <Data>03000000660000000C01000014030000</Data>
</RectRecentDocked> </RectRecentDocked>
<RectRecentFloat> <RectRecentFloat>
<Len>16</Len> <Len>16</Len>
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
<RecentRowIndex>0</RecentRowIndex> <RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked> <RectRecentDocked>
<Len>16</Len> <Len>16</Len>
<Data>03000000660000000C010000AB010000</Data> <Data>03000000660000000C01000014030000</Data>
</RectRecentDocked> </RectRecentDocked>
<RectRecentFloat> <RectRecentFloat>
<Len>16</Len> <Len>16</Len>
...@@ -434,7 +434,7 @@ ...@@ -434,7 +434,7 @@
<RecentRowIndex>0</RecentRowIndex> <RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked> <RectRecentDocked>
<Len>16</Len> <Len>16</Len>
<Data>03000000660000000C010000AB010000</Data> <Data>03000000660000000C01000014030000</Data>
</RectRecentDocked> </RectRecentDocked>
<RectRecentFloat> <RectRecentFloat>
<Len>16</Len> <Len>16</Len>
...@@ -454,7 +454,7 @@ ...@@ -454,7 +454,7 @@
<RecentRowIndex>0</RecentRowIndex> <RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked> <RectRecentDocked>
<Len>16</Len> <Len>16</Len>
<Data>03000000660000000C010000AB010000</Data> <Data>03000000660000000C01000014030000</Data>
</RectRecentDocked> </RectRecentDocked>
<RectRecentFloat> <RectRecentFloat>
<Len>16</Len> <Len>16</Len>
...@@ -474,7 +474,7 @@ ...@@ -474,7 +474,7 @@
<RecentRowIndex>0</RecentRowIndex> <RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked> <RectRecentDocked>
<Len>16</Len> <Len>16</Len>
<Data>03000000070300007D070000D7030000</Data> <Data>03000000480300007D070000D7030000</Data>
</RectRecentDocked> </RectRecentDocked>
<RectRecentFloat> <RectRecentFloat>
<Len>16</Len> <Len>16</Len>
...@@ -514,7 +514,7 @@ ...@@ -514,7 +514,7 @@
<RecentRowIndex>0</RecentRowIndex> <RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked> <RectRecentDocked>
<Len>16</Len> <Len>16</Len>
<Data>03000000070300007D070000D7030000</Data> <Data>03000000480300007D070000D7030000</Data>
</RectRecentDocked> </RectRecentDocked>
<RectRecentFloat> <RectRecentFloat>
<Len>16</Len> <Len>16</Len>
...@@ -1114,7 +1114,7 @@ ...@@ -1114,7 +1114,7 @@
<RecentRowIndex>0</RecentRowIndex> <RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked> <RectRecentDocked>
<Len>16</Len> <Len>16</Len>
<Data>03000000660000000C01000046030000</Data> <Data>03000000660000000C010000AB010000</Data>
</RectRecentDocked> </RectRecentDocked>
<RectRecentFloat> <RectRecentFloat>
<Len>16</Len> <Len>16</Len>
...@@ -1124,7 +1124,7 @@ ...@@ -1124,7 +1124,7 @@
<Window> <Window>
<RegID>38007</RegID> <RegID>38007</RegID>
<PaneID>38007</PaneID> <PaneID>38007</PaneID>
<IsVisible>0</IsVisible> <IsVisible>1</IsVisible>
<IsFloating>0</IsFloating> <IsFloating>0</IsFloating>
<IsTabbed>0</IsTabbed> <IsTabbed>0</IsTabbed>
<IsActivated>0</IsActivated> <IsActivated>0</IsActivated>
...@@ -1134,7 +1134,7 @@ ...@@ -1134,7 +1134,7 @@
<RecentRowIndex>0</RecentRowIndex> <RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked> <RectRecentDocked>
<Len>16</Len> <Len>16</Len>
<Data>03000000070300007D07000064030000</Data> <Data>03000000480300007D070000D7030000</Data>
</RectRecentDocked> </RectRecentDocked>
<RectRecentFloat> <RectRecentFloat>
<Len>16</Len> <Len>16</Len>
...@@ -1154,7 +1154,7 @@ ...@@ -1154,7 +1154,7 @@
<RecentRowIndex>0</RecentRowIndex> <RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked> <RectRecentDocked>
<Len>16</Len> <Len>16</Len>
<Data>03000000070300007D07000064030000</Data> <Data>0300000048030000FD040000D7030000</Data>
</RectRecentDocked> </RectRecentDocked>
<RectRecentFloat> <RectRecentFloat>
<Len>16</Len> <Len>16</Len>
...@@ -1683,14 +1683,14 @@ ...@@ -1683,14 +1683,14 @@
</Window> </Window>
<DockMan> <DockMan>
<Len>3119</Len> <Len>3119</Len>
<Data>000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFA4000000B3000000B0030000B7000000000000000100000004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E65002000000000000024F9FFFFDDFFFFFF30FCFFFF41000000A40000004F000000B0030000B30000000000000040280046060000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF0C0300004F0000001003000046010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C300000180004000000000000090FBFFFFDDFFFFFF30FCFFFFD4000000100300004F000000B00300004601000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF0F0100004F00000013010000C40100000100000002000010040000000100000062FFFFFF57040000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000080F8FFFFDDFFFFFF8FF9FFFFED020000000000004F0000000F010000C40100000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF000000003D010000B00300004101000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0E0000008F070000930700009407000095070000960700009007000091070000B5010000B8010000B9050000BA050000BB050000BC050000CB0900000180008000000000000080F8FFFFCF00000030FCFFFF3C0100000000000041010000B0030000AE01000000000000404100460E0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFD801000041010000DC010000AE01000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000C401000000050000C80100000100000001000010040000000100000073FEFFFFA0000000FFFFFFFF04000000C5000000C7000000B4010000779400000180008000000100000080F8FFFFF1020000000000007E03000000000000C801000000050000870200000000000040820056040000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0742726F77736572010000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data> <Data>000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFA4000000B3000000B0030000B7000000000000000100000004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E65002000000000000024F9FFFFDDFFFFFF30FCFFFF41000000A40000004F000000B0030000B30000000000000040280046060000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF0C0300004F0000001003000046010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C300000180004000000000000090FBFFFFDDFFFFFF30FCFFFFD4000000100300004F000000B00300004601000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF0F0100004F000000130100002D0300000100000002000010040000000100000062FFFFFF57040000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000080F8FFFFDDFFFFFF8FF9FFFF52010000000000004F0000000F0100002D0300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF000000003D010000B00300004101000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0E0000008F070000930700009407000095070000960700009007000091070000B5010000B8010000B9050000BA050000BB050000BC050000CB0900000180008000000000000080F8FFFFCF00000030FCFFFF3C0100000000000041010000B0030000AE01000000000000404100460E0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFD801000041010000DC010000AE01000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000002D03000080070000310300000100000001000010040000000100000073FEFFFFA0000000FFFFFFFF04000000C5000000C7000000B4010000779400000180008000000100000080F8FFFF5601000080FDFFFF15020000000000003103000080070000F00300000000000040820056040000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0742726F77736572010000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data>
</DockMan> </DockMan>
<ToolBar> <ToolBar>
<RegID>59392</RegID> <RegID>59392</RegID>
<Name>File</Name> <Name>File</Name>
<Buttons> <Buttons>
<Len>2560</Len> <Len>2464</Len>
<Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000010434C4B5F5379735469636B44656C6179960000000000000014001355736172745F70726F746F636F6C5F6465616C1B7472616E73706172656E745F6F70636F64655F616E616C79736973187472616E73706172656E745F646174615F616E616C797A6512446973706C61795F55705F436F6E74656E6413456E74657253637265656E536176654D6F64651E436F6E74726F6C5F4149525F434F4E444954494F4E5F42795F525334383510434C4B5F5379735469636B44656C61790B4379636C657350657255730B4932435F53575F4F70656E107533325F4932435F53575F44656C61791864656C61795F3330306D735F7265706F72745F73746172741764656C61795F3330306D735F7265706F72745F7461736B1373656E736F725F6D6561737572655F6C6F6F70185A69676265655F556172745F4572726F725F48616E646C650E506F7765725F4F66665F5363616E14427566665F73656E645F73657269616C5F6E756D2B7374617469635F7472616E737072656E745F627566662E427566665F73656E645F73657269616C5F6E756D2A7374617469635F7472616E737072656E745F627566662E446F776E6C6F61645F73657269616C5F6E756D1755736172745F7265636976655F77726974655F6275666613446F776E6C6F61645F73657269616C5F6E756D0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020000001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000</Data> <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000005636F756E749600000000000000140005636F756E741C46616E5F73706565645F616E645F6469726563745F636F6E74726F6C1761646A7573745F66616E5F73706565645F73746174757312446973706C61795F55705F436F6E74656E6415446973706C61795F706F7765726F66665F74696D650E74656D705F6F70656E5F74696D65186175746F5F77696E645F7363616E5F7461736B5F73746F70196175746F5F77696E645F7363616E5F7461736B5F73746172741146616E5F53706565645F436F6E74726F6C094175746F5F57696E640F4445564943455F545950455F46414E0D73657475705F68616E646C6572144765745F4C6173745F53797374656D5F4D6F64651153797374656D5F4D6F64655F5472616E731973687463335F73656E736F725F6D6561737572655F6C6F6F70187A69676265655F756172745F646973706C61795F666C61670E61626E6F726D616C5F74696D65731544656C61795F4F46465F52656C5F446973706C61790E485F434841525F444953504C41590A5370616B655F466C61670000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020000001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000</Data>
</Buttons> </Buttons>
<OriginalItems> <OriginalItems>
<Len>1423</Len> <Len>1423</Len>
...@@ -1722,7 +1722,7 @@ ...@@ -1722,7 +1722,7 @@
<Name>Debug</Name> <Name>Debug</Name>
<Buttons> <Buttons>
<Len>2373</Len> <Len>2373</Len>
<Data>00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data> <Data>00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data>
</Buttons> </Buttons>
<OriginalItems> <OriginalItems>
<Len>898</Len> <Len>898</Len>
...@@ -1735,8 +1735,8 @@ ...@@ -1735,8 +1735,8 @@
</ToolBar> </ToolBar>
<ControlBarsSummary> <ControlBarsSummary>
<Bars>0</Bars> <Bars>0</Bars>
<ScreenCX>0</ScreenCX> <ScreenCX>1280</ScreenCX>
<ScreenCY>0</ScreenCY> <ScreenCY>720</ScreenCY>
</ControlBarsSummary> </ControlBarsSummary>
</ViewEx> </ViewEx>
<ViewEx> <ViewEx>
...@@ -3387,21 +3387,21 @@ ...@@ -3387,21 +3387,21 @@
<ActiveMDIGroup>0</ActiveMDIGroup> <ActiveMDIGroup>0</ActiveMDIGroup>
<MDIGroup> <MDIGroup>
<Size>100</Size> <Size>100</Size>
<ActiveTab>5</ActiveTab> <ActiveTab>0</ActiveTab>
<Doc> <Doc>
<Name>.\User\src\display_common.c</Name> <Name>.\User\src\display_common.c</Name>
<ColumnNumber>34</ColumnNumber> <ColumnNumber>14</ColumnNumber>
<TopLine>1</TopLine> <TopLine>1</TopLine>
<CurrentLine>10</CurrentLine> <CurrentLine>421</CurrentLine>
<Folding>1</Folding> <Folding>1</Folding>
<ContractedFolders></ContractedFolders> <ContractedFolders></ContractedFolders>
<PaneID>0</PaneID> <PaneID>0</PaneID>
</Doc> </Doc>
<Doc> <Doc>
<Name>.\User\src\control_comm.c</Name> <Name>.\User\src\control_comm.c</Name>
<ColumnNumber>17</ColumnNumber> <ColumnNumber>47</ColumnNumber>
<TopLine>2074</TopLine> <TopLine>1508</TopLine>
<CurrentLine>2093</CurrentLine> <CurrentLine>1533</CurrentLine>
<Folding>1</Folding> <Folding>1</Folding>
<ContractedFolders></ContractedFolders> <ContractedFolders></ContractedFolders>
<PaneID>0</PaneID> <PaneID>0</PaneID>
...@@ -3409,7 +3409,7 @@ ...@@ -3409,7 +3409,7 @@
<Doc> <Doc>
<Name>.\User\inc\CC2530_transparent_analyze.h</Name> <Name>.\User\inc\CC2530_transparent_analyze.h</Name>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<TopLine>147</TopLine> <TopLine>145</TopLine>
<CurrentLine>167</CurrentLine> <CurrentLine>167</CurrentLine>
<Folding>1</Folding> <Folding>1</Folding>
<ContractedFolders></ContractedFolders> <ContractedFolders></ContractedFolders>
...@@ -3417,7 +3417,7 @@ ...@@ -3417,7 +3417,7 @@
</Doc> </Doc>
<Doc> <Doc>
<Name>.\User\src\hardware_init.c</Name> <Name>.\User\src\hardware_init.c</Name>
<ColumnNumber>15</ColumnNumber> <ColumnNumber>18</ColumnNumber>
<TopLine>190</TopLine> <TopLine>190</TopLine>
<CurrentLine>203</CurrentLine> <CurrentLine>203</CurrentLine>
<Folding>1</Folding> <Folding>1</Folding>
...@@ -3427,7 +3427,7 @@ ...@@ -3427,7 +3427,7 @@
<Doc> <Doc>
<Name>.\User\src\CC2530_transparent_analyze.c</Name> <Name>.\User\src\CC2530_transparent_analyze.c</Name>
<ColumnNumber>23</ColumnNumber> <ColumnNumber>23</ColumnNumber>
<TopLine>211</TopLine> <TopLine>441</TopLine>
<CurrentLine>491</CurrentLine> <CurrentLine>491</CurrentLine>
<Folding>1</Folding> <Folding>1</Folding>
<ContractedFolders></ContractedFolders> <ContractedFolders></ContractedFolders>
...@@ -3435,9 +3435,9 @@ ...@@ -3435,9 +3435,9 @@
</Doc> </Doc>
<Doc> <Doc>
<Name>.\User\src\mfg_factort.c</Name> <Name>.\User\src\mfg_factort.c</Name>
<ColumnNumber>77</ColumnNumber> <ColumnNumber>26</ColumnNumber>
<TopLine>100</TopLine> <TopLine>139</TopLine>
<CurrentLine>107</CurrentLine> <CurrentLine>132</CurrentLine>
<Folding>1</Folding> <Folding>1</Folding>
<ContractedFolders></ContractedFolders> <ContractedFolders></ContractedFolders>
<PaneID>0</PaneID> <PaneID>0</PaneID>
...@@ -3451,6 +3451,24 @@ ...@@ -3451,6 +3451,24 @@
<ContractedFolders></ContractedFolders> <ContractedFolders></ContractedFolders>
<PaneID>0</PaneID> <PaneID>0</PaneID>
</Doc> </Doc>
<Doc>
<Name>.\User\src\Key.c</Name>
<ColumnNumber>26</ColumnNumber>
<TopLine>648</TopLine>
<CurrentLine>683</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
</Doc>
<Doc>
<Name>.\User\inc\Key.h</Name>
<ColumnNumber>37</ColumnNumber>
<TopLine>202</TopLine>
<CurrentLine>238</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
</Doc>
</MDIGroup> </MDIGroup>
</MDIGroups> </MDIGroups>
......
Code/海顿-多合一新风面板/APP/User/inc/Key.h
View file @ a5affd19
...@@ -182,6 +182,7 @@ A = 0 B = 1 C = 1 ...@@ -182,6 +182,7 @@ A = 0 B = 1 C = 1
#define ButtonLongEvent 0x90 #define ButtonLongEvent 0x90
#define ButtonLongUpEvent 0xa0 #define ButtonLongUpEvent 0xa0
#define Button10sLongEvent 0xb0 #define Button10sLongEvent 0xb0
#define Button10sLongUpEvent 0xc0
#define AIR_CMD_ONOFF 1 #define AIR_CMD_ONOFF 1
#define AIR_CMD_SYSTEM_MODE 2 #define AIR_CMD_SYSTEM_MODE 2
......
Code/海顿-多合一新风面板/APP/User/src/Key.c
View file @ a5affd19
...@@ -297,8 +297,8 @@ u8 KeyScanState( KeyScan_t* Buttion_T, u8 ButtonState ) ...@@ -297,8 +297,8 @@ u8 KeyScanState( KeyScan_t* Buttion_T, u8 ButtonState )
&&( Low == Buttion_T->PreState ) &&( Low == Buttion_T->PreState )
&&( AntiShakeTime < Buttion_T->KeyTime ) &&( AntiShakeTime < Buttion_T->KeyTime )
&&( PressLongTime > Buttion_T->KeyTime) &&( PressLongTime > Buttion_T->KeyTime)
&&( ButtonLongEvent != (Buttion_T->PreKeyEvent) ) &&( ButtonLongEvent != (Buttion_T->PreKeyEvent))
) &&(Button10sLongEvent != (Buttion_T->PreKeyEvent)) )
{ {
Buttion_T->KeyTime = NULL; Buttion_T->KeyTime = NULL;
Buttion_T->PreKeyEvent = ButtonShortEvent; Buttion_T->PreKeyEvent = ButtonShortEvent;
...@@ -318,7 +318,6 @@ u8 KeyScanState( KeyScan_t* Buttion_T, u8 ButtonState ) ...@@ -318,7 +318,6 @@ u8 KeyScanState( KeyScan_t* Buttion_T, u8 ButtonState )
count++; count++;
if(count == 5) //10s if(count == 5) //10s
{ {
count = 0;
Buttion_T->PreKeyEvent = Button10sLongEvent; Buttion_T->PreKeyEvent = Button10sLongEvent;
EventReturn = Button10sLongEvent;//InputKeyEvent( Key_Button, ModeButtonLongEvent ); EventReturn = Button10sLongEvent;//InputKeyEvent( Key_Button, ModeButtonLongEvent );
} }
...@@ -337,6 +336,7 @@ u8 KeyScanState( KeyScan_t* Buttion_T, u8 ButtonState ) ...@@ -337,6 +336,7 @@ u8 KeyScanState( KeyScan_t* Buttion_T, u8 ButtonState )
} }
else else
{ {
Buttion_T->KeyTime = NULL; Buttion_T->KeyTime = NULL;
if( ButtonLongEvent == (Buttion_T->PreKeyEvent) ) if( ButtonLongEvent == (Buttion_T->PreKeyEvent) )
...@@ -345,6 +345,12 @@ u8 KeyScanState( KeyScan_t* Buttion_T, u8 ButtonState ) ...@@ -345,6 +345,12 @@ u8 KeyScanState( KeyScan_t* Buttion_T, u8 ButtonState )
Buttion_T->PreKeyEvent = ButtonLongUpEvent; Buttion_T->PreKeyEvent = ButtonLongUpEvent;
EventReturn = ButtonLongUpEvent; EventReturn = ButtonLongUpEvent;
} }
else if(Button10sLongEvent == (Buttion_T->PreKeyEvent))
{
count = 0;
Buttion_T->PreKeyEvent = Button10sLongUpEvent;
EventReturn = Button10sLongUpEvent;
}
} }
///**** 状态更新 *****/ ///**** 状态更新 *****/
...@@ -395,7 +401,7 @@ static void LED_BEEP_Feedback(u8 key_id) ...@@ -395,7 +401,7 @@ static void LED_BEEP_Feedback(u8 key_id)
void KeyProcess_Handler_Callbacks(u8 key_id,u8 KeyPressEvent) 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)) if(Key_Operate_Config_Operation(key_id,KeyPressEvent)||(KeyPressEvent == Button10sLongUpEvent))
{ {
LED_BEEP_Feedback(key_id); LED_BEEP_Feedback(key_id);
return; return;
......
Code/海顿-多合一新风面板/APP/User/src/control_comm.c
View file @ a5affd19
...@@ -700,11 +700,9 @@ void recover_current_state(void) ...@@ -700,11 +700,9 @@ void recover_current_state(void)
} }
void ReDefine_AIR_Condition_Syetem_Mode(void) void ReDefine_AIR_Condition_Syetem_Mode(void)
{ {
s16 temp ; if(Oled_Display_Info.Air_Device.real_temperature > 280)
SHTC3_GetTemp(&temp);
if(temp > 280)
Oled_Display_Info.Air_Device.system_type = SYSTEM_MODE_COOLING; Oled_Display_Info.Air_Device.system_type = SYSTEM_MODE_COOLING;
else if(temp <200) else if(Oled_Display_Info.Air_Device.real_temperature <200)
Oled_Display_Info.Air_Device.system_type = SYSTEM_MODE_HEATING; Oled_Display_Info.Air_Device.system_type = SYSTEM_MODE_HEATING;
else else
Oled_Display_Info.Air_Device.system_type = SYSTEM_MODE_AIR; Oled_Display_Info.Air_Device.system_type = SYSTEM_MODE_AIR;
...@@ -852,6 +850,10 @@ void delay_confirm_fan_speed_control(u8 start) ...@@ -852,6 +850,10 @@ void delay_confirm_fan_speed_control(u8 start)
task_comps[5].task_switch = SWITCH_OFF; task_comps[5].task_switch = SWITCH_OFF;
} }
u8 Is_Fan_Speed_Display(void)
{
return (task_comps[5].task_switch == SWITCH_ON);
}
/**************************************************************************************************/ /**************************************************************************************************/
/*上电延时回调处理 /*上电延时回调处理
**************************************************************************************************/ **************************************************************************************************/
...@@ -871,12 +873,6 @@ void setup_handler(void) ...@@ -871,12 +873,6 @@ void setup_handler(void)
{ {
count = 1; count = 1;
//空调设备判断当前温度，初始化当前模式
if(Oled_Display_Info.device_type == AIR_CONDITION)
{
ReDefine_AIR_Condition_Syetem_Mode();
}
//未老化完成，则进入老化阶段 //未老化完成，则进入老化阶段
if(Oled_Display_Info.aging_test_flag == 0) if(Oled_Display_Info.aging_test_flag == 0)
aging_test_start(); aging_test_start();
......
Code/海顿-多合一新风面板/APP/User/src/display_common.c
View file @ a5affd19
...@@ -11,7 +11,7 @@ extern Lcd_Status_Info_t LCDShowTemp_state_t; ...@@ -11,7 +11,7 @@ extern Lcd_Status_Info_t LCDShowTemp_state_t;
#elif DEVICE_TYPE_FLOOR_HEATING #elif DEVICE_TYPE_FLOOR_HEATING
OLED_ALL_DSD Oled_Display_Info = { 2,0,2,0,0,0x11,0,0,0,0,{0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff},{1,0,0,0,260,0,3,0,5,0,2,1,0,0,3000,0,0xff,0xff,0},{1,0,0,0,260,0,2,0,DEV_TYPE,0,0,0},{1,0,0,0,0,2,1,0,0,0,3000,0}}; OLED_ALL_DSD Oled_Display_Info = { 2,0,2,0,0,0x11,0,0,0,0,{0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff},{1,0,0,0,260,0,3,0,5,0,2,1,0,0,3000,0,0xff,0xff,0},{1,0,0,0,260,0,2,0,DEV_TYPE,0,0,0},{1,0,0,0,0,2,1,0,0,0,3000,0}};
#elif DEVICE_TYPE_FAN #elif DEVICE_TYPE_FAN
OLED_ALL_DSD Oled_Display_Info = { 3,0,3,0,0,0x13,0,0,0,0,{0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff},{1,0,0,0,260,0,3,0,5,0,2,1,0,0,3000,0,0xff,0xff,0},{1,0,0,0,260,0,2,0,0,0,0,0},{1,0,0,0,0,2,1,0,0,0,3000,0}}; OLED_ALL_DSD Oled_Display_Info = { 3,0,3,0,0,0x14,0,0,0,0,{0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff},{1,0,0,0,260,0,3,0,5,0,2,1,0,0,3000,0,0xff,0xff,0},{1,0,0,0,260,0,2,0,0,0,0,0},{1,0,0,0,0,2,1,0,0,0,3000,0}};
#endif #endif
Key_Operation_Status gKey_Press_Info = {0}; Key_Operation_Status gKey_Press_Info = {0};
// .device_type = 1, //AIR_CONDITION // .device_type = 1, //AIR_CONDITION
...@@ -550,6 +550,10 @@ void Display_Up_Contend(u8 device_type) ...@@ -550,6 +550,10 @@ void Display_Up_Contend(u8 device_type)
} }
void Fan_Oled_Display() void Fan_Oled_Display()
{ {
if((Oled_Display_Info.FAN_Device.no_disturb_mode == 1)&&(IsLcdEnterScreenSave()))
return;
LCD_CONTROL(1);
/******************************************** /********************************************
显示“新风”字样 显示“新风”字样
*********************************************/ *********************************************/
...@@ -578,9 +582,22 @@ void Fan_Oled_Display() ...@@ -578,9 +582,22 @@ void Fan_Oled_Display()
*********************************************/ *********************************************/
if(!IsLcdEnterScreenSave()) if(!IsLcdEnterScreenSave())
Display_Up_Contend(FAN); Display_Up_Contend(FAN);
/********************************************
ZigBee信号图标
*********************************************/
if (Oled_Display_Info.net_work_flage != OUT_LINE)
{
LCDShowTemp_state_t.LCD_place = ZIGBEE_NET_CAHR_DISPLAY;
LCDShowTemp_state_t.LCD_state = ON;
LcdShowCTR(LCDShowTemp_state_t);
}
} }
void Floor_Heating_Oled_Display() void Floor_Heating_Oled_Display()
{ {
if((Oled_Display_Info.FLOOR_Device.no_disturb_mode == 1)&&(IsLcdEnterScreenSave()))
return;
LCD_CONTROL(1);
/******************************************** /********************************************
显示“地暖”字样 显示“地暖”字样
*********************************************/ *********************************************/
...@@ -607,9 +624,23 @@ void Floor_Heating_Oled_Display() ...@@ -607,9 +624,23 @@ void Floor_Heating_Oled_Display()
*********************************************/ *********************************************/
if(!IsLcdEnterScreenSave()) if(!IsLcdEnterScreenSave())
Display_Up_Contend(FLOOR_HEATING); Display_Up_Contend(FLOOR_HEATING);
/********************************************
ZigBee信号图标
*********************************************/
if (Oled_Display_Info.net_work_flage != OUT_LINE)
{
LCDShowTemp_state_t.LCD_place = ZIGBEE_NET_CAHR_DISPLAY;
LCDShowTemp_state_t.LCD_state = ON;
LcdShowCTR(LCDShowTemp_state_t);
}
} }
void Air_Oled_Display(void) void Air_Oled_Display(void)
{ {
if((Oled_Display_Info.Air_Device.no_disturb_mode == 1)&&(IsLcdEnterScreenSave()))
return;
LCD_CONTROL(1); //开机
/******************************************** /********************************************
显示“空调”字样 显示“空调”字样
*********************************************/ *********************************************/
...@@ -638,10 +669,19 @@ void Air_Oled_Display(void) ...@@ -638,10 +669,19 @@ void Air_Oled_Display(void)
Display_Up_Contend(AIR_CONDITION); Display_Up_Contend(AIR_CONDITION);
/******************************************** /********************************************
ZigBee信号图标
*********************************************/
if (Oled_Display_Info.net_work_flage != OUT_LINE)
{
LCDShowTemp_state_t.LCD_place = ZIGBEE_NET_CAHR_DISPLAY;
LCDShowTemp_state_t.LCD_state = ON;
LcdShowCTR(LCDShowTemp_state_t);
}
/********************************************
显示主从模式 显示主从模式
*********************************************/ *********************************************/
#if (DEV_TYPE == 0) &&(DEVICE_TYPE_AIR_CONDITION ==1) #if (DEV_TYPE == 0) &&(DEVICE_TYPE_AIR_CONDITION ==1)
if( (Oled_Display_Info.Air_Device.power_off_time == 0) &&(Oled_Display_Info.Air_Device.air_master_slavery_mode)) if( Oled_Display_Info.Air_Device.air_master_slavery_mode)
{ {
//显示H图标 //显示H图标
if(!IsLcdEnterScreenSave()) if(!IsLcdEnterScreenSave())
...@@ -660,24 +700,13 @@ void Oled_Display_whole(void) ...@@ -660,24 +700,13 @@ void Oled_Display_whole(void)
{ {
if(IsLocalConfigMode()) if(IsLocalConfigMode())
return; return;
LCD_CONTROL(1); //开机
if(Oled_Display_Info.screen_page == AIR_CONDITION) if(Oled_Display_Info.screen_page == AIR_CONDITION)
Air_Oled_Display(); Air_Oled_Display();
else if(Oled_Display_Info.screen_page == FLOOR_HEATING) else if(Oled_Display_Info.screen_page == FLOOR_HEATING)
Floor_Heating_Oled_Display(); Floor_Heating_Oled_Display();
else if(Oled_Display_Info.screen_page == FAN) else if(Oled_Display_Info.screen_page == FAN)
Fan_Oled_Display(); Fan_Oled_Display();
/********************************************
ZigBee信号图标
*********************************************/
if (Oled_Display_Info.net_work_flage != OUT_LINE)
{
LCDShowTemp_state_t.LCD_place = ZIGBEE_NET_CAHR_DISPLAY;
LCDShowTemp_state_t.LCD_state = ON;
LcdShowCTR(LCDShowTemp_state_t);
}
} }
...@@ -1265,6 +1294,7 @@ void delay_confirm_fan_speed(void) ...@@ -1265,6 +1294,7 @@ void delay_confirm_fan_speed(void)
LCDShowTemp_state_t.LCD_state = OFF; LCDShowTemp_state_t.LCD_state = OFF;
LcdShowCTR(LCDShowTemp_state_t); LcdShowCTR(LCDShowTemp_state_t);
} }
extern u8 Is_Fan_Speed_Display(void);
void Set_CMD_Handler(u8 device_type,u16 opcode,u8 *arg,u8 arg_len) void Set_CMD_Handler(u8 device_type,u16 opcode,u8 *arg,u8 arg_len)
{ {
if(arg == NULL) if(arg == NULL)
...@@ -1307,6 +1337,11 @@ void Set_CMD_Handler(u8 device_type,u16 opcode,u8 *arg,u8 arg_len) ...@@ -1307,6 +1337,11 @@ void Set_CMD_Handler(u8 device_type,u16 opcode,u8 *arg,u8 arg_len)
#else #else
state_change_report(OPCODE_GENERAL_REPORT_STATUS,1); //状态改变通知 state_change_report(OPCODE_GENERAL_REPORT_STATUS,1); //状态改变通知
#endif #endif
//如果此时正在调节风速，提前结束
if(Is_Fan_Speed_Display())
{
delay_confirm_fan_speed();
}
} }
} }
...@@ -1385,6 +1420,10 @@ void Set_CMD_Handler(u8 device_type,u16 opcode,u8 *arg,u8 arg_len) ...@@ -1385,6 +1420,10 @@ void Set_CMD_Handler(u8 device_type,u16 opcode,u8 *arg,u8 arg_len)
return; return;
Oled_Display_Info.Air_Device.wind_speed = wind_speed; Oled_Display_Info.Air_Device.wind_speed = wind_speed;
#if (DEV_TYPE == 0) &&(DEVICE_TYPE_AIR_CONDITION ==1) #if (DEV_TYPE == 0) &&(DEVICE_TYPE_AIR_CONDITION ==1)
if(Is_Fan_Speed_Display()&&(!IsLcdEnterScreenSave()))
{
display_wind_speed(Oled_Display_Info.Air_Device.wind_speed,0); //显示当前风速
}
delay_control_fan_speed_start(); delay_control_fan_speed_start();
#else #else
state_change_report(OPCODE_GENERAL_REPORT_STATUS,1); //状态改变通知 state_change_report(OPCODE_GENERAL_REPORT_STATUS,1); //状态改变通知
...@@ -1589,7 +1628,11 @@ void Set_CMD_Handler(u8 device_type,u16 opcode,u8 *arg,u8 arg_len) ...@@ -1589,7 +1628,11 @@ void Set_CMD_Handler(u8 device_type,u16 opcode,u8 *arg,u8 arg_len)
{ {
Displayt_System_Mode(system_mode); Displayt_System_Mode(system_mode);
Oled_Display_Info.FLOOR_Device.system_type = system_mode; Oled_Display_Info.FLOOR_Device.system_type = system_mode;
if(Oled_Display_Info.FLOOR_Device.system_type == SYSTEM_MODE_AUTO)
{
Oled_Display_Info.FLOOR_Device.set_temperature = 260;
display_set_temp(0,Oled_Display_Info.FLOOR_Device.set_temperature,0);
}
state_change_report(OPCODE_GENERAL_REPORT_STATUS,2); state_change_report(OPCODE_GENERAL_REPORT_STATUS,2);
arg[0] = 0; arg[0] = 0;
} }
......
Code/海顿-多合一新风面板/APP/User/src/hardware_init.c
View file @ a5affd19
...@@ -293,6 +293,7 @@ static void FMC_init(void) ...@@ -293,6 +293,7 @@ static void FMC_init(void)
SYS_LockReg(); SYS_LockReg();
} }
extern void ReDefine_AIR_Condition_Syetem_Mode(void);
void hardware_init(void) void hardware_init(void)
{ {
SYS_Init(); SYS_Init();
...@@ -323,6 +324,12 @@ void hardware_init(void) ...@@ -323,6 +324,12 @@ void hardware_init(void)
GPIO_init(); GPIO_init();
temp_init(); temp_init();
//空调设备判断当前温度，初始化当前模式
if(Oled_Display_Info.device_type == AIR_CONDITION)
{
ReDefine_AIR_Condition_Syetem_Mode();
}
#if (DEVICE_TYPE_FLOOR_HEATING || DEVICE_TYPE_FAN) #if (DEVICE_TYPE_FLOOR_HEATING || DEVICE_TYPE_FAN)
Tap_Init(); Tap_Init();
#endif #endif
......
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