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
Server - Slight fixes to coke handler to cope with the machine being dodge
[tpg/opendispense2.git]
/
src
/
server
/
handler_coke.c
diff --git
a/src/server/handler_coke.c
b/src/server/handler_coke.c
index
58e3b79
..
fffa7b6
100644
(file)
--- a/
src/server/handler_coke.c
+++ b/
src/server/handler_coke.c
@@
-60,7
+60,7
@@
int Coke_InitHandler()
{
CompileRegex(&gCoke_StatusRegex, "^slot\\s+([0-9]+)\\s+([^:]+):([a-zA-Z]+)\\s*", REG_EXTENDED);
- printf("
connecting to coke machine...\n"
);
+ printf("
Connecting to coke machine on '%s'\n", gsCoke_SerialPort
);
giCoke_SerialFD = InitSerial(gsCoke_SerialPort, 9600);
if( giCoke_SerialFD == -1 ) {
@@
-73,23
+73,28
@@
int Coke_InitHandler()
// Reset the slot names.
// - Dunno why this is needed, but the machine plays silly
// sometimes.
- Writef("n0 Slot0\n");
+ Writef("\r\n\r\n");
+ WaitForColon();
+ Writef("n0 Slot0\r\n");
if( !WaitForColon() )
{
- Writef("n1 Slot1\n");
+ Writef("n1 Slot1\
r\
n");
WaitForColon();
- Writef("n2 Slot2\n");
+ Writef("n2 Slot2\
r\
n");
WaitForColon();
- Writef("n3 Slot3\n");
+ Writef("n3 Slot3\
r\
n");
WaitForColon();
- Writef("n4 Slot4\n");
+ Writef("n4 Slot4\
r\
n");
WaitForColon();
- Writef("n5 Slot5\n");
+ Writef("n5 Slot5\r\n");
+ WaitForColon();
+ Writef("n6 Coke\r\n");
WaitForColon();
- Writef("n6 Coke\n");
Coke_int_UpdateSlotStatuses();
}
+ else
+ fprintf(stderr, "Coke machine timed out.\n");
}
AddPeriodicFunction(Coke_int_UpdateSlotStatuses);
@@
-154,7
+159,8
@@
void Coke_int_UpdateSlotStatuses(void)
for( i = 0; i <= 6; i ++ )
{
- len = ReadLine(sizeof tmp, tmp);
+ // Read until non-blank line
+ while( (len = ReadLine(sizeof tmp, tmp)) == 0 ) ;
if( len == -1 ) {
TRACE("Read failed on slot %i\n", i);
goto ret; // I give up :(
@@
-182,7
+188,11
@@
int Coke_CanDispense(int UNUSED(User), int Item)
// Can't dispense if the machine is not connected
if( giCoke_SerialFD == -1 )
return -2;
-
+
+ // HACK!
+ // 2011-10-21: The sensors in slot 1 and 3 a bad, just ignore the sensor result
+ if( Item == 1 || Item == 3 ) return 0;
+
return gaCoke_CachedStatus[Item];
}
@@
-300,7
+310,10
@@
char ReadChar()
FD_SET(giCoke_SerialFD, &readfs);
ret = select(giCoke_SerialFD+1, &readfs, NULL, NULL, &timeout);
- if( ret == 0 ) return 0; // Timeout
+ if( ret == 0 ) {
+ fprintf(stderr, "ReadChar: Timeout of %is expired\n", READ_TIMEOUT);
+ return 0; // Timeout
+ }
if( ret != 1 ) {
printf("ReadChar: select return %i\n", ret);
return 0;
UCC
git Repository :: git.ucc.asn.au