Diff: source/main.cpp

Revision:

80:6e3eb8246ced

Parent:

77:c2e22d1e5d44

Child:

81:a869abf56e85

--- a/source/main.cpp	Sat Apr 07 17:43:22 2018 +0000
+++ b/source/main.cpp	Sun Apr 08 10:43:33 2018 +0000
@@ -31,20 +31,24 @@
 s_time outputTime;
 s_time currentTime;
 s_medContainer medication;
-s_medContainer medInventory;
+//s_medContainer medInventory;
+s_medInventory medInventory;
 
 int success = 1;
 
-char user = 0;
-
+char user = 1;
+/*
 char med1[] = "A";
 char med2[] = "B";
 char med3[] = "C";
 char med4[] = "D";
 char med5[] = "E";
 char med6[] = "F";
+*/
+char fail[] = "shit happens";
 
-char fail[] = "shit happens";
+char *send;
+
 /*********/
 
 void summ(void)
@@ -60,12 +64,12 @@
 int main()
 {
     /* SD write Test*/
-    
+
     medicationTime = getTime();
 
     outputTime = getTime();
-    
-    currentTime = getTime();
+
+    medInventory.currentTime = getTime();
 
     medication.container[0] = 1;
     medication.container[1] = 2;
@@ -73,14 +77,14 @@
     medication.container[3] = 1;
     medication.container[4] = 1;
     medication.container[5] = 2;
-
-    medInventory.container[0] = 5;
-    medInventory.container[1] = 10;
-    medInventory.container[2] = 15;
-    medInventory.container[3] = 20;
-    medInventory.container[4] = 25;
-    medInventory.container[5] = 30;
-    
+    /*
+        medInventory.container[0] = 5;
+        medInventory.container[1] = 10;
+        medInventory.container[2] = 15;
+        medInventory.container[3] = 20;
+        medInventory.container[4] = 25;
+        medInventory.container[5] = 30;
+    */
     /************/
 
     pc.baud(460800);
@@ -330,7 +334,8 @@
 
             case 61:
                 printf("write_medInventory\n\r");
-                write_medInventory(medInventory,currentTime,med1,med2,med3,med4,med5,med6);
+                //write_medInventory(medInventory,currentTime,med1,med2,med3,med4,med5,med6);
+                write_medInventory(medInventory);
                 printf("done\n\r");
                 state = 47;
 
@@ -343,21 +348,37 @@
                 state = 47;
 
                 break;
-            
+
             case 63:
                 printf("erase_errorPotocol\n\r");
                 erase_medError();
                 state = 47;
-            
+
                 break;
 
             case 64:
                 printf("erase_medPotocol\n\r");
                 erase_medProtocol();
                 state = 47;
-            
+
+                break;
+
+            case 65:
+                printf("read_medPotocol\n\r");
+                send = read_medProtocol(user);
+                printf("%s", send);
+                state = 47;
+
                 break;
-                
+
+            case 66:
+                printf("read_medInventory\n\r");
+                medInventory = read_medInventory();
+                printf("done\r\n");
+                printf("%s", medInventory.pill[0]);
+                state = 47;
+                break;
+
             default:
                 state = 47; /* Go to State Switch */
                 break;