PES 4 - Smart Medication Dispenser / PES4_ProgrammeforDesignReview2

Dependencies:   SDFileSystem mbed

Fork of PES4_Programme by PES 4 - Smart Medication Dispenser

Revision:
79:c825bd2dea81
Parent:
77:c2e22d1e5d44
Parent:
76:53a25f1dc2b6
Child:
82:2fc026430ff2
--- a/source/main.cpp	Sun Apr 08 02:30:16 2018 +0000
+++ b/source/main.cpp	Sun Apr 08 17:29:08 2018 +0000
@@ -3,6 +3,7 @@
 #define     DEMOTIME    5
 
 int state = 44;
+
 int oldState;
 
 Serial pc(USBTX, USBRX); // tx, rx
@@ -26,7 +27,6 @@
 int r,b,g;
 
 /* SD write Test*/
-
 s_time medicationTime;
 s_time outputTime;
 s_time currentTime;
@@ -47,6 +47,7 @@
 char fail[] = "shit happens";
 /*********/
 
+/* Switch Summer On/Off for demo Tool */
 void summ(void)
 {
     if(summer.read()>0) {
@@ -60,11 +61,11 @@
 int main()
 {
     /* SD write Test*/
-    
+
     medicationTime = getTime();
 
     outputTime = getTime();
-    
+
     currentTime = getTime();
 
     medication.container[0] = 1;
@@ -80,7 +81,7 @@
     medInventory.container[3] = 20;
     medInventory.container[4] = 25;
     medInventory.container[5] = 30;
-    
+
     /************/
 
     pc.baud(460800);
@@ -96,44 +97,45 @@
                 printf("Hello World");
                 state = 47;
                 break;
-                /*            case 1:
-                                break;
-                            case 2:
-                                break;
-                            case 3:
-                                break;
+            case 1:
+                break;
+            case 2:
+                break;
+            case 3:
+                break;
 
-                            case 10:
-                                break;
-                            case 11:
-                                break;
+            case 10:
+                break;
+            case 11:
+                break;
 
-                            case 15:
-                                break;
-                            case 16:
-                                break;
-                            case 17:
-                                break;
+            case 15:
+                break;
+            case 16:
+                break;
+            case 17:
+                break;
 
-                            case 25:
-                                break;
-                            case 26:
-                                break;
-                            case 27:
-                                break;
-                            case 28:
-                                break;
+            case 25:
+                break;
+            case 26:
+                break;
+            case 27:
+                break;
+            case 28:
+                break;
 
 
-                            case 35:
-                                break;
-                            case 36:
-                                break;
-                            case 37:
-                                break;
-                            case 38:
-                                break;
-                */
+            case 35:
+                break;
+            case 36:
+                break;
+            case 37:
+                break;
+            case 38:
+                break;
+
+
                 /**************************************************************/
                 /* Test Zone */
 
@@ -173,7 +175,13 @@
                 /* Console State Switch */
             case 47:
                 printf("\n\rState Switch: Enter next State: \n\r");
-                printf("45\tset Time\n\r46\tread Time\n\r47\tState Switch\n\r48\tServo Board Test Tool\n\r49\tenable servo output\n\r50\tdisable servo output\n\r51\ttest SD Card\n\r52\tread medication\n\r53\tMedication display test tool\n\r60\twrite_medProtocol test\n\r61\twrite_medInventory test\n\r62\twrite_medError test\n\r63\terase_errorPotocol test\n\r64\terase_medPotocol\n\r");
+                printf("45\tset Time\n\r46\tread Time\n\r47\tState Switch\n\r48\tServo Board Test Tool\n\r");
+                printf("49\tenable servo output\n\r50\tdisable servo output\n\r");
+                printf("51\ttest SD Card\n\r52\tread medication\n\r53\tMedication display test tool\n\r");
+                printf("54\tWrite Medication\n\r55\tDemo Tool for Summer and RGB LED\n\r");
+                printf("60\t        \n\r");
+                printf("61\t        \n\r");
+                printf("62\t        \n\r");
                 pc.scanf("%d", &state);
                 printf("Switch to State %d\n\r",state);
                 fflush(stdin);
@@ -260,54 +268,59 @@
                 /* Demo Tool */
                 enableOutput();
                 printf("Servo output enabled\r\n\n");
-                //summer.period_us(500);
-                //summer.write(0.5f);
-                //wait(3);
-                //summer.write(0.0f);
+                summer.period_us(500);
+                summer.write(0.5f);
+                wait(3);
+                summer.write(0.0f);
 
-                //userButton1.fall(&summ);
+                userButton1.fall(&summ);
+
+                printf("Summer Interrupt on Button 0 enabled\n\r");
 
                 color = 0xFFFFFF;
                 colorTime = 0;
-
                 setLED(0,color);
                 wait(5);
-                printf("start loop\n\r");
+
+                printf("start fading loop for DEMOTIME loops\n\r");
+
                 while(colorTime < DEMOTIME) {
                     printf("fade1\n\r");
                     for(r = 0; r <= 255; r++) {
                         color &= 0x00FFFF;
                         color |= (r<<16);
-                        printf("color = %d\n\r",color);
                         setLED(0,color);
                         wait_ms(FADESPEED);
                     }
-                    printf("fade2");
+                    printf("fade2\n\r");
                     for(b = 255; b >= 0; b--) {
                         color &= 0xFFFF00;
                         color |= b;
                         setLED(0,color);
                         wait_ms(FADESPEED);
                     }
-                    printf("fade3");
+                    printf("fade3\n\r");
                     for(g = 0; g <= 255; g++) {
                         color &= 0xFF00FF;
                         color |= (g<<8);
                         setLED(0,color);
                         wait_ms(FADESPEED);
                     }
+                    printf("fade4\n\r");
                     for(r = 255; r > 0; r--) {
                         color &= 0x00FFFF;
                         color |= (r<<16);
                         setLED(0,color);
                         wait_ms(FADESPEED);
                     }
+                    printf("fade5\n\r");
                     for(b = 0; b <= 255; b++) {
                         color &= 0xFFFF00;
                         color |= b;
                         setLED(0,color);
                         wait_ms(FADESPEED);
                     }
+                    printf("fade6\n\r");
                     for (g = 255; g > 0; g--) {
                         color &= 0xFF00FF;
                         color |= (g<<8);
@@ -316,7 +329,7 @@
                     }
                     colorTime++;
                 }
-                printf("exit demo");
+                printf("exit demo tool\n\r");
 
                 break;
 
@@ -343,21 +356,21 @@
                 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;
-                
+
             default:
                 state = 47; /* Go to State Switch */
                 break;