Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
UCC
OpenDispense2
Commits
cd8724a2
Commit
cd8724a2
authored
Mar 15, 2015
by
Mark Tearle
Browse files
gsCoke_ModbusPort should be giCoke_ModbusPort
parent
6b38df8f
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/server/handler_coke.c
View file @
cd8724a2
...
...
@@ -49,7 +49,7 @@ tHandler gCoke_Handler = {
Coke_DoDispense
};
const
char
*
gsCoke_ModbusAddress
=
"130.95.13.73"
;
int
g
s
Coke_ModbusPort
=
502
;
int
g
i
Coke_ModbusPort
=
502
;
modbus_t
*
gCoke_Modbus
;
time_t
gtCoke_LastDispenseTime
;
time_t
gtCoke_LastReconnectTime
;
...
...
@@ -127,7 +127,7 @@ int Coke_int_ConnectToPLC(void)
if
(
!
gCoke_Modbus
)
{
gCoke_Modbus
=
modbus_new_tcp
(
gsCoke_ModbusAddress
,
g
s
Coke_ModbusPort
);
gCoke_Modbus
=
modbus_new_tcp
(
gsCoke_ModbusAddress
,
g
i
Coke_ModbusPort
);
if
(
!
gCoke_Modbus
)
{
perror
(
"coke - modbus_new_tcp"
);
...
...
src/server/main.c
View file @
cd8724a2
...
...
@@ -31,7 +31,7 @@ extern int gbServer_RunInBackground;
extern
int
giServer_Port
;
extern
const
char
*
gsItemListFile
;
extern
const
char
*
gsCoke_ModbusAddress
;
extern
int
g
s
Coke_ModbusPort
;
extern
int
g
i
Coke_ModbusPort
;
extern
const
char
*
gsDoor_SerialPort
;
extern
bool
gbSyslogEnabled
;
...
...
@@ -134,7 +134,7 @@ int main(int argc, char *argv[])
gbSyslogEnabled
=
(
Config_GetValue_Bool
(
"disable_syslog"
,
0
)
==
0
);
gsCoke_ModbusAddress
=
Config_GetValue
(
"coke_modbus_address"
,
0
);
g
s
Coke_ModbusPort
=
Config_GetValue_Int
(
"coke_modbus_port"
,
0
);
g
i
Coke_ModbusPort
=
Config_GetValue_Int
(
"coke_modbus_port"
,
0
);
signal
(
SIGINT
,
sigint_handler
);
signal
(
SIGTERM
,
sigint_handler
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment