git.ucc.asn.au
/
tpg
/
opendispense2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://mutabah.net/opendispense2
[tpg/opendispense2.git]
/
src
/
server
/
handler_snack.c
diff --git
a/src/server/handler_snack.c
b/src/server/handler_snack.c
index
826851e
..
e8b29ec
100644
(file)
--- a/
src/server/handler_snack.c
+++ b/
src/server/handler_snack.c
@@
-37,23
+37,29
@@
regex_t gSnack_ResponseRegex;
// == CODE ===
int Snack_InitHandler()
{
// == CODE ===
int Snack_InitHandler()
{
- giSnack_SerialFD = open(gsSnack_SerialPort, O_RDWR);
+ giSnack_SerialFD = InitSerial(gsSnack_SerialPort, 9600);
+ if( giSnack_SerialFD == -1 ) {
+ fprintf(stderr, "ERROR: Unable to open snack serial port ('%s')\n", gsSnack_SerialPort);
+ }
+
regcomp(&gSnack_ResponseRegex, "^(\\d\\d\\d)(.*)$", REG_EXTENDED);
return 0;
}
regcomp(&gSnack_ResponseRegex, "^(\\d\\d\\d)(.*)$", REG_EXTENDED);
return 0;
}
-int Snack_CanDispense(int U
ser
, int Item)
+int Snack_CanDispense(int U
NUSED(User)
, int Item)
{
// Sanity please
if( Item < 0 || Item > 99 ) return -1;
{
// Sanity please
if( Item < 0 || Item > 99 ) return -1;
- return 1;
+ // Hmm... could we implement slot statuses?
+
+ return 0;
}
/**
* \brief Actually do a dispense from the coke machine
*/
}
/**
* \brief Actually do a dispense from the coke machine
*/
-int Snack_DoDispense(int U
ser
, int Item)
+int Snack_DoDispense(int U
NUSED(User)
, int Item)
{
char tmp[32];
regmatch_t matches[4];
{
char tmp[32];
regmatch_t matches[4];
@@
-71,5
+77,3
@@
int Snack_DoDispense(int User, int Item)
return 0;
}
return 0;
}
-
-
UCC
git Repository :: git.ucc.asn.au