Skip to content

Commit 6038eb3

Browse files
author
win aung
committed
Merge branch 'oldmaster'
2 parents 95b2fbd + 8befffa commit 6038eb3

39 files changed

+123
-367
lines changed

‎androidapp/app/src/main/java/com/cantech/cannect/BTCommunication.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public void run() {
9090
// found end message
9191
if(incomingMessage.endsWith("255255")) {
9292

93-
SystemClock.sleep(100); //pause and wait for rest of data. Adjust this depending on your sending speed.
93+
SystemClock.sleep(10); //pause and wait for rest of data. Adjust this depending on your sending speed.
9494
// clean white spaces. Without this, I got white bunch of spaces at the first.
9595
incomingMessage = incomingMessage.trim();
9696
System.out.println("Incoming message string below:");

‎androidapp/app/src/main/java/com/cantech/cannect/Dashboard.java‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public void run() {
184184
Log.d("table", BTPIDs.get(finalI));
185185
LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(sendingMessageIntent);
186186
try {
187-
Thread.sleep(1500);
187+
Thread.sleep(1000);
188188
} catch (InterruptedException e) {
189189
// TODO Auto-generated catch block
190190
e.printStackTrace();
@@ -387,23 +387,29 @@ public void onReceive(Context context, Intent intent) {
387387
case "6DOF":
388388
toExport = 1;
389389
String[] data = parsed[1].split(",");
390-
newData = new Data("Acceleration-x",data[0]);
390+
try {
391+
newData = new Data("Acceleration-x", data[0]);
392+
}catch(Exception e) {break; }
391393
for (int i=0;i<dataArrayList.size();i++){
392394
String pid = dataArrayList.get(i).getPid();
393395
if (pid.equals("Acceleration-x")){
394396
dataArrayList.set(i, newData);
395397
break;
396398
}
397399
}
398-
newData = new Data("Acceleration-y",data[1]);
400+
try {
401+
newData = new Data("Acceleration-y", data[1]);
402+
}catch(Exception e) {break; }
399403
for (int i=0;i<dataArrayList.size();i++){
400404
String pid = dataArrayList.get(i).getPid();
401405
if (pid.equals("Acceleration-y")){
402406
dataArrayList.set(i, newData);
403407
break;
404408
}
405409
}
406-
newData = new Data("Acceleration-z",data[2]);
410+
try {
411+
newData = new Data("Acceleration-z", data[2]);
412+
}catch(Exception e) {break; }
407413
for (int i=0;i<dataArrayList.size();i++){
408414
String pid = dataArrayList.get(i).getPid();
409415
if (pid.equals("Acceleration-z")){
@@ -412,23 +418,29 @@ public void onReceive(Context context, Intent intent) {
412418
}
413419
}
414420
//gyro
415-
newData = new Data("Gyroscope-x",data[3]);
421+
try{
422+
newData = new Data("Gyroscope-x",data[3]);
423+
}catch(Exception e) { break;}
416424
for (int i=0;i<dataArrayList.size();i++){
417425
String pid = dataArrayList.get(i).getPid();
418426
if (pid.equals("Gyroscope-x")){
419427
dataArrayList.set(i, newData);
420428
break;
421429
}
422430
}
423-
newData = new Data("Gyroscope-y",data[4]);
431+
try{
432+
newData = new Data("Gyroscope-y",data[4]);
433+
}catch(Exception e) {break; }
424434
for (int i=0;i<dataArrayList.size();i++){
425435
String pid = dataArrayList.get(i).getPid();
426436
if (pid.equals("Gyroscope-y")){
427437
dataArrayList.set(i, newData);
428438
break;
429439
}
430440
}
431-
newData = new Data("Gyroscope-z",data[5]);
441+
try{
442+
newData = new Data("Gyroscope-z",data[5]);
443+
}catch(Exception e) { break;}
432444
for (int i=0;i<dataArrayList.size();i++){
433445
String pid = dataArrayList.get(i).getPid();
434446
if (pid.equals("Gyroscope-z")){
@@ -437,7 +449,9 @@ public void onReceive(Context context, Intent intent) {
437449
}
438450
}
439451
//temp
440-
newData = new Data("Temperature",data[6]);
452+
try {
453+
newData = new Data("Temperature", data[6]);
454+
}catch(Exception e) {break; }
441455
for (int i=0;i<dataArrayList.size();i++){
442456
String pid = dataArrayList.get(i).getPid();
443457
if (pid.equals("Temperature")){

‎androidapp/app/src/main/java/com/cantech/cannect/Dashboard_chart.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public void run(){
174174
LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(sendingMessageIntent);
175175
Log.d("chart", BTPIDs);
176176
try {
177-
Thread.sleep(1500);
177+
Thread.sleep(1000);
178178
} catch (InterruptedException e) {
179179
// TODO Auto-generated catch block
180180
e.printStackTrace();
@@ -236,8 +236,7 @@ public void onReceive(Context context, Intent intent) {
236236

237237
float value;
238238
try {
239-
if (!parsed[1].equals("UNDEFINED")) {
240-
value = Float.parseFloat(parsed[1]);
239+
if (!parsed[1].equals("UNDEFINED")) { value = Float.parseFloat(parsed[1]);
241240

242241
} else {
243242
System.out.println("UNDEFINED string received ...");
@@ -357,16 +356,19 @@ protected void reDesignChart(LineDataSet toChange, String str){
357356
case "DEMAND ENGINE TORQUE":
358357
leftAxis.setAxisMinimum(-125f);
359358
leftAxis.setAxisMaximum(130f);
359+
lineDataSet.setColor(getResources().getColor(R.color.Orchid));
360360
BTPIDs = "61 ";
361361
break;
362362
case "FUEL PRESSURE":
363363
leftAxis.setAxisMaximum(765f);
364364
leftAxis.setAxisMinimum(0f);
365+
lineDataSet.setColor(getResources().getColor(R.color.AntiqueWhite));
365366
BTPIDs = "0A ";
366367
break;
367368
case "ACTUAL ENGINE TORQUE":
368369
leftAxis.setAxisMinimum(-125f);
369370
leftAxis.setAxisMaximum(130f);
371+
lineDataSet.setColor(getResources().getColor(R.color.debug_green));
370372
BTPIDs = "62 ";
371373
break;
372374
default:

‎androidapp/app/src/main/java/com/cantech/cannect/Dashboard_gauge.java‎

Lines changed: 10 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,8 @@
3838
import com.google.android.material.bottomnavigation.BottomNavigationView;
3939

4040

41-
public class Dashboard_gauge extends AppCompatActivity implements Speedgauge_fragment.FromSpeedGauge, MAF_Fragment.FromMAFGauge, Fuel_fragment.FromFuelLevelGauge, Actual_Engine_Torque_Fragment.FromActualTorque,
42-
RPMgauge_fragment.FromRPMGauge, Air_temp_fragment.FromAirTempGauge, Coolant_temp_fragment.FromCoolantTempGauge,
43-
Throttle_Fragment.FromThrottleGauge, Fuel_type_Fragment.FromFuelTypeGauge, Fuel_Pressure_fragment.FromFuelPressureGauge,
44-
Demand_Engine_Torque_Fragment.FromDemandTorque, Absolute_Load_Fragment.FromAbsLoad, Calculate_Engine_Load_Fragment.FromEngineLoad{
41+
public class Dashboard_gauge extends AppCompatActivity{
42+
4543
private static final String TAG = "Dashboard_gauge";
4644
DataParsing dataParsing;
4745
StringBuilder data_message;
@@ -53,12 +51,12 @@ public class Dashboard_gauge extends AppCompatActivity implements Speedgauge_fra
5351
Coolant_temp_fragment coolantgauge = new Coolant_temp_fragment();
5452
Fuel_fragment fuelgauge = new Fuel_fragment();
5553
Fuel_Pressure_fragment fuelpressuregauge = new Fuel_Pressure_fragment();
56-
Air_temp_fragment airtemptextview = new Air_temp_fragment();
54+
// Air_temp_fragment airtemptextview = new Air_temp_fragment();
5755
MAF_Fragment maftextview = new MAF_Fragment();
5856
Fuel_type_Fragment fuelTypeFragment = new Fuel_type_Fragment();
5957
Throttle_Fragment throttle_fragment = new Throttle_Fragment();
6058
Calculate_Engine_Load_Fragment calELoad_fragment = new Calculate_Engine_Load_Fragment();
61-
Absolute_Load_Fragment absLoad_fragment = new Absolute_Load_Fragment();
59+
// Absolute_Load_Fragment absLoad_fragment = new Absolute_Load_Fragment();
6260
Demand_Engine_Torque_Fragment demandETorque_fragment = new Demand_Engine_Torque_Fragment();
6361
Actual_Engine_Torque_Fragment actualETorque_fragment = new Actual_Engine_Torque_Fragment();
6462
Distance_travelled_since_cleared_fragment distanceTravelled_fragment = new Distance_travelled_since_cleared_fragment();
@@ -149,7 +147,7 @@ public void run() {
149147
sendingMessageIntent.putExtra("theMessage", "01 " + initialPIDs[finalI] + ">");
150148
LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(sendingMessageIntent);
151149
try {
152-
Thread.sleep(1500);
150+
Thread.sleep(1000);
153151
} catch (InterruptedException e) {
154152
// TODO Auto-generated catch block
155153
e.printStackTrace();
@@ -244,11 +242,11 @@ public boolean onContextItemSelected(MenuItem item) {
244242
sendingPID2BT(sendingMessageIntent, 5);
245243
break;
246244

247-
case R.id.AmbientAirTemp_menu:
248-
ft1.replace(R.id.gauge_container2, airtemptextview);
249-
ft1.commit();
250-
sendingPID2BT(sendingMessageIntent, 4);
251-
break;
245+
// case R.id.AmbientAirTemp_menu:
246+
// ft1.replace(R.id.gauge_container2, airtemptextview);
247+
// ft1.commit();
248+
// sendingPID2BT(sendingMessageIntent, 4);
249+
// break;
252250

253251
case R.id.MAF_menu:
254252
ft1.replace(R.id.gauge_container2, maftextview);
@@ -410,70 +408,6 @@ protected void onResume() {
410408
}
411409
}
412410

413-
@Override
414-
public void sendAbsoluteLoadPID(String string) {
415-
416-
}
417-
418-
@Override
419-
public void sendActualETorquePID(String string) {
420-
421-
}
422-
423-
@Override
424-
public void sendAirTempPID(String string) {
425-
426-
}
427-
428-
@Override
429-
public void sendCalculatedEngineLoadPID(String string) {
430-
431-
}
432-
433-
@Override
434-
public void sendCoolantTempPID(String string) {
435-
436-
}
437-
438-
@Override
439-
public void sendDemandETorquePID(String string) {
440-
441-
}
442-
443-
@Override
444-
public void sendFuelPressurePID(String string) {
445-
446-
}
447-
448-
@Override
449-
public void sendFuelLevelPID(String string) {
450-
451-
}
452-
453-
@Override
454-
public void sendFuelTypePID(String string) {
455-
456-
}
457-
458-
@Override
459-
public void sendMAFPID(String string) {
460-
461-
}
462-
463-
@Override
464-
public void sendRPMPID(String string) {
465-
466-
}
467-
468-
@Override
469-
public void sendSpeedPID(String string) {
470-
471-
}
472-
473-
@Override
474-
public void sendThrottlePID(String string) {
475-
476-
}
477411
}
478412

479413

0 commit comments

Comments
 (0)