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
Changed door code to use direct serial instead of llogin
[tpg/opendispense2.git]
/
src
/
server
/
main.c
diff --git
a/src/server/main.c
b/src/server/main.c
index
18c02dc
..
d336b77
100644
(file)
--- a/
src/server/main.c
+++ b/
src/server/main.c
@@
-30,7
+30,7
@@
extern int giServer_Port;
extern char *gsItemListFile;
extern char *gsCoke_SerialPort;
extern char *gsSnack_SerialPort;
extern char *gsItemListFile;
extern char *gsCoke_SerialPort;
extern char *gsSnack_SerialPort;
-extern char *gsDoor_
Password
;
+extern char *gsDoor_
SerialPort
;
// === PROTOTYPES ===
void *Periodic_Thread(void *Unused);
// === PROTOTYPES ===
void *Periodic_Thread(void *Unused);
@@
-60,10
+60,12
@@
void PrintUsage(const char *progname)
fprintf(stderr, " Set debug level (0 - 2, default 0)\n");
fprintf(stderr, " --cokeport\n");
fprintf(stderr, " Coke machine serial port (Default \"/dev/ttyS0\")\n");
fprintf(stderr, " Set debug level (0 - 2, default 0)\n");
fprintf(stderr, " --cokeport\n");
fprintf(stderr, " Coke machine serial port (Default \"/dev/ttyS0\")\n");
- fprintf(stderr, " --doorp
ass
\n");
- fprintf(stderr, " Door
LAT password file (Default empty password
)\n");
+ fprintf(stderr, " --doorp
ort
\n");
+ fprintf(stderr, " Door
modem/relay serial port (Default \"/dev/ttyS3\"
)\n");
fprintf(stderr, " --cokebank\n");
fprintf(stderr, " Coke bank database file (Default \"cokebank.db\")\n");
fprintf(stderr, " --cokebank\n");
fprintf(stderr, " Coke bank database file (Default \"cokebank.db\")\n");
+ fprintf(stderr, " --[dont-]daemonise\n");
+ fprintf(stderr, " Run (or explicitly don't) the server disconnected from the terminal\n");
}
int main(int argc, char *argv[])
}
int main(int argc, char *argv[])
@@
-108,19
+110,9
@@
int main(int argc, char *argv[])
if( i + 1 >= argc ) return -1;
gsSnack_SerialPort = argv[++i];
}
if( i + 1 >= argc ) return -1;
gsSnack_SerialPort = argv[++i];
}
- else if( strcmp(arg, "--doorpass") == 0 ) {
- FILE *fp;
- char buf[30];
+ else if( strcmp(arg, "--doorport") == 0 ) {
if( i + 1 >= argc ) return -1;
if( i + 1 >= argc ) return -1;
- fp = fopen(argv[++i], "r");
- if( !fp ) {
- fprintf(stderr, "ERROR: Unable to read password file\n");
- perror("reading LAT password");
- return -1;
- }
- fgets(buf, sizeof buf, fp);
- fclose(fp);
- gsDoor_Password = strdup(buf);
+ gsDoor_SerialPort = argv[++i];
}
else if( strcmp(arg, "--cokebank") == 0 ) {
if( i + 1 >= argc ) return -1;
}
else if( strcmp(arg, "--cokebank") == 0 ) {
if( i + 1 >= argc ) return -1;
UCC
git Repository :: git.ucc.asn.au