Skip to content

Commit

Permalink
Merge pull request #1839 from fossasia/development
Browse files Browse the repository at this point in the history 
Merge development into master to release v2.0.16
  • Loading branch information
@CloudyPadmal
CloudyPadmal authored Jun 29, 2019
2 parents 2eef628 + 35ba5ec commit fba6f17
Show file tree
Hide file tree
Showing 25 changed files with 1,201 additions and 2,071 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android {
applicationId "io.pslab"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 16
versionName "2.0.15"
versionCode 17
versionName "2.0.16"
multiDexEnabled true
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
Expand Down
15 changes: 2 additions & 13 deletions app/src/main/java/io/pslab/activity/AccelerometerActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,19 +115,8 @@ private void reinstateConfigurations() {
accelerometerConfigurations = PreferenceManager.getDefaultSharedPreferences(getBaseContext());
locationEnabled = accelerometerConfigurations.getBoolean(AccelerometerSettingsFragment.KEY_INCLUDE_LOCATION, true);
AccelerometerDataFragment.setParameters(
getValueFromText(accelerometerConfigurations.getString(AccelerometerSettingsFragment.KEY_HIGH_LIMIT, "2000"),
10, 10000),
getValueFromText(accelerometerConfigurations.getString(AccelerometerSettingsFragment.KEY_UPDATE_PERIOD, "1000"),
100, 1000),
accelerometerConfigurations.getString(AccelerometerSettingsFragment.KEY_ACCELEROMETER_SENSOR_TYPE, "0"),
Float.valueOf(accelerometerConfigurations.getString(AccelerometerSettingsFragment.KEY_HIGH_LIMIT, "20")),
Integer.valueOf(accelerometerConfigurations.getString(AccelerometerSettingsFragment.KEY_UPDATE_PERIOD, "1000")),
accelerometerConfigurations.getString(AccelerometerSettingsFragment.KEY_ACCELEROMETER_SENSOR_GAIN, "1"));
}

private int getValueFromText(String strValue, int lowerBound, int upperBound) {
if (strValue.isEmpty()) return lowerBound;
int value = Integer.parseInt(strValue);
if (value > upperBound) return upperBound;
else if (value < lowerBound) return lowerBound;
else return value;
}
}
12 changes: 6 additions & 6 deletions app/src/main/java/io/pslab/activity/GyroscopeActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,12 @@ protected void onResume() {
}

private void reinstateConfigurations() {
SharedPreferences accelerometerConfigurations;
accelerometerConfigurations = PreferenceManager.getDefaultSharedPreferences(getBaseContext());
locationEnabled = accelerometerConfigurations.getBoolean(GyroscopeSettingsFragment.KEY_INCLUDE_LOCATION, true);
SharedPreferences gyroscopeConfigurations;
gyroscopeConfigurations = PreferenceManager.getDefaultSharedPreferences(getBaseContext());
locationEnabled = gyroscopeConfigurations.getBoolean(GyroscopeSettingsFragment.KEY_INCLUDE_LOCATION, true);
GyroscopeDataFragment.setParameters(
Float.valueOf(accelerometerConfigurations.getString(GyroscopeSettingsFragment.KEY_HIGH_LIMIT, "20")),
Integer.valueOf(accelerometerConfigurations.getString(GyroscopeSettingsFragment.KEY_UPDATE_PERIOD, "1000")),
accelerometerConfigurations.getString(GyroscopeSettingsFragment.KEY_GYROSCOPE_SENSOR_GAIN, "1"));
Float.valueOf(gyroscopeConfigurations.getString(GyroscopeSettingsFragment.KEY_HIGH_LIMIT, "20")),
Integer.valueOf(gyroscopeConfigurations.getString(GyroscopeSettingsFragment.KEY_UPDATE_PERIOD, "1000")),
gyroscopeConfigurations.getString(GyroscopeSettingsFragment.KEY_GYROSCOPE_SENSOR_GAIN, "1"));
}
}
1,053 changes: 275 additions & 778 deletions app/src/main/java/io/pslab/activity/OscilloscopeActivity.java
View file

Large diffs are not rendered by default.

108 changes: 107 additions & 1 deletion app/src/main/java/io/pslab/activity/RoboticArmActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,31 @@

import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.Point;
import android.location.Location;
import android.location.LocationManager;
import android.os.Build;
import android.os.CountDownTimer;
import android.os.Handler;
import android.support.annotation.NonNull;
import android.support.design.widget.BottomSheetBehavior;
import android.support.design.widget.Snackbar;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.Display;
import android.view.DragEvent;
import android.view.GestureDetector;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.WindowManager;
import android.view.inputmethod.EditorInfo;
import android.widget.Button;
import android.widget.EditText;
import android.widget.HorizontalScrollView;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
Expand All @@ -30,6 +37,8 @@
import java.util.ArrayList;
import java.util.Date;

import butterknife.BindView;
import butterknife.ButterKnife;
import io.pslab.R;
import io.pslab.communication.ScienceLab;
import io.pslab.models.SensorDataBlock;
Expand All @@ -38,13 +47,16 @@
import io.pslab.others.CustomSnackBar;
import io.pslab.others.GPSLogger;
import io.pslab.others.LocalDataLog;
import io.pslab.others.MathUtils;
import io.pslab.others.ScienceLabCommon;
import io.pslab.others.SwipeGestureDetector;
import io.realm.Realm;
import io.realm.RealmObject;
import io.realm.RealmResults;

public class RoboticArmActivity extends AppCompatActivity {

private static final String PREF_NAME = "RoboticArmActivity";
private EditText degreeText1, degreeText2, degreeText3, degreeText4;
private SeekArc seekArc1, seekArc2, seekArc3, seekArc4;
private LinearLayout servo1TimeLine, servo2TimeLine, servo3TimeLine, servo4TimeLine;
Expand All @@ -62,11 +74,32 @@ public class RoboticArmActivity extends AppCompatActivity {
private final String DATA_BLOCK = "data_block";
private int timelinePosition = 0;
private ScienceLab scienceLab;
private BottomSheetBehavior bottomSheetBehavior;
private GestureDetector gestureDetector;
@BindView(R.id.sheet_slide_text_robotic_arm)
TextView bottomSheetSlideText;
@BindView(R.id.parent_layout_robotic)
View parentLayout;
@BindView(R.id.bottom_sheet_robotic_arm)
LinearLayout bottomSheet;
@BindView(R.id.img_arrow_robotic_arm)
ImageView arrowUpDown;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_robotic_arm);
ButterKnife.bind(this);

setUpBottomSheet();
parentLayout.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (bottomSheetBehavior.getState() == BottomSheetBehavior.STATE_EXPANDED)
bottomSheetBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
parentLayout.setVisibility(View.GONE);
}
});

scienceLab = ScienceLabCommon.scienceLab;
if (!scienceLab.isConnected()) {
Expand Down Expand Up @@ -484,6 +517,79 @@ public void onClick(View v) {
.getBlockOfServoRecords(getIntent().getExtras().getLong(DATA_BLOCK));
setReceivedData();
}

Button guideButton = findViewById(R.id.timeline_guide_button);
guideButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
bottomSheetBehavior.setState(bottomSheetBehavior.getState() == BottomSheetBehavior.STATE_HIDDEN ?
BottomSheetBehavior.STATE_EXPANDED : BottomSheetBehavior.STATE_HIDDEN);
}
});
}

private void setUpBottomSheet() {
bottomSheetBehavior = BottomSheetBehavior.from(bottomSheet);

final SharedPreferences settings = this.getSharedPreferences(PREF_NAME, MODE_PRIVATE);
Boolean isFirstTime = settings.getBoolean("RoboticArmFirstTime", true);

if (isFirstTime) {
bottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
parentLayout.setVisibility(View.VISIBLE);
parentLayout.setAlpha(0.8f);
arrowUpDown.setRotation(180);
bottomSheetSlideText.setText(R.string.hide_guide_text);
SharedPreferences.Editor editor = settings.edit();
editor.putBoolean("RoboticArmFirstTime", false);
editor.apply();
} else {
bottomSheetBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
}

bottomSheetBehavior.setBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
private Handler handler = new Handler();
private Runnable runnable = new Runnable() {
@Override
public void run() {
bottomSheetBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
}
};

@Override
public void onStateChanged(@NonNull final View bottomSheet, int newState) {
switch (newState) {
case BottomSheetBehavior.STATE_EXPANDED:
handler.removeCallbacks(runnable);
bottomSheetSlideText.setText(R.string.hide_guide_text);
break;

case BottomSheetBehavior.STATE_COLLAPSED:
handler.postDelayed(runnable, 2000);
break;

default:
handler.removeCallbacks(runnable);
bottomSheetSlideText.setText(R.string.show_guide_text);
break;
}
}

@Override
public void onSlide(@NonNull View bottomSheet, float slideOffset) {
Float value = (float) MathUtils.map((double) slideOffset, 0.0, 1.0, 0.0, 0.8);
parentLayout.setVisibility(View.VISIBLE);
parentLayout.setAlpha(value);
arrowUpDown.setRotation(slideOffset * 180);
}
});
gestureDetector = new GestureDetector(this, new SwipeGestureDetector(bottomSheetBehavior));
}

@Override
public boolean onTouchEvent(MotionEvent event) {
gestureDetector.onTouchEvent(event); //Gesture detector need this to transfer touch event to the gesture detector.
return super.onTouchEvent(event);
}

private void toastInvalidValueMessage() {
Expand Down Expand Up @@ -545,7 +651,7 @@ private void saveTimeline() {
}
}
servoCSVLogger.writeCSVFile(data);
CustomSnackBar.showSnackBar(findViewById(R.id.robotic_arm_relative_view),
CustomSnackBar.showSnackBar(findViewById(R.id.robotic_arm_coordinator),
getString(R.string.csv_store_text) + " " + servoCSVLogger.getCurrentFilePath()
, getString(R.string.open), new View.OnClickListener() {
@Override
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -456,8 +456,7 @@ public void onClick(View view) {
double dutySqr4 = ((double) WaveGeneratorCommon.wave.get(WaveConst.SQR4).get(WaveConst.DUTY)) / 100;
double phaseSqr4 = (double) WaveGeneratorCommon.wave.get(WaveConst.SQR4).get(WaveConst.PHASE) / 360;

scienceLab.sqrPWM(freqSqr1, dutySqr1, phaseSqr2, dutySqr2, phaseSqr3, dutySqr3, phaseSqr4, dutySqr4, true);
scienceLab.setState(WaveGeneratorCommon.state);
scienceLab.sqrPWM(freqSqr1, dutySqr1, phaseSqr2, dutySqr2, phaseSqr3, dutySqr3, phaseSqr4, dutySqr4, false);
}

waveDialog.show();
Expand Down
Loading

0 comments on commit fba6f17

Please sign in to comment.