Merge branch 'master' of https://tree.clementinecomputing.com/clementinecomputing/popufare

busunit/DIUv2/diu_kiosk

@@ -10,7 +10,7 @@ xset -dpms
 
 # hide mouse after 0.5 seconds of idle time
 #
-unclutter -idle 0.5 -root &
+unclutter -idle 0.05 -root &
 
 # hide mouse completely
 #
@@ -25,7 +25,10 @@ mv $tmpfn $HOME/.config/chromium/Preferences
 
 # start chromium in kiosk mode
 #
-/usr/bin/chromium-browser --noerrdialogs --disable-infobars --kiosk ./html/index.html
+
+#/usr/bin/chromium-browser --noerrdialogs --disable-infobars --kiosk ./html/index.html
+#
+/usr/bin/chromium-browser --noerrdialogs --disable-infobars --kiosk 'http://localhost:60535'
 
 # refresh
 #

busunit/billdb/bill_communication.c

@@ -507,8 +507,6 @@ int main(int argc, char **argv)
                 {
                      server_fd = connect_to_bill_server();    //if so, try again...
 
-//                     printf("server_fd = %d\n", server_fd);
-
                      if(server_fd >= 0)  //if it worked
                      {
                          input_idx = 0;  //reset our buffer index
@@ -518,6 +516,7 @@ int main(int argc, char **argv)
                      {
                          last_sync_attempt = now;
                      }
+
                 }
             }
         }

busunit/common/common_config.h

@@ -394,8 +394,14 @@
 
 //This defines the expected size of the pass database and its RAM based index tables:
 
-#define NUM_STORED_PASSES	(131072)	//A nice round number that multiplies by sizeof(rider_record) to a page boundary
-#define STORED_PASS_HASH	(131101)	//A prime number larger than NUM_STORED_PASSES
+//#define NUM_STORED_PASSES	(131072)	//A nice round number that multiplies by sizeof(rider_record) to a page boundary
+//#define STORED_PASS_HASH	(131101)	//A prime number larger than NUM_STORED_PASSES
+
+#define NUM_STORED_PASSES	(262144)	//A nice round number that multiplies by sizeof(rider_record) to a page boundary
+#define STORED_PASS_HASH	(262147)	//A prime number larger than NUM_STORED_PASSES
+
+//#define NUM_STORED_PASSES	(1048576)	//A nice round number that multiplies by sizeof(rider_record) to a page boundary
+//#define STORED_PASS_HASH	(1048583)	//A prime number larger than NUM_STORED_PASSES
 
 //This defines the expected size of the billing cache:
 

busunit/passdb/buildit.sh

@@ -5,7 +5,7 @@ tinyscheme_opts="-fpic  -I. -c -g -Wno-char-subscripts -O -DUSE_STRLWR=1 -DSTAND
 rm -f passdb scheme.o
 
 $target_cc $tinyscheme_opts tinyscheme1.39/scheme.c
-$target_cc $target_ccopts -lz -lm -o passdb passdb.c rfid_decoder.c pass_communication.c rules.c ../common/common_defs.c ../common/gpsmath.c ../commhub/commhub.c ../commhub/client_utils.c scheme.o
+$target_cc $target_ccopts -g -o passdb passdb.c rfid_decoder.c pass_communication.c rules.c ../common/common_defs.c ../common/gpsmath.c ../commhub/commhub.c ../commhub/client_utils.c scheme.o -lm -lz
 
 rm -f send_magstripe
 $target_cc $target_ccopts -o send_magstripe send_magstripe.c ../commhub/commhub.c ../common/common_defs.c

busunit/scripts/connection_tether-ssh.sh

@@ -71,7 +71,7 @@ perform_post_connect_checkin()
   #     Send these gathered data to the update daemon.  The leading '#' tells the server that this is a 
   # checkin, not an update request.
   #
-  echo -e "#$busunitnum\t$equipnum\t$mac\t$imei\t$imsi\t$version" | nc localhost $UPDATE_DAEMON_PORT
+  echo -e "#$busunitnum\t$equipnum\t$mac\t$imei\t$imsi\t$version" | nc -q1 localhost $UPDATE_DAEMON_PORT
 }
 
 #    This function generates the server->client port forwards to allow a sysadmin to log into any unit that is on
@@ -213,6 +213,7 @@ while true; do
       perform_post_connect_checkin
 
       debug_print "Touching dropfile and waiting for SSH to terminate..."
+
       # Touch our dropfile indicating the tunnel is up...
       #
       /bin/touch $TUNNEL_DROPFILE