From 3dae0d6d086107886cae289df235bac71a9d3ff3 Mon Sep 17 00:00:00 2001 From: John Hodge Date: Sat, 4 Dec 2010 19:54:57 +0800 Subject: [PATCH] Updated items, set coke port to USB --- RunServerTest | 6 ++++-- items.cfg | 23 ++++++++++++----------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/RunServerTest b/RunServerTest index d4f7d6e..27d943b 100755 --- a/RunServerTest +++ b/RunServerTest @@ -1,7 +1,9 @@ #!/bin/sh +ARGS="--itemsfile items.cfg -p 11020 --cokeport /dev/ttyUSB0" + if [ "x$1" != "x" ]; then - LD_LIBRARY_PATH=. gdb --args ./dispsrv --itemsfile items.cfg -p 11020 + LD_LIBRARY_PATH=. gdb --args ./dispsrv $ARGS else - LD_LIBRARY_PATH=. ./dispsrv --itemsfile items.cfg -p 11020 + LD_LIBRARY_PATH=. ./dispsrv $ARGS fi diff --git a/items.cfg b/items.cfg index 46197b8..49b7ed9 100644 --- a/items.cfg +++ b/items.cfg @@ -2,19 +2,20 @@ # Type ID Price Description # Drinks -coke 0 70 Lemonade -coke 1 71 solo++ -coke 2 70 Solo -coke 3 70 Orange Foo -coke 4 255 V Black -coke 5 101 Coke Zero -coke 6 96 Coke +coke 0 75 Screaming Soda +coke 1 75 Green Solo +coke 2 75 Solo +coke 3 75 Lemonade +coke 4 75 Orange Foo +coke 5 92 NULL Coke +coke 6 93 Coke # Pseudo items -pseudo 0 128 clue # clue.flac -pseudo 1 10 laserprint # print 10 pages -pseudo 2 15 phone # Ring Ring -pseudo 3 2500 membership # here comes the money! +pseudo 0 10 laserprint 5 pages # print 5 pages +pseudo 1 30 manual phone # Ring Ring! +pseudo 2 128 clue # clue.flac - Dont' Ask +pseudo 3 3500 polo postorder # Polo Shirt! (With UCC Sun Logo) +pseudo 4 2500 membership # here comes the money! # Snack machine snack 13 128 Smiths Salt & Vinegar -- 2.20.1