From fc9e1d5ce6328be45db4832c487eb936603c022d Mon Sep 17 00:00:00 2001
From: gbamber <gbamber@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Fri, 13 Jan 2017 13:40:28 +0000
Subject: [PATCH] V0.2.4.0 replaces sensors.res with foobot_sensors.res

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5634 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../foobot/monitor/foobot_sensors.pas         |   2 +-
 .../foobot/monitor/foobot_sensors.res         | Bin 0 -> 1195 bytes
 applications/foobot/monitor/foobotmonitor.lpi |   2 +-
 applications/foobot/monitor/foobotmonitor.lps |  82 +++++++++---------
 applications/foobot/monitor/foobotmonitor.res | Bin 80092 -> 80092 bytes
 applications/foobot/monitor/umainform.pas     |   4 +-
 6 files changed, 45 insertions(+), 45 deletions(-)
 create mode 100644 applications/foobot/monitor/foobot_sensors.res

diff --git a/applications/foobot/monitor/foobot_sensors.pas b/applications/foobot/monitor/foobot_sensors.pas
index 5ddac654d..96c5be1fb 100644
--- a/applications/foobot/monitor/foobot_sensors.pas
+++ b/applications/foobot/monitor/foobot_sensors.pas
@@ -107,7 +107,7 @@ type
 
 implementation
 
-{$R sensors.res}
+{$R foobot_sensors.res}
 
 uses SysUtils;
 
diff --git a/applications/foobot/monitor/foobot_sensors.res b/applications/foobot/monitor/foobot_sensors.res
new file mode 100644
index 0000000000000000000000000000000000000000..744828bea3b9646eb3caf9079c032225ffe16e47
GIT binary patch
literal 1195
zcmZQzU|>)H;{X347|28cuYo)hApZZKiy@dHgu$O7fFYj2ogs+96$t&{Y6S$~Ooq+?
zKX+a(DK4N0ucwDg5ReuHVr>p4ASuBbA_Js0dAc};RLprhiJPlILBPfKm)zRfxie?Y
z&)piSsUgMVQt7|3@N~?bZxc<=$W*qcGv`0+ua5e$!Q-gR1MP^w6@M6i>&9Mu%>1T4
zzmU5jUq9a>UTfW_<y;T`E@AptADQ^>yutey_D?MjT>r2$>54s9^r}U-?X`Z*7fJZP
zdh*B5OPSu(i_3lJee~Y`+;7*i#2LTlC-`1`d;i>z+*rd0mHl(4Kh~`K_IJsn-+$wM
zI&J(_>?i4JS4Drdv{1c#5a@aaPgg&ebxsLQ4DW#)10Y5XA5iGHfYgBjsbRAX8a7iH
z`C1fsSbl%0o@M`-MMP`s+UO$j<U0!#58k}CYvMG^i&eFYyfkxd9!4FM|Gf4*$Nc#I
z73(gu>&!bmtMyd5#r)M`a`B?ikNy(3x3<q@tlys|c)ox2@8|pP{FZyr|6ynA)cIXg
zm9HLpq&=rTe+_qo_}Rx_m$FW)moEEp@X=ZObMG%F|9)-LZpy7*AEJ~KF~jC`{pJIo
z&TG5B^5)k0Z}#Rx^U=?r_qS~MnCVpOVOY!fL;kC!yNy6N$j|Wb`2yrv05NL#gaT8J
zHxT<Xgj0})c0<Ey>P280;&J_3V!zhj`0}NfMW6kuG^AJ-&Doqdz36t-&L0)otpa}c
z9*Q1p|7o<m_5AF4YZ&)6vUe%QKd8{rP_a9F+;Aq-gWnH%|L#nhwm+2N`*G0^zgKe=
z*IlV{|5qE!T*G}|d&{4nH6|e)KfOPEtW*we_?d6@`0q}pGy6HTYnK1`-2eId+lgOo
z{2xwqIyv84P)tP0|5Ln3#J`{X46o0NM*K^ScxZj}`{(^LUp+bObk%#)RlWuPu04tt
z`aK;vu(0Q~NMKs>0YXq%K>(@g36|HU@Pfk0&32dj=QQt&f1+>SS<><1utU#x8LN^+
zeZ9JSQVbe<E~_`0f8OfHJzu=mJp2Q*kA}y-LodbGKKQ}2{Po*a0UwG#w*B3hG<AQ7
z#yNiNE8nk+Jo_j3`QN|(`p+A_)VFG~Ubk0g>v4LLIC=i@;6LwvCLX>2ziOY(ue^Qd
zz8fqRxOcx}>G#=T8}{VCuMf@mv9aRxzlepe>*d6Lcz*o*kAInnoY^J5lhc^Xo(j)r
Ke*8iKId}jE#>y=K

literal 0
HcmV?d00001

diff --git a/applications/foobot/monitor/foobotmonitor.lpi b/applications/foobot/monitor/foobotmonitor.lpi
index c5866bbc6..995a47618 100644
--- a/applications/foobot/monitor/foobotmonitor.lpi
+++ b/applications/foobot/monitor/foobotmonitor.lpi
@@ -26,7 +26,7 @@
       <AutoIncrementBuild Value="True"/>
       <MinorVersionNr Value="2"/>
       <RevisionNr Value="4"/>
-      <BuildNr Value="1"/>
+      <BuildNr Value="2"/>
       <StringTable Comments="Uses Foobot public API to query Foobots" FileDescription="Monitor for Foobot" InternalName="foobotmonitor" LegalCopyright="(c)2016 minesadorada@charcodelvalle.com" LegalTrademarks="Foobot" ProductName="Foobot" ProductVersion="0.0.0.0"/>
     </VersionInfo>
     <BuildModes Count="6">
diff --git a/applications/foobot/monitor/foobotmonitor.lps b/applications/foobot/monitor/foobotmonitor.lps
index 53e1a6eef..bb7d7dc18 100644
--- a/applications/foobot/monitor/foobotmonitor.lps
+++ b/applications/foobot/monitor/foobotmonitor.lps
@@ -3,14 +3,14 @@
   <ProjectSession>
     <PathDelim Value="\"/>
     <Version Value="10"/>
-    <BuildModes Active="linux64"/>
+    <BuildModes Active="win64"/>
     <Units Count="32">
       <Unit0>
         <Filename Value="foobotmonitor.lpr"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="18"/>
         <TopLine Value="13"/>
-        <CursorPos X="11" Y="23"/>
+        <CursorPos X="17" Y="37"/>
         <UsageCount Value="197"/>
         <Loaded Value="True"/>
       </Unit0>
@@ -22,7 +22,7 @@
         <ResourceBaseClass Value="Form"/>
         <IsVisibleTab Value="True"/>
         <TopLine Value="22"/>
-        <CursorPos X="4" Y="33"/>
+        <CursorPos X="76" Y="24"/>
         <UsageCount Value="197"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -158,7 +158,7 @@
         <UnitName Value="Lazarus"/>
         <EditorIndex Value="10"/>
         <TopLine Value="101"/>
-        <CursorPos Y="154"/>
+        <CursorPos X="25" Y="116"/>
         <UsageCount Value="64"/>
         <Loaded Value="True"/>
       </Unit16>
@@ -284,123 +284,123 @@
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="umainform.pas"/>
-        <Caret Line="1350" Column="63" TopLine="1299"/>
+        <Caret Line="1340" Column="54" TopLine="1298"/>
       </Position1>
       <Position2>
         <Filename Value="umainform.pas"/>
-        <Caret Line="1340" Column="54" TopLine="1298"/>
+        <Caret Line="327" Column="47" TopLine="325"/>
       </Position2>
       <Position3>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="327" Column="47" TopLine="325"/>
-      </Position3>
-      <Position4>
         <Filename Value="..\foobot_utility.pas"/>
         <Caret Line="214" Column="22" TopLine="199"/>
+      </Position3>
+      <Position4>
+        <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
+        <Caret Line="121" Column="16" TopLine="109"/>
       </Position4>
       <Position5>
         <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="121" Column="16" TopLine="109"/>
+        <Caret Line="164" Column="16" TopLine="117"/>
       </Position5>
       <Position6>
         <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="164" Column="16" TopLine="117"/>
+        <Caret Line="165" Column="16" TopLine="118"/>
       </Position6>
       <Position7>
         <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="165" Column="16" TopLine="118"/>
+        <Caret Line="221" Column="16" TopLine="174"/>
       </Position7>
       <Position8>
         <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="221" Column="16" TopLine="174"/>
+        <Caret Line="222" Column="16" TopLine="175"/>
       </Position8>
       <Position9>
         <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="222" Column="16" TopLine="175"/>
+        <Caret Line="223" Column="16" TopLine="176"/>
       </Position9>
       <Position10>
         <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="223" Column="16" TopLine="176"/>
+        <Caret Line="240" Column="16" TopLine="193"/>
       </Position10>
       <Position11>
         <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="240" Column="16" TopLine="193"/>
+        <Caret Line="280" Column="12" TopLine="233"/>
       </Position11>
       <Position12>
         <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="280" Column="12" TopLine="233"/>
+        <Caret Line="415" Column="12" TopLine="368"/>
       </Position12>
       <Position13>
         <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="415" Column="12" TopLine="368"/>
+        <Caret Line="486" Column="12" TopLine="439"/>
       </Position13>
       <Position14>
         <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="486" Column="12" TopLine="439"/>
+        <Caret Line="557" Column="107" TopLine="510"/>
       </Position14>
       <Position15>
         <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="557" Column="107" TopLine="510"/>
+        <Caret Line="571" Column="89" TopLine="524"/>
       </Position15>
       <Position16>
         <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="571" Column="89" TopLine="524"/>
+        <Caret Line="575" Column="12" TopLine="540"/>
       </Position16>
       <Position17>
         <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="575" Column="12" TopLine="540"/>
+        <Caret Line="593" Column="12" TopLine="558"/>
       </Position17>
       <Position18>
         <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="593" Column="12" TopLine="558"/>
+        <Caret Line="1276" Column="23" TopLine="1272"/>
       </Position18>
       <Position19>
-        <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="1276" Column="23" TopLine="1272"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="1341" TopLine="1299"/>
       </Position19>
       <Position20>
         <Filename Value="umainform.pas"/>
-        <Caret Line="1341" TopLine="1299"/>
+        <Caret Line="1332" Column="47" TopLine="1299"/>
       </Position20>
       <Position21>
         <Filename Value="umainform.pas"/>
-        <Caret Line="1332" Column="47" TopLine="1299"/>
+        <Caret Line="1333" Column="44" TopLine="1298"/>
       </Position21>
       <Position22>
         <Filename Value="umainform.pas"/>
-        <Caret Line="1333" Column="44" TopLine="1298"/>
+        <Caret Line="1341" Column="50" TopLine="1300"/>
       </Position22>
       <Position23>
         <Filename Value="umainform.pas"/>
-        <Caret Line="1341" Column="50" TopLine="1300"/>
+        <Caret Line="1335" Column="31" TopLine="1301"/>
       </Position23>
       <Position24>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="1335" Column="31" TopLine="1301"/>
+        <Filename Value="uconfigform.pas"/>
+        <Caret Line="45" Column="41" TopLine="33"/>
       </Position24>
       <Position25>
         <Filename Value="uconfigform.pas"/>
-        <Caret Line="45" Column="41" TopLine="33"/>
+        <Caret Line="47" Column="41" TopLine="33"/>
       </Position25>
       <Position26>
-        <Filename Value="uconfigform.pas"/>
-        <Caret Line="47" Column="41" TopLine="33"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="23"/>
       </Position26>
       <Position27>
         <Filename Value="umainform.pas"/>
-        <Caret Line="23"/>
+        <Caret Line="791" Column="74" TopLine="34"/>
       </Position27>
       <Position28>
         <Filename Value="umainform.pas"/>
-        <Caret Line="791" Column="74" TopLine="34"/>
+        <Caret Line="781" Column="12" TopLine="777"/>
       </Position28>
       <Position29>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="781" Column="12" TopLine="777"/>
-      </Position29>
-      <Position30>
         <Filename Value="uconfigform.pas"/>
         <Caret Line="44" Column="65" TopLine="14"/>
+      </Position29>
+      <Position30>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="33" Column="4" TopLine="22"/>
       </Position30>
     </JumpHistory>
   </ProjectSession>
diff --git a/applications/foobot/monitor/foobotmonitor.res b/applications/foobot/monitor/foobotmonitor.res
index afca60b107032a31420a3d4c2770b9b46a23243b..7a52aecb2d2bab1f816c86f44a75d6c3d4e3761b 100644
GIT binary patch
delta 27
jcmccfk>$=umJK)97@0QTWZTZfXw*EBbNfV2MsIxpugnUY

delta 27
jcmccfk>$=umJK)97#TO;WZTZfXxKcFbNfV2MsIxpudxc5

diff --git a/applications/foobot/monitor/umainform.pas b/applications/foobot/monitor/umainform.pas
index 58b07c750..3e0057250 100644
--- a/applications/foobot/monitor/umainform.pas
+++ b/applications/foobot/monitor/umainform.pas
@@ -23,7 +23,7 @@ unit umainform;
 
 REQUIREMENTS
 ============
-* Custom sensors unit from Industrial package (foobot_sendors)
+* Custom sensors unit from Industrial package (foobot_sendors and foobot_sensors.res)
 * Custom httpdclient unit (foobot_httpclient)
 * CryptINI, TChart and Industrial components
 * FPCv3.1.1+ and Lazarus V1.7+
@@ -39,7 +39,7 @@ V0.1.0.0: Save/Load Alltime High/Lows.  Reset values from menu
 V0.1.1.0: Save/Load Colours, Min and Max values to cfg file
 V0.2.1.0: Triggers,Multiple Foobots
 V0.2.2.0: Trigger config form, SaveLoad recommended values
-V0.2.4.0: Embedded help file added
+V0.2.4.0: Embedded help file added, replaced sensors.res with foobot_sensors.res
 V0.2.5.0: ??
 }
 {$ifopt D+}