caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

rhino first parameter passing

Browse source
This commit is contained in:
AdrianLxM 2017-10-15 03:50:18 +02:00
parent 81b611ad92
commit 303d35118e
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/assets/OpenAPSMA/determine-basal.js
View file

@ -17,7 +17,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
}; };
rT.error ='Error: could not get current basal rate'; rT.error ='Error: could not get current basal rate';
return setTempBasal(0, 30, profile, rT, offline); return setTempBasal(glucose_status.athing, 30, profile, rT, offline);
if (typeof profile === 'undefined' || typeof profile.current_basal === 'undefined') { if (typeof profile === 'undefined' || typeof profile.current_basal === 'undefined') {
rT.error ='Error: could not get current basal rate'; rT.error ='Error: could not get current basal rate';

11
app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalAdapterMAJS.java
View file

@ -8,8 +8,10 @@ import com.j256.ormlite.logger.Log;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import org.mozilla.javascript.Callable;
import org.mozilla.javascript.Context; import org.mozilla.javascript.Context;
import org.mozilla.javascript.Function; import org.mozilla.javascript.Function;
import org.mozilla.javascript.NativeJSON;
import org.mozilla.javascript.NativeObject; import org.mozilla.javascript.NativeObject;
import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.Scriptable;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -101,8 +103,15 @@ public class DetermineBasalAdapterMAJS {
// Call the function with params // Call the function with params
Object param1 = NativeJSON.parse(rhino, scope, "{\"athing\": 2.3}", new Callable() {
@Override
public Object call(Context context, Scriptable scriptable, Scriptable scriptable1, Object[] objects) {
return objects[1];
}
});
Object[] params = { Object[] params = {
"undefined", param1,
"undefined", "undefined",
"undefined", "undefined",
"undefined", "undefined",