Revision 6:6a82110ff393, committed 2018-02-19

Comitter:

pietor

Date:

Mon Feb 19 14:44:11 2018 +0000

Parent:

5:14c4e655ccae

Child:

7:8515f205483b

Commit message:

Ontvanger

Changed in this revision

--- a/Ontvanger.cpp	Wed Feb 14 08:54:16 2018 +0000
+++ b/Ontvanger.cpp	Mon Feb 19 14:44:11 2018 +0000
@@ -23,10 +23,11 @@
     return network.available();
 }
 
+/*
 payload_t Ontvanger::read()
 {
     payload_t payload_rx;
     network.read(header_rx,&payload_rx,sizeof(payload_rx));
     
     return payload_rx;
-}
\ No newline at end of file
+}*/
\ No newline at end of file

--- a/Ontvanger.h	Wed Feb 14 08:54:16 2018 +0000
+++ b/Ontvanger.h	Mon Feb 19 14:44:11 2018 +0000
@@ -4,7 +4,6 @@
 #include <RF24Network.h>
 #include <RF24.h>
 
-
 #define nrf_CE      p9
 #define nrf_CSN     p8
 #define spi_SCK     p7

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Verzender.cpp	Mon Feb 19 14:44:11 2018 +0000
@@ -0,0 +1,34 @@
+#include "Verzender.h"
+
+RF24 radio(spi_MOSI, spi_MISO, spi_SCK, nrf_CE, nrf_CSN );
+RF24Network network(radio);
+Timer t;
+unsigned long packets_sent;
+Timer t_packet;
+
+
+
+Verzender::Verzender()
+{
+    radio.begin();
+    network.begin(90,this_node);
+    wait_ms(2000);
+    t.start();
+    t_packet.start();
+}
+
+
+void Verzender::update()
+{
+    network.update();
+}
+
+
+
+bool Verzender::write(payload_t message)
+{
+    RF24NetworkHeader header_tx(other_node);
+    payload_t payload_tx;
+    payload_tx = message;
+    return network.write(header_tx,&payload_tx,sizeof(payload_tx));
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Verzender.h	Mon Feb 19 14:44:11 2018 +0000
@@ -0,0 +1,40 @@
+#ifndef Verzender_h
+#define Verzender_h
+#include "mbed.h"
+#include <RF24Network.h>
+#include <RF24.h>
+
+#define nrf_CE      p9
+#define nrf_CSN     p8
+#define spi_SCK     p7
+#define spi_MOSI    p5
+#define spi_MISO    p6
+
+const uint16_t this_node2 = 11;
+const uint16_t other_node2 = 10;
+
+const unsigned long interval = 100; //ms
+
+
+struct payload_t {
+    bool reedsensor;
+    float milligram;
+};
+
+class Verzender
+{
+private:
+
+
+public:
+    Verzender();
+    void update();
+    bool write(payload_t message);
+};
+
+#endif
+
+
+
+
+

--- a/main.cpp	Wed Feb 14 08:54:16 2018 +0000
+++ b/main.cpp	Mon Feb 19 14:44:11 2018 +0000
@@ -16,18 +16,30 @@
 
 Ontvanger receive;
 
+Timer t;
+
+void acitvateLed()
+{
+    t.reset();
+}
+
 int main()
 {
     pc.baud(9600);
     pc.printf("Ontvangger: \r\n");
+    t.start();
     while(1) {
         receive.update();
         while (receive.available()) {
             payload_t payload;
             payload = receive.read();
-            pc.printf("Received packet -- Reed: %d --- %d mg \r\n",payload.reedsensor,payload.milligram);
-            myled1 = myled2 = myled3 = myled4= payload.reedsensor;
+            pc.printf("%d\r\n",payload.milligram);
+            if (payload.reedsensor)
+                acitvateLed();
         }
-        myled1 = myled2 = myled3 = myled4= 0;
+        if (t.read() <= 1)
+            myled1 = myled2 = myled3 = myled4 = 1;
+        else
+            myled1 = myled2 = myled3 = myled4 = 0;
     }
 }
\ No newline at end of file