Temp27 / Mbed 2 deprecated 16_PT1000

03082014

Dependencies:   Buffer ConfigFile SDFileSystem mbed mon timer0

Fork of 15_PT1000 by Temp27

Files at this revision

API Documentation at this revision

Revision 8:91ea38fc3675, committed 2014-08-03

Comitter:
rs27
Date:
Sun Aug 03 19:15:35 2014 +0000
Parent:
7:c1602e28a906
Commit message:
03082014

Changed in this revision

DS2482.lib Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
mon.lib Show annotated file Show diff for this revision Revisions of this file
monitor.lib Show diff for this revision Revisions of this file
timer0.lib Show annotated file Show diff for this revision Revisions of this file 
--- a/DS2482.lib	Sun Aug 03 18:25:06 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-http://mbed.org/users/rs27/code/DS2482/#d94037eb31ed

--- a/main.cpp	Sun Aug 03 18:25:06 2014 +0000
+++ b/main.cpp	Sun Aug 03 19:15:35 2014 +0000
@@ -1,4 +1,4 @@
-// Version 12 03.08.2014
+// Version 16 03.08.2014
 // die Ausgabe auf das Format #nr val umgestellt
 // 03.08.14 Monitorbefehle hinzugefügt
 
@@ -8,7 +8,7 @@
 //#include "DS2482.h"
 #include "timer0.h"
 #include "Buffer.h"
-#include "monitor.h"
+#include "mon.h"
 
 #define CR 13
 
@@ -105,6 +105,7 @@
 bool f_flag = true;         // Tropfen sperren / freigeben
 
 int drops = 10;             // Anzahl Tropfen pro Zeiteinheit
+int interval = 60;         // Zeitintervall für das Zählen der Tropfen
 
 float offset = 0.0;
 float soll_wert = 27.0;     // Sollwert für den Temperaturfühler in der Flüssigkeit
@@ -249,7 +250,13 @@
         drops = atoi(value);
         pc.printf("\nAnzahl Tropfen = %d", drops); 
     }
-                      
+
+    if (cfg.getValue("interval", &value[0], sizeof(value))) 
+    {
+        interval = atoi(value);
+        pc.printf("\nIntervalzeit = %d Sekunden", drops); 
+    }
+                          
     if (cfg.getValue("soll", &value[0], sizeof(value))) 
     {
         soll_wert = atof(value);
@@ -279,9 +286,10 @@
        if (tropfen_anz >= drops){
        
             // mit einer 9 die Tropfen sperren
-       if(send_flag){   com.putc('9');
-                        send_flag = false;
-                    }
+            if(send_flag){   
+                com.putc('9');
+                send_flag = false;
+            }
        }
                  
        //-------------------------------------------
@@ -298,14 +306,15 @@
        
        if (down_timer.GetTimerStatus(1) == 0)
        {
-          down_timer.SetCountdownTimer(1,1,1000);
+          down_timer.SetCountdownTimer(1,2,interval);
           
           tropfen_anz = 0;
           
           // mit einer 1 die Tropfen freigeben
-          if (f_flag){ com.putc('1');
-                       send_flag=true;
-                     }
+          if (f_flag){ 
+            com.putc('1');
+            send_flag = true;
+          }
        }
        
        //-------------------------------------------

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mon.lib	Sun Aug 03 19:15:35 2014 +0000
@@ -0,0 +1,1 @@
+http://mbed.org/teams/Temp/code/mon/#0f114d2ac6b6

--- a/monitor.lib	Sun Aug 03 18:25:06 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-http://mbed.org/teams/Temp28/code/monitor/#254f7ffb9b32

--- a/timer0.lib	Sun Aug 03 18:25:06 2014 +0000
+++ b/timer0.lib	Sun Aug 03 19:15:35 2014 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/rs27/code/timer0/#bbd867fd30d1
+http://mbed.org/teams/Temp/code/timer0/#cd53b287f41b