agri-controller 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 99a49e6fffea6706111ab73523d69f0dae857671
-  data.tar.gz: 521aa3eb58c5d0cb54de7887d196901b00655572
+SHA256:
+  metadata.gz: eb86d25fa1d94427310dd671ce35ab8c93aeaac843c7c3de7d57a30a9963a8f8
+  data.tar.gz: 821344fe0ef6e23e6661ff68a61050843ddd38eff41d0b2efd9da11c225da12a
 SHA512:
-  metadata.gz: a511d8a69403052fa74f8d477413030df0351123941ab489d73afd57a6dbe737d6cbf56f76abf39e0384f7925f140669575da6642d085ddd390cce5433407f6a
-  data.tar.gz: a1573d00b1af0e31d4bbd42ef50259c845cfe112842fc548a2aee219863e78dbc5a60aab2a24bea3f520f6f7282f59230be6b82ebbd8319e4edbd8a65e96cee5
+  metadata.gz: 36251d3861675ba417cffa0fd0d8fec563267356af1673883e630248fe057dea7e0df09fb00dc79c136a4ea641c48433656a8f381ca4d5e9e234a96e84d85289
+  data.tar.gz: 47fe207e6b886186e29e3fcb1c086addf2d44ee2a890098896586a252736310242303872c0bebff67c0a68423e8d60f2b843c65442648645a17a5f6181d36273

data/ChangeLog.txt

@@ -1,5 +1,13 @@
+==0.0.11
+* housa(degree,rh) add
+*  value_controller minorfix   
+   update2021.1.30
+
+==0.0.10
+  some fix for linux update
 ==0.0.9
 * Bit::on?                            fixed
+
 ==0.0.8
 * Fixed for backward compatibility. Not perfect, but available in a few modifications
 

data/LICENSE.txt

@@ -1,6 +1,6 @@
 'agri-controller' can easy to control greenhouse environment using PC.
 
-    Copyright (C) 2009-2014  Takayasu Hayashi (email:  joe.ko9ji@gmail.com )
+    Copyright (C) 2009-2021  Takayasu Hayashi (email:  joe.ko9ji@gmail.com )
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License, version 2, as

data/agri-controller.gemspec

@@ -3,18 +3,18 @@ require './lib/agri-controller/version'
 require './license'
   spec = Gem::Specification.new do |s|
     s.platform = Gem::Platform::RUBY
-    s.summary = "AgriController easily controls the greenhouse with a Personal Computer.(win,linux RS232)"
+    s.summary = "AgriController easily controls the greenhouse with a Personal Computer,also Raspi.(win,linux RS232)"
     s.author="Takayasu Hayashi"
     s.email="joe.ko9ji@gmail.com"
     s.homepage="http://rubygems.org/gems/agri-controller"
     s.name = "agri-controller"
     s.version = AgriController::VERSION
-    s.licenses="GPLv2"
+    s.licenses="GPL-2.0"
     #s.requirements << 'rmagick'
     #s.requirements << 'gruff'
     #s.add_dependency('serialport','>= 1.0.4')
     s.require_path = 'lib'
-    s.has_rdoc=true
+    #s.has_rdoc=true #deprecated
     s.test_files=["test/ts_agri-controller.rb"]
     
     #s.files = Dir.glob("{test,lib}/**/*.rb") 

data/lib/agri-controller/housa.rb

@@ -0,0 +1,154 @@
+#!ruby -Ku
+#coding:utf-8
+module AgriController
+
+module_function
+#return hPa
+#houwa_pressure(Celsius_Degree)
+def houwa_pressure(t)
+  eT=6.1078*10**(7.5*t/(t+237.3))
+end
+
+#return hPa(Pa * 100)
+def houwa_pressure2(t)
+  x=1-(273.15+t)/647.3
+  eT2=221200*Math::E**((-7.76451*x+1.45838*(x**1.5)-2.7758*(x**3)-1.23303*(x**6))/(1-x))
+end
+
+
+#houwa(Celsius_Degree) # =>g/m^3
+def houwa(t)
+ eT=houwa_pressure(t)
+ #et=houwa_pressure2(t)
+ aT=(217*eT)/(t+273.15)
+end
+
+def houwa2(t)
+ #et=houwa_pressure(t)
+ eT=houwa_pressure2(t)
+ aT=(217*eT)/(t+273.15)
+end
+
+#housa(Celsius_degree,Rh(%)) # =>g/m^3
+def housa(t,rh)
+  x=houwa(t)
+  x2=x*rh/100.0
+  x-x2
+end
+
+
+def housa2(t,rh)
+  x=houwa2(t)
+  x2=x*rh/100.0
+  x-x2 
+end
+
+#roten(Celsius_degree,Rh(%)) # =>Celsius_Degree
+def roten(t,rh)
+  ps=houwa_pressure(t)*100
+  e =ps*rh/100.0
+  y=Math.log(e/611.213)
+  if y>=0
+    p "1"
+    td=13.715*y+8.4262*0.1*y**2+1.9048*0.01*y**3+7.8158*0.001*y**4
+  elsif y<0
+    p "2"
+    td2=13.7204*y+7.36631*0.1*y**2+3.32136*0.01*y**3+7.78591*0.001*y**4
+  else
+    p "3"
+    0
+  end
+end
+
+#
+def zettai(t,rh)
+  x=houwa(t)
+  x2=x*rh/100.0
+end
+end
+
+if $0==__FILE__
+  #require "profile"
+  begin
+    #p "[t(℃),rh(%)]="+[ARGV[0],ARGV[1]].inspect
+    print housa(ARGV[0].to_f,ARGV[1].to_f).to_s+"\n"
+  rescue
+    #50.times do
+    puts "ruby ./housa.rb [Celsius Degree] [rh%]=> g/m^3"
+    puts "ruby ./housa.rb 25 60 # =>#{housa(25,60)}"
+    puts
+    p "25 C 60%"
+    p housa(25,60)
+    p housa2(25,60)
+    p "25 C,70%"
+    p housa(25,70)
+    p housa2(25,70)
+    p "25 C,80%"
+    p housa(25,80)
+    p housa2(25,80) 
+    #end
+    p roten(25,80)
+    p zettai(25,80)
+  end
+end
+=begin
+#Difference in the amount of Saturation Water vapor
+飽和水蒸気量差（ある温度と湿度での、湿度１００％と現在の水蒸気量の差）
+飽差の計算
+t＝t　[℃]
+rh=rh[%]
+
+飽和水蒸気量（ほうわすいじょうきりょう）a(T)[g/m3] は1m3の空間に存在できる水蒸気の質量をgで表したものである。容積絶対湿度、飽和水蒸気密度ともいう。これは温度T[℃]が小さいと小さくなる。
+水蒸気を理想気体と見なすとa(T)は以下の式で示される。
+
+    a(T)={{217 * e(T)} \{T+273.15}}
+
+湿度RH[％]は、その温度の飽和水蒸気量に対して、水蒸気量（絶対湿度）との比であらわす。
+飽和水蒸気圧曲線、沸点で大気圧になる。
+空気中の飽和水蒸気圧e(T)は気温できまり、この値を超える分圧を有する水蒸気は安定して存在できない。
+e(T)は近似的にTetens(1930)のパラメータ値によるAugust他の式
+
+    e(T)=6.1078\times 10^{7.5T\over(T+237.3)}
+
+により、指定した温度 T[℃]における飽和水蒸気圧 e(T)[hPa]が求まる。気体の状態方程式により、水蒸気量を計算できる。
+
+臨界圧（＝22.12MPa）まで、良い近似で求めるには、ワグナー（Wagner）式を用い、
+
+    P_{ws} = P_c \times \exp ( \dfrac{A \times x+B \times x^{1.5} + C\times x^3 + D \times x^6}{1-x})
+
+ここで、
+
+    P_{ws}[kPa]ワグナーの厳密水蒸気圧
+    P_c = 22120 [kPa]臨界圧
+    T_c = 647.3 [K]臨界温度
+    T絶対温度[K](T[K] = T[℃]+273.15)
+    x = 1 - \dfrac{T}{T_c}
+    A = -7.76451
+    B = 1.45838
+    C = -2.7758
+    D = -1.23303 
+    
+    
+ t=20
+ => 20 
+ruby-1.9.3-head :033 > aT=(217*eT)/(t+273.15)
+ => 9.089291190842173 
+ruby-1.9.3-head :034 > eT2=221200*Math::E**((-7.76451*x+1.45838*(x**1.5)-2.7758*(x**3)-1.23303*(x**6))/(1-x))
+ => 12.289582804524482 
+ruby-1.9.3-head :035 > 
+ruby-1.9.3-head :036 >   x=1-(273.15+t)/647.3 => 0.5471188011741078 
+ruby-1.9.3-head :037 > eT=6.1078*10**(7.5*t/(t+237.3))
+ => 23.380935143417695 
+ruby-1.9.3-head :038 > aT=(217*eT)/(t+273.15) => 17.307395279282414 
+ruby-1.9.3-head :039 > x=1-(273.15+t)/647.3
+ => 0.5471188011741078 
+ruby-1.9.3-head :040 > eT2=221200*Math::E**((-7.76451*x+1.45838*(x**1.5)-2.7758*(x**3)-1.23303*(x**6))/(1-x))
+ => 23.406201212631604 
+ruby-1.9.3-head :041 > aT=(217*eT2)/(t+273.15)
+ => 17.32609811748613 
+==end
+
+
+=end
+
+

data/lib/agri-controller/value_controller.rb

@@ -5,8 +5,9 @@ module AgriController
   class Value_controller
     attr_accessor:steps,:now_step,:up_sec,:down_sec,:acting
     attr_accessor:set_value,:controll_bool,:reset_time,:emergency
+    attr_accessor:first,:dead_bool,:bool
     
-  def initialize(steps=5,up_sec=60,down_sec=open_sec,sensitivity=1,set_value=20,dead_time=2,verbose=false)
+    def initialize(steps=5,up_sec=60,down_sec=open_sec,sensitivity=1,set_value=20,dead_time=2,verbose=false,first=true)
       @bit=0
 
       @steps            =steps            #多段制御>=1
@@ -16,22 +17,30 @@ module AgriController
       @set_value        =set_value        #設定値
       @dead_time        =dead_time        #不感時間
       @dead_bool        =false
-      @now_step=@steps          #現在の段(2010.5.23変更)
-
-      @controll_bool=false #割り込みswitch(0n,0ff)
+      if first
+        @now_step=@steps          #現在の段(2010.5.23変更)
+      else
+        @now_step=0
+      end
+      @controll_bool=false #割り込みswitch(0n,0ff)[move:true],[stop:false]
       @time=Time.now
       @acting=false
       @bool=false         #true(on)  false(off)方向
       @verbose=verbose
       @reset_time=Time.now+@up_sec*@steps+3
       @emergency=false
+      @first=first
       p "Value_controller initialized at #{@reset_time}" if @verbose
     end
-    
+        
     def switch
       if @now_step==0 or @now_step==@steps or  @emergency==true
         return true
       else
+        if @dead_bool==true && @acting==true
+            @controll_bool=false
+        end
+        
         return @controll_bool
       end
     end
@@ -45,23 +54,23 @@ module AgriController
     end
     
     def before_value_controll(now_value)
-      if now_value > @set_value+@sensitivity*@steps+1
+      if false#now_value > @set_value+@sensitivity*@steps+@sensitivity
         #too high
         p "too high!" if $DEBUG
         
         @emergency=true
+        @now_step=@steps
         return true
       
-      elsif now_value < @set_value-1
+      elsif false#now_value < @set_value-@sensitivity
         #too low
         p "too low!" if $DEBUG
         
         @emergency=true
+        @now_step=0
         return false
-      
-      elsif Time.now < @reset_time
-        return true#open first signal(close:false)
-      
+      elsif Time.now <= @reset_time
+        return @first
       else#normaly
         @emergency=false
         return @bool
@@ -69,16 +78,17 @@ module AgriController
     end
     
     def value_controll(now_value)
+      if Time.now > @reset_time
       if @acting==false
         #now_value:nil or tempareture
         if now_value != nil
-          high=(now_value <=> @set_value+@sensitivity*(@now_step+1))
-          low =(now_value <=> (@set_value+@sensitivity*(@now_step))-2)
+          high=(now_value <=> @set_value+@sensitivity*(@now_step)+@sensitivity)
+          low =(now_value <=> (@set_value+@sensitivity*(@now_step))-@sensitivity*2)
         else
-          high=1#温度を下げる方向へセット
+          high=0#そのまま　　#1:温度を下げる方向へセット
           low=0 #そのまま
           p Time.now.inspect+" :"+now_value.inspect
-          raise "value_controller.rb:60 error!!"
+          #raise "value_controller.rb:60 error!!"
         end
         
         #もし動作中なら、そのときの温度に関係なく動作続行（下記の判定は読みとばす）
@@ -125,9 +135,10 @@ module AgriController
         if @bool==true
           x=pulse_timer([@time,@up_sec])
           y=pulse_timer([@time,@up_sec+@dead_time])
-        else #@bool==false
+        elsif @bool==false
           x=pulse_timer([@time,@down_sec])
           y=pulse_timer([@time,@down_sec+@dead_time])
+        else
         end
         if y==true
           @acting=true
@@ -136,30 +147,17 @@ module AgriController
         end
         
         if x==true
-        elsif x==false && y==true
+        elsif x!=true && y==true
           switch_off
           @dead_bool = true
         else
-          @dead_bool = false
+          if x!=true && y!=true
+            @dead_bool = false
+          end
         end
-      before_value_controll(now_value)#return
-      
-=begin
-      if now_value > @set_value+@sensitivity*@steps+1
-        #too high
-        p "too high!" if $DEBUG
-        @emergency=true
-        return true
-      elsif now_value < @set_value-1
-        p "too low!" if $DEBUG
-        #too low
-        @emergency=true
-        return false
-      else#normaly
-        @emergency=false
-        return @bool
-      end
-=end
+    else #reset_time
+    end
+      before_value_controll(now_value)
     end
     
     def step_up

data/lib/agri-controller/version.rb

@@ -2,6 +2,6 @@
 #coding:utf-8
 module AgriController
   module_function
-  VERSION      = "0.0.10"
+  VERSION      = "0.0.11"
   MINOR_VERSION="0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agri-controller
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Takayasu Hayashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2021-01-30 00:00:00.000000000 Z
 dependencies: []
 description: "    A few graphic scripts can load below.\n      No need \"gruff\".\n
   \     You can use \"gnuplot\",\"R\",or some useful graphic aplications.)\n    \n
@@ -18,53 +18,54 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/agri-controller/device/mch383.rb
+- ChangeLog.txt
+- LICENSE.txt
+- agri-controller.gemspec
+- gpl-2.0.txt
+- lib/agri-controller.rb
+- lib/agri-controller/bcc.rb
+- lib/agri-controller/bit.rb
+- lib/agri-controller/device.rb
+- lib/agri-controller/device/dacs.rb
 - lib/agri-controller/device/kr.rb
 - lib/agri-controller/device/ma.rb
-- lib/agri-controller/device/dacs.rb
+- lib/agri-controller/device/mch383.rb
 - lib/agri-controller/device/tr.rb
 - lib/agri-controller/device/wr1010.rb
-- lib/agri-controller/value_controller.rb
-- lib/agri-controller/multiple_pulse_timer.rb
 - lib/agri-controller/dt.rb
-- lib/agri-controller/bcc.rb
-- lib/agri-controller/gruff/thermo_gruff.rb
+- lib/agri-controller/error_caption.rb
+- lib/agri-controller/gruff.rb
+- lib/agri-controller/gruff/base.rb
+- lib/agri-controller/gruff/chdata.rb
 - lib/agri-controller/gruff/join_csv.rb
-- lib/agri-controller/gruff/thermo_gruff_loop.rb
 - lib/agri-controller/gruff/rename_csv.rb
-- lib/agri-controller/gruff/thermo_gruff_generate.rb
 - lib/agri-controller/gruff/thermo_data_each_day.rb
-- lib/agri-controller/gruff/base.rb
-- lib/agri-controller/gruff/chdata.rb
+- lib/agri-controller/gruff/thermo_gruff.rb
 - lib/agri-controller/gruff/thermo_gruff2.rb
-- lib/agri-controller/version.rb
-- lib/agri-controller/setting_io.rb
-- lib/agri-controller/webrick_test.rb
-- lib/agri-controller/wet_sensor.rb
-- lib/agri-controller/bit.rb
-- lib/agri-controller/main_new.rb
-- lib/agri-controller/web.rb
+- lib/agri-controller/gruff/thermo_gruff_generate.rb
+- lib/agri-controller/gruff/thermo_gruff_loop.rb
+- lib/agri-controller/housa.rb
 - lib/agri-controller/loger.rb
-- lib/agri-controller/main_linux.rb
 - lib/agri-controller/main.rb
-- lib/agri-controller/ttyUSB_watchdog.rb
-- lib/agri-controller/save_threads.rb
-- lib/agri-controller/device.rb
-- lib/agri-controller/gruff.rb
-- lib/agri-controller/error_caption.rb
+- lib/agri-controller/main_linux.rb
+- lib/agri-controller/main_new.rb
+- lib/agri-controller/multiple_pulse_timer.rb
 - lib/agri-controller/n_dan_thermo.rb
-- lib/agri-controller.rb
-- test/ts_agri-controller.rb
-- test/tc_trigger.rb
-- test/tc_bit.rb
-- agri-controller.gemspec
-- ChangeLog.txt
-- LICENSE.txt
+- lib/agri-controller/save_threads.rb
+- lib/agri-controller/setting_io.rb
+- lib/agri-controller/ttyUSB_watchdog.rb
+- lib/agri-controller/value_controller.rb
+- lib/agri-controller/version.rb
+- lib/agri-controller/web.rb
+- lib/agri-controller/webrick_test.rb
+- lib/agri-controller/wet_sensor.rb
 - license.rb
-- gpl-2.0.txt
+- test/tc_bit.rb
+- test/tc_trigger.rb
+- test/ts_agri-controller.rb
 homepage: http://rubygems.org/gems/agri-controller
 licenses:
-- GPLv2
+- GPL-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -72,20 +73,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: AgriController easily controls the greenhouse with a Personal Computer.(win,linux
-  RS232)
+summary: AgriController easily controls the greenhouse with a Personal Computer,also
+  Raspi.(win,linux RS232)
 test_files:
 - test/ts_agri-controller.rb