#include <sys/stat.h>
#include <fcntl.h>
#include <regex.h>
+#include <stdarg.h>
+
+#define READ_TIMEOUT 2 // 2 seconds for ReadChar
+#define TRACE_COKE 1
// === IMPORTS ===
int Coke_InitHandler();
int Coke_CanDispense(int User, int Item);
int Coke_DoDispense(int User, int Item);
+ int Writef(const char *Format, ...);
int WaitForColon();
int ReadLine(int len, char *output);
if( giCoke_SerialFD == -1 ) {
fprintf(stderr, "ERROR: Unable to open coke serial port ('%s')\n", gsCoke_SerialPort);
}
+ else {
+ // Reset the slot names.
+ // - Dunno why this is needed, but the machine plays silly
+ // sometimes.
+ Writef("n0 Slot0\n");
+ if( !WaitForColon() )
+ {
+ Writef("n1 Slot1\n");
+ WaitForColon();
+ Writef("n2 Slot2\n");
+ WaitForColon();
+ Writef("n3 Slot3\n");
+ WaitForColon();
+ Writef("n4 Slot4\n");
+ WaitForColon();
+ Writef("n5 Slot5\n");
+ WaitForColon();
+ Writef("n6 Coke\n");
+ }
+ }
CompileRegex(&gCoke_StatusRegex, "^slot\\s+([0-9]+)\\s+([^:]+):([a-zA-Z]+)\\s*", REG_EXTENDED);
return 0;
if( giCoke_SerialFD == -1 )
return -2;
+ #if TRACE_COKE
+ printf("Coke_CanDispense: Flushing\n");
+ #endif
+
+
// Wait for a prompt
ret = 0;
- do {
- write(giCoke_SerialFD, "d7\r\n", 4);
- } while( WaitForColon() && ret++ < 3 );
-
- if( ret == 3 ) {
+ while( WaitForColon() && ret < 3 )
+ {
+ // Flush the input buffer
+ char tmpbuf[512];
+ read(giCoke_SerialFD, tmpbuf, sizeof(tmpbuf));
+ #if TRACE_COKE
+ printf("Coke_CanDispense: sending 'd7'\n");
+ #endif
+ Writef("d7\r\n");
+ ret ++;
+ }
+ // Check for a timeout error
+ if( !(ret < 3) ) {
fprintf(stderr, "Coke machine timed out\n");
return -2; // -EMYBAD
}
+
+ // You need to do a 'd7' before reading the status
+ // - Otherwise it sometimes reports a full slot as empty
+ // [TPG] (2011-02-19)
+ if( ret == 0 )
+ {
+ Writef("d7\r\n");
+ WaitForColon();
+ }
// TODO: Handle "not ok" response to D7
+ #if TRACE_COKE
+ printf("Coke_CanDispense: sending 's%i'\n", Item);
+ #endif
+
// Ask the coke machine
- sprintf(tmp, "s%i\r\n", Item);
- write(giCoke_SerialFD, tmp, 4);
+ Writef("s%i\r\n", Item);
+ #if TRACE_COKE
+ printf("Coke_CanDispense: reading response\n");
+ #endif
// Read from the machine (ignoring empty lines)
while( (ret = ReadLine(sizeof(tmp)-1, tmp)) == 0 );
+ #if TRACE_COKE
printf("ret = %i, tmp = '%s'\n", ret, tmp);
- if( tmp[0] == ':' ) {
+ #endif
+ // Read back-echoed lines
+ while( tmp[0] == ':' || tmp[1] != 'l' )
+ {
ret = ReadLine(sizeof(tmp)-1, tmp);
printf("ret = %i, tmp = '%s'\n", ret, tmp);
}
}
return -1;
}
+
+ #if TRACE_COKE
+ printf("Coke_CanDispense: wait for the prompt again\n");
+ #endif
// Eat rest of response
WaitForColon();
// Get slot status
tmp[ matches[3].rm_eo ] = '\0';
status = &tmp[ matches[3].rm_so ];
-
- printf("Machine responded slot status '%s'\n", status);
+
+ #if TRACE_COKE
+ printf("Coke_CanDispense: Machine responded slot status '%s'\n", status);
+ #endif
if( strcmp(status, "full") == 0 )
return 0;
int Coke_DoDispense(int UNUSED(User), int Item)
{
char tmp[32];
- int i, ret;
+ int ret;
// Sanity please
if( Item < 0 || Item > 6 ) return -1;
// Can't dispense if the machine is not connected
if( giCoke_SerialFD == -1 )
return -2;
-
+
+ #if TRACE_COKE
+ printf("Coke_DoDispense: flushing input\n");
+ #endif
+
// Wait for prompt
- i = 0;
- do {
- write(Item, "d7\r\n", 4);
- } while( WaitForColon() && i++ < 3 );
+ ret = 0;
+ while( WaitForColon() && ret < 3 )
+ {
+ // Flush the input buffer
+ char tmpbuf[512];
+ read(giCoke_SerialFD, tmpbuf, sizeof(tmpbuf));
+ #if TRACE_COKE
+ printf("Coke_DoDispense: sending 'd7'\n");
+ #endif
+ Writef("d7\r\n");
+ }
+ #if TRACE_COKE
+ printf("Coke_DoDispense: sending 'd%i'\n", Item);
+ #endif
// Dispense
- sprintf(tmp, "d%i\r\n", Item);
- write(giCoke_SerialFD, tmp, 4);
-
- // Read empty lines
- while( (ret = ReadLine(sizeof(tmp)-1, tmp)) == -1 );
- if( ret == -1 ) return -1;
- // Read d%i
- while( tmp[0] == ':' ) {
+ Writef("d%i\r\n", Item);
+
+ // Read empty lines and echo-backs
+ do {
ret = ReadLine(sizeof(tmp)-1, tmp);
if( ret == -1 ) return -1;
- }
- // Get status
- ret = ReadLine(sizeof(tmp)-1, tmp);
- if( ret == -1 ) return -1;
+ #if TRACE_COKE
+ printf("Coke_DoDispense: read %i '%s'\n", ret, tmp);
+ #endif
+ } while( ret == 0 || tmp[0] == ':' || tmp[0] == 'd' );
WaitForColon(); // Eat up rest of response
+
+ #if TRACE_COKE
+ printf("Coke_DoDispense: done\n");
+ #endif
// TODO: Regex
if( strcmp(tmp, "ok") == 0 ) {
int ret;
struct timeval timeout;
- timeout.tv_sec = 5; // 5 second timeout
+ timeout.tv_sec = READ_TIMEOUT;
timeout.tv_usec = 0;
FD_ZERO(&readfs);
return ch;
}
+int Writef(const char *Format, ...)
+{
+ va_list args;
+ int len;
+
+ va_start(args, Format);
+ len = vsnprintf(NULL, 0, Format, args);
+ va_end(args);
+
+ {
+ char buf[len+1];
+ va_start(args, Format);
+ vsnprintf(buf, len+1, Format, args);
+ va_end(args);
+
+ #if DEBUG
+ printf("Writef: %s", buf);
+ #endif
+
+ return write(giCoke_SerialFD, buf, len);
+ }
+
+}
+
int WaitForColon()
{
fd_set readfs;
git.ucc.asn.au / tpg / opendispense2.git / blobdiff
UCC git Repository :: git.ucc.asn.au