Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

57 second request to get status is not useful #58

Closed
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
123 changes: 37 additions & 86 deletions source/GarminSDComms.mc
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,9 @@ class GarminSDComms {
var mAccelHandler = null;
var lastOnReceiveResponse = -1;
var lastOnReceiveData = "";
var lastOnSdStatusReceiveResponse = -1;
var mDataRequestInProgress = 0;
var mDataSendStartTime = Time.now();
var mSettingsRequestInProgress = 0;
var mStatusRequestInProgress = 0;
var TIMEOUT = new Time.Duration(5);
//var serverUrl = "http:192.168.43.1:8080";
var serverUrl = "http://127.0.0.1:8080";
Expand All @@ -47,7 +45,6 @@ class GarminSDComms {
mAccelHandler = accelHandler;
mDataRequestInProgress = 0;
mSettingsRequestInProgress = 0;
mStatusRequestInProgress = 0;

// Start a timer that calls timerCallback every half second
mTimer = new Timer.Timer();
Expand All @@ -66,7 +63,7 @@ class GarminSDComms {
var waitingTime = Time.now().subtract(mDataSendStartTime);
if ((mDataRequestInProgress) && (waitingTime.lessThan(TIMEOUT))){
// Don't start another one.
writeLog(tagStr,"mDataRequestInProgress="+mDataRequestInProgress+", "+ mSettingsRequestInProgress+ ", " + mStatusRequestInProgress);
writeLog(tagStr,"mDataRequestInProgress="+mDataRequestInProgress+", "+ mSettingsRequestInProgress);
} else {
//writeLog(tagStr, "sendAccelData Start");
var dataObj = mAccelHandler.getDataJson();
Expand Down Expand Up @@ -103,84 +100,13 @@ class GarminSDComms {
);
}

function getSdStatus() {
writeLog("SDComms.getSdStatus()", "");
mStatusRequestInProgress = 1;
Comm.makeWebRequest(
serverUrl + "/data",
{},
{
:method => Communications.HTTP_REQUEST_METHOD_GET,
:headers => {
"Content-Type" => Communications.REQUEST_CONTENT_TYPE_URL_ENCODED,
},
:responseType => Communications.HTTP_RESPONSE_CONTENT_TYPE_JSON,
},
method(:onSdStatusReceive)
);
//System.println("getSdStatus Exiting");
}

// Receive the data from the web request - should be a json string
function onSdStatusReceive(responseCode, data) {
var tagStr = "SDComms.onSdStatusReceive";
writeLog(tagStr, "ResponseCode="+responseCode);
if (responseCode == 200) {
if (responseCode != lastOnSdStatusReceiveResponse) {
#writeLog(tagStr, "success - data =" + data);
writeLog(tagStr, "Status =" + data.get("alarmPhrase"));
}
mAccelHandler.mStatusStr = data.get("alarmPhrase");
if (data.get("alarmState") != 0) {
try {
var lightEnabled = Storage.getValue(MENUITEM_LIGHT) ? true : false;
if (Attention has :backlight && lightEnabled) {
Attention.backlight(true);
}
} catch (ex) {
// We might get a Toybox.Attention.BacklightOnTooLongException
}
var soundEnabled = Storage.getValue(MENUITEM_SOUND) ? true : false;
if (Attention has :playTone && soundEnabled) {
Attention.playTone(Attention.TONE_ALERT_HI);
}
}
if (data.get("alarmState") == 2) {
// ALARM
var vibrationEnabled = Storage.getValue(MENUITEM_VIBRATION)
? true
: false;
if (Attention has :vibrate && vibrationEnabled) {
var vibeData = [
new Attention.VibeProfile(50, 500),
new Attention.VibeProfile(0, 500),
new Attention.VibeProfile(50, 500),
new Attention.VibeProfile(0, 500),
new Attention.VibeProfile(50, 500),
];
Attention.vibrate(vibeData);
}
}
} else {
mAccelHandler.mStatusStr =
Ui.loadResource(Rez.Strings.Error_abbrev) + ": " + responseCode.toString();
if (responseCode != lastOnSdStatusReceiveResponse) {
writeLog(tagStr, "Failue - code =" + responseCode);
writeLog(tagStr, "Failure - data =" + data);
} else {
// Don't write repeated log entries to save filling up the log file.
}
}
lastOnSdStatusReceiveResponse = responseCode;
mStatusRequestInProgress = 0;
}

// Receive the response from the sendAccelData web request.
function onDataReceive(responseCode, data) {
var tagStr = "SDComms.onDataReceive()";
var sendDuration = Time.now().subtract(mDataSendStartTime);
writeLog(tagStr, "sendAccelData End - Send Duration = " + sendDuration.value());
if (responseCode == 200) {
writeLog(tagStr, "Success - data =" + data);
if (responseCode != lastOnReceiveResponse || data != lastOnReceiveData) {
writeLog(tagStr, "Success - data =" + data);
} else {
Expand All @@ -189,12 +115,43 @@ class GarminSDComms {
if (data.equals("sendSettings")) {
//System.println("Sending Settings");
sendSettings();
} else {
//System.println("getting sd status");
getSdStatus();
}
if (data has :alarmPhrase) {
mAccelHandler.mStatusStr = data.get("alarmPhrase");
if (data.get("alarmState") != 0) {
try {
var lightEnabled = Storage.getValue(MENUITEM_LIGHT) ? true : false;
if (Attention has :backlight && lightEnabled) {
Attention.backlight(true);
}
} catch (ex) {
// We might get a Toybox.Attention.BacklightOnTooLongException
}
var soundEnabled = Storage.getValue(MENUITEM_SOUND) ? true : false;
if (Attention has :playTone && soundEnabled) {
Attention.playTone(Attention.TONE_ALERT_HI);
}
}
if (data.get("alarmState") == 2) {
// ALARM
var vibrationEnabled = Storage.getValue(MENUITEM_VIBRATION)
? true
: false;
if (Attention has :vibrate && vibrationEnabled) {
var vibeData = [
new Attention.VibeProfile(50, 500),
new Attention.VibeProfile(0, 500),
new Attention.VibeProfile(50, 500),
new Attention.VibeProfile(0, 500),
new Attention.VibeProfile(50, 500),
];
Attention.vibrate(vibeData);
}
}
}
} else {
mAccelHandler.mStatusStr = "ERR: " + responseCode.toString();
mAccelHandler.mStatusStr =
Ui.loadResource(Rez.Strings.Error_abbrev) + ": " + responseCode.toString();
var soundEnabled = Storage.getValue(MENUITEM_SOUND) ? true : false;
if (Attention has :playTone && soundEnabled) {
Attention.playTone(Attention.TONE_LOUD_BEEP);
Expand All @@ -206,12 +163,6 @@ class GarminSDComms {
];
Attention.vibrate(vibeData);
}

if (responseCode != lastOnReceiveResponse) {
writeLog(tagStr, "Failure - code =" + responseCode);
} else {
//
}
}
lastOnReceiveResponse = responseCode;
lastOnReceiveData = data;
Expand Down