Diff: main.cpp

Revision:

7:cbdbaf825b4a

Parent:

6:03ba3e18ced2

Child:

8:62b4607c44ca

--- a/main.cpp	Wed Feb 21 12:09:12 2018 +0000
+++ b/main.cpp	Thu Feb 22 14:07:50 2018 +0000
@@ -13,16 +13,6 @@
 float tare = 0;
 float massa = 0;
 
-/*
-enum State {State_init,
-            State_tare,
-            State_position,
-            State_read,
-            State_send,
-            State_receive
-           };
-*/
-
 Timer t2;
 
 State current_state = State_init;
@@ -83,7 +73,7 @@
             case State_init:
                 pc.baud(9600);
                 wait_ms(1000);
-                pc.printf("--Verzender--Tx\n\r");
+                pc.printf("--Verzender--\n\r");
                 pb.mode(PullUp);
                 setCurrentState(State_read);
                 payload_t payload;
@@ -100,36 +90,37 @@
                 pc.printf("State: tare\n\r");
                 tare = getAverageSamples(50000);
                 pc.printf("tare = %f\r\n",tare*3.3);
-                
+
                 setCurrentState(State_read);
                 break;
 
             case State_read:
-                pc.printf("State: read\n\r");
+                //pc.printf("State: read\n\r");
+                
                 if (!pb) {
                     massa = getAverageTime() - tare;
-                    pc.printf("massa = %f\r\n", massa*3.3);
-                    payload.reedsensor = !pb;
-                    payload.milligram = 2;
-                    setCurrentState(State_send);
+                    //pc.printf("massa = %f\r\n", massa*3.3);
+                    payload.reedsensor = 1;
+                    payload.milligram = massa * 3.3;
+                    //pc.printf("Sent packet1 -- Reed: %d --- %f mg \r\n",payload.reedsensor, payload.milligram);
+                    
+                    bool ok = sent.write(payload);
+                    if (ok) {
+                        pc.printf("ok.\n\r");
+                    } else {
+                        pc.printf("failed.\n\r");
+                    }
+                    //pc.printf("Sent packet2 -- Reed: %d --- %f mg \r\n",payload.reedsensor, payload.milligram);
+                    
+                    setCurrentState(State_receive);
+                    //setCurrentState(State_send);
                 }
 
                 break;
-            
-            case State_send:
-                pc.printf("State: send\n\r");
-                sent.update();
-                bool ok = sent.write(payload);
-                if (ok) {
-                    pc.printf("ok.\n\r");
-                } else {
-                    pc.printf("failed.\n\r");
-                }
-                setCurrentState(State_receive);
-                break;
+
 
             case State_receive:
-                pc.printf("State :receive");
+                //pc.printf("State :receive");
                 sent.update();
                 if (sent.available()) {
                     state_Packet state;