ITL-Stefan/sps-modbus-app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed a tcp connection problem

Browse Source
This commit is contained in:
root 2018-06-15 00:11:04 +02:00
parent 852cddc2cb
commit 3a599f3bdb
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/example/user/myapp/GlobalState.java
View File

@ -22,9 +22,9 @@ public class GlobalState extends Application {
INPUT_REGISTER (1, 1), INPUT_REGISTER (1, 1),
DISCRETE_INPUT(1, 12); DISCRETE_INPUT(1, 12);
*/ */
COIL (1, 8), COIL (8192, 8),
INPUT_REGISTER (1, 8), INPUT_REGISTER (0, 2),
DISCRETE_INPUT(1, 12); DISCRETE_INPUT(0, 12);
private int startReference; private int startReference;
private int count; private int count;

4
app/src/main/java/com/example/user/myapp/MainActivity.java
View File

@ -19,8 +19,8 @@ public class MainActivity extends AppCompatActivity {
public void sendMessage(View view) { public void sendMessage(View view) {
EditText editText1 = (EditText) findViewById(R.id.ipAddress); EditText editText1 = (EditText) findViewById(R.id.ipAddress);
// String ipAddress = editText1.getText().toString(); // String ipAddress = editText1.getText().toString();
String ipAddress = "192.168.157.16"; String ipAddress = "10.0.0.60";
int port = 503; int port = 502;
EditText editText2 = (EditText) findViewById(R.id.port); EditText editText2 = (EditText) findViewById(R.id.port);
// int port = Integer.parseInt(editText2.getText().toString()); // int port = Integer.parseInt(editText2.getText().toString());

6
app/src/main/java/com/example/user/myapp/MyIntentService.java
View File

@ -33,6 +33,9 @@ public class MyIntentService extends IntentService {
private static final String EXTRA_REF = "extra.ref"; private static final String EXTRA_REF = "extra.ref";
private static final String EXTRA_COUNT = "extra.count"; private static final String EXTRA_COUNT = "extra.count";
private static final String EXTRA_INTENT_NAME = "extra.intent.name"; private static final String EXTRA_INTENT_NAME = "extra.intent.name";
//turns out modbus on siemens logo is crap and isnt responding for at least 50ms
private static final Integer CAPWAITTIME = 100;
//this is not a type, idiot.
public MyIntentService() { public MyIntentService() {
super("MyIntentService"); super("MyIntentService");
@ -71,6 +74,7 @@ public class MyIntentService extends IntentService {
listBooleanBit.add(bv.getBit(i)); listBooleanBit.add(bv.getBit(i));
} }
sendBooleanListToActivity(listBooleanBit, intentReceiveName, "discreteInputValues"); sendBooleanListToActivity(listBooleanBit, intentReceiveName, "discreteInputValues");
Thread.sleep(CAPWAITTIME);
master.disconnect(); master.disconnect();
} catch (Exception e) { } catch (Exception e) {
System.out.println("Exception in reading discrete input " + e); System.out.println("Exception in reading discrete input " + e);
@ -89,6 +93,7 @@ public class MyIntentService extends IntentService {
listBooleanBit.add(bv.getBit(i)); listBooleanBit.add(bv.getBit(i));
} }
sendBooleanListToActivity(listBooleanBit, intentReceiveName, "coilValues"); sendBooleanListToActivity(listBooleanBit, intentReceiveName, "coilValues");
Thread.sleep(CAPWAITTIME);
master.disconnect(); master.disconnect();
} catch (Exception e) { } catch (Exception e) {
System.out.println("Exception in reading coil " + e); System.out.println("Exception in reading coil " + e);
@ -107,6 +112,7 @@ public class MyIntentService extends IntentService {
System.out.println(ir.getValue()+" input register "+Math.random()); System.out.println(ir.getValue()+" input register "+Math.random());
} }
sendIntegerListToActivity (listIntegerInputRegister, intentReceiveName); sendIntegerListToActivity (listIntegerInputRegister, intentReceiveName);
Thread.sleep(CAPWAITTIME);
master.disconnect(); master.disconnect();
} catch (Exception e) { } catch (Exception e) {
System.out.println("Exception in reading input register " + e); System.out.println("Exception in reading input register " + e);