Daniel Yang / Mbed 2 deprecated Song_Control

working version of song control with initialization from sd card

Dependencies:   MFRC522 NRF2401P SDFileSystem SPI_TFT_ILI9341 TFT_fonts mbed

Fork of Song_Control by Malcolm McCulloch

Files at this revision

API Documentation at this revision

Revision 6:00a132a076d5, committed 2016-02-29

Comitter:
dxyang
Date:
Mon Feb 29 11:04:16 2016 +0000
Parent:
5:88c516cf34e6
Child:
7:0aee09577ad3
Commit message:
placeholder functions for transmitting battery pickup and dropoff added

Changed in this revision

hub.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/hub.cpp	Mon Feb 29 10:55:39 2016 +0000
+++ b/hub.cpp	Mon Feb 29 11:04:16 2016 +0000
@@ -232,6 +232,22 @@
     printf("Tx %s [nrf:%s] \n\r", txBuff,nrf1.statusString());
 #endif  
 }
+
+/**
+* Sends a signal to a locker that the current user is picking up numBatteries batteries
+*/
+void txBatteryPickUp(int numBatteries) {
+
+}
+
+/**
+* Sends a signal to a locker that the current user is dropping off numBatteries batteries
+*/
+void txBatteryDropOff(int numBatteries) {
+
+}
+
+
 /*************************************************************************************************/
 /* Initialization */
 /*************************************************************************************************/
@@ -821,14 +837,17 @@
     switch(numBatteries) {
         case 1:
             logActionWithUserInfoH(hubAction_OneBatteryDropped);
+            txBatteryDropOff(1);
             allUsersH[currentUserH].batteriesOut--;
             break;
         case 2:
             logActionWithUserInfoH(hubAction_TwoBatteryDropped);
+            txBatteryDropOff(2);
             allUsersH[currentUserH].batteriesOut -= 2;
             break;
         case 3:
             logActionWithUserInfoH(hubAction_ThreeBatteryDropped);
+            txBatteryDropOff(3);
             allUsersH[currentUserH].batteriesOut -= 3;
             break;
     }
@@ -846,14 +865,17 @@
     switch(numBatteries) {
         case 1:
             logActionWithUserInfoH(hubAction_OneBatteryPicked);
+            txBatteryPickUp(1);
             allUsersH[currentUserH].batteriesOut++;
             break;
         case 2:
             logActionWithUserInfoH(hubAction_TwoBatteryPicked);
+            txBatteryPickUp(2);
             allUsersH[currentUserH].batteriesOut += 2;
             break;
         case 3:
             logActionWithUserInfoH(hubAction_ThreeBatteryPicked);
+            txBatteryPickUp(3);
             allUsersH[currentUserH].batteriesOut += 3;
             break;
     }