X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fhandler_coke.c;h=b4993878ae2a00652942dc0322c80083a051f96d;hb=0a03be34434e860a0baf2e8657b622e8c4f23d86;hp=b9a9cf3271bbbd6e0a30e8441d7eee1ef165855b;hpb=6d657891a5410b7d93cc90f376a3ef27b72b20f6;p=tpg%2Fopendispense2.git

diff --git a/src/server/handler_coke.c b/src/server/handler_coke.c
index b9a9cf3..b499387 100644
--- a/src/server/handler_coke.c
+++ b/src/server/handler_coke.c
@@ -49,10 +49,11 @@ tHandler	gCoke_Handler = {
 	Coke_DoDispense
 };
 const char	*gsCoke_ModbusAddress = "130.95.13.73";
+ int		giCoke_ModbusPort = 502;
 modbus_t	*gCoke_Modbus;
 time_t	gtCoke_LastDispenseTime;
 time_t	gtCoke_LastReconnectTime;
- int	gbCoke_DummyMode = 1;
+bool	gbCoke_DummyMode = 1;
  int	giCoke_NextCokeSlot = 0;
 
 // == CODE ===
@@ -60,11 +61,7 @@ int Coke_InitHandler()
 {
 	// Configuable dummy/blank mode (all dispenses succeed)
 	// TODO: Find a better way of handling missing/invalid options
-	if( Config_GetValueCount("coke_dummy_mode") > 0 )
-	{
-		gbCoke_DummyMode = Config_GetValue_Bool("coke_dummy_mode", 0);
-		if(gbCoke_DummyMode == -1)	gbCoke_DummyMode = 0;
-	}
+	Config_GetValue_Bool("coke_dummy_mode", &gbCoke_DummyMode);
 
 	// Open modbus
 	if( !gbCoke_DummyMode )
@@ -126,7 +123,7 @@ int Coke_int_ConnectToPLC(void)
 
 	if( !gCoke_Modbus )
 	{
-		gCoke_Modbus = modbus_new_tcp(gsCoke_ModbusAddress, 502);
+		gCoke_Modbus = modbus_new_tcp(gsCoke_ModbusAddress, giCoke_ModbusPort);
 		if( !gCoke_Modbus )
 		{
 			perror("coke - modbus_new_tcp");