return -2;
#if TRACE_COKE
- printf("Coke_CanDispense: Flushing");
+ printf("Coke_CanDispense: Flushing\n");
#endif
- // Flush the input buffer
- {
- char tmpbuf[512];
- read(giCoke_SerialFD, tmpbuf, sizeof(tmpbuf));
- }
// Wait for a prompt
ret = 0;
- do {
+ 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'");
+ printf("Coke_CanDispense: sending 'd7'\n");
#endif
write(giCoke_SerialFD, "d7\r\n", 4);
- } while( WaitForColon() && ret++ < 3 );
+ ret ++;
+ }
- if( ret == 3 ) {
+ if( !(ret < 3) ) {
fprintf(stderr, "Coke machine timed out\n");
return -2; // -EMYBAD
}
// TODO: Handle "not ok" response to D7
#if TRACE_COKE
- printf("Coke_CanDispense: sending 's%i'", Item);
+ printf("Coke_CanDispense: sending 's%i'\n", Item);
#endif
// Ask the coke machine
write(giCoke_SerialFD, tmp, 4);
#if TRACE_COKE
- printf("Coke_CanDispense: reading response");
+ printf("Coke_CanDispense: reading response\n");
#endif
// Read from the machine (ignoring empty lines)
while( (ret = ReadLine(sizeof(tmp)-1, tmp)) == 0 );
printf("ret = %i, tmp = '%s'\n", ret, tmp);
- if( tmp[0] == ':' ) {
+ // Read back-echoed lines
+ while( tmp[0] == ':' || tmp[1] != 'l' )
+ {
ret = ReadLine(sizeof(tmp)-1, tmp);
printf("ret = %i, tmp = '%s'\n", ret, tmp);
}
}
#if TRACE_COKE
- printf("Coke_CanDispense: wait for the prompt again");
+ printf("Coke_CanDispense: wait for the prompt again\n");
#endif
// Eat rest of response
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;
return -2;
#if TRACE_COKE
- printf("Coke_DoDispense: flushing input");
+ printf("Coke_DoDispense: flushing input\n");
#endif
- // Flush the input buffer
+
+ // Wait for prompt
+ ret = 0;
+ while( WaitForColon() && ret < 3 )
{
+ // Flush the input buffer
char tmpbuf[512];
read(giCoke_SerialFD, tmpbuf, sizeof(tmpbuf));
- }
-
- // Wait for prompt
- i = 0;
- do {
#if TRACE_COKE
- printf("Coke_DoDispense: sending 'd7'");
+ printf("Coke_DoDispense: sending 'd7'\n");
#endif
write(Item, "d7\r\n", 4);
- } while( WaitForColon() && i++ < 3 );
+ }
#if TRACE_COKE
- printf("Coke_DoDispense: sending 'd%i'", Item);
+ 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] == ':' ) {
+ // 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");
+ printf("Coke_DoDispense: done\n");
#endif
// TODO: Regex