caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'dev' into dev

Browse source
This commit is contained in:
Tebbe Ubben 2018-03-11 22:59:11 +01:00 committed by GitHub
parent 8fd68a082c f2d6b92394
commit d4ede0a5b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 114 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/info/nightscout/androidaps/data/Profile.java
View file

@ -218,16 +218,18 @@ public class Profile {
if (isValid) {
// Check for hours alignment
for (int index = 0; index < basal_v.size(); index++) {
long secondsFromMidnight = basal_v.keyAt(index);
if (secondsFromMidnight % 3600 != 0) {
Notification notification = new Notification(Notification.BASAL_PROFILE_NOT_ALIGNED_TO_HOURS, String.format(MainApp.gs(R.string.basalprofilenotaligned), from), Notification.NORMAL);
MainApp.bus().post(new EventNewNotification(notification));
PumpInterface pump = MainApp.getConfigBuilder().getActivePump();
if (pump != null && !pump.getPumpDescription().is30minBasalRatesCapable) {
for (int index = 0; index < basal_v.size(); index++) {
long secondsFromMidnight = basal_v.keyAt(index);
if (secondsFromMidnight % 3600 != 0) {
Notification notification = new Notification(Notification.BASAL_PROFILE_NOT_ALIGNED_TO_HOURS, String.format(MainApp.gs(R.string.basalprofilenotaligned), from), Notification.NORMAL);
MainApp.bus().post(new EventNewNotification(notification));
}
}
}
// Check for minimal basal value
PumpInterface pump = ConfigBuilderPlugin.getActivePump();
if (pump != null) {
PumpDescription description = pump.getPumpDescription();
for (int i = 0; i < basal_v.size(); i++) {

2
app/src/main/java/info/nightscout/androidaps/interfaces/PumpDescription.java
View file

@ -39,4 +39,6 @@ public class PumpDescription {
public boolean isRefillingCapable = false;
public boolean storesCarbInfo = true;
public boolean is30minBasalRatesCapable = false;
}

2
app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAPlugin.java
View file

@ -215,7 +215,7 @@ public class OpenAPSAMAPlugin implements PluginBase, APSInterface {
return;
if (!HardLimits.checkOnlyHardLimits(Profile.toMgdl(profile.getIsf().doubleValue(), units), "sens", HardLimits.MINISF, HardLimits.MAXISF))
return;
if (!HardLimits.checkOnlyHardLimits(profile.getMaxDailyBasal(), "max_daily_basal", 0.1, HardLimits.maxBasal()))
if (!HardLimits.checkOnlyHardLimits(profile.getMaxDailyBasal(), "max_daily_basal", 0.05, HardLimits.maxBasal()))
return;
if (!HardLimits.checkOnlyHardLimits(pump.getBaseBasalRate(), "current_basal", 0.01, HardLimits.maxBasal()))
return;

2
app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAPlugin.java
View file

@ -217,7 +217,7 @@ public class OpenAPSMAPlugin implements PluginBase, APSInterface {
return;
if (!checkOnlyHardLimits(Profile.toMgdl(profile.getIsf().doubleValue(), units), "sens", HardLimits.MINISF, HardLimits.MAXISF))
return;
if (!checkOnlyHardLimits(profile.getMaxDailyBasal(), "max_daily_basal", 0.1, HardLimits.maxBasal()))
if (!checkOnlyHardLimits(profile.getMaxDailyBasal(), "max_daily_basal", 0.05, HardLimits.maxBasal()))
return;
if (!checkOnlyHardLimits(pump.getBaseBasalRate(), "current_basal", 0.01, HardLimits.maxBasal()))
return;

2
app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/OpenAPSSMBPlugin.java
View file

@ -219,7 +219,7 @@ public class OpenAPSSMBPlugin implements PluginBase, APSInterface {
return;
if (!checkOnlyHardLimits(Profile.toMgdl(profile.getIsf().doubleValue(), units), "sens", HardLimits.MINISF, HardLimits.MAXISF))
return;
if (!checkOnlyHardLimits(profile.getMaxDailyBasal(), "max_daily_basal", 0.1, HardLimits.maxBasal())) return;
if (!checkOnlyHardLimits(profile.getMaxDailyBasal(), "max_daily_basal", 0.05, HardLimits.maxBasal())) return;
if (!checkOnlyHardLimits(pump.getBaseBasalRate(), "current_basal", 0.01, HardLimits.maxBasal())) return;
startPart = new Date();

3
app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java
View file

@ -258,8 +258,7 @@ public class NewCarbsDialog extends DialogFragment implements OnClickListener, D
int eatingSoonTTDuration = SP.getInt(R.string.key_eatingsoon_duration, Constants.defaultEatingSoonTTDuration);
eatingSoonTTDuration = eatingSoonTTDuration > 0 ? eatingSoonTTDuration : Constants.defaultEatingSoonTTDuration;
double eatingSoonTT = SP.getDouble(R.string.key_eatingsoon_target, currentProfile.getUnits().equals(Constants.MMOL) ? Constants.defaultEatingSoonTTmmol : Constants.defaultEatingSoonTTmgdl);
eatingSoonTT = eatingSoonTT > 0 ? Profile.toMgdl(eatingSoonTT, currentProfile.getUnits()) : currentProfile.getUnits().equals(Constants.MMOL) ? Constants.defaultEatingSoonTTmmol : Constants.defaultEatingSoonTTmgdl;
eatingSoonTT = eatingSoonTT > 0 ? eatingSoonTT : currentProfile.getUnits().equals(Constants.MMOL) ? Constants.defaultEatingSoonTTmmol : Constants.defaultEatingSoonTTmgdl;
if (startActivityTTCheckbox.isChecked()) {
if (currentProfile.getUnits().equals(Constants.MMOL)) {

5
app/src/main/java/info/nightscout/androidaps/plugins/PumpInsight/InsightPumpPlugin.java
View file

@ -156,13 +156,14 @@ public class InsightPumpPlugin implements PluginBase, PumpInterface, Constraints
pumpDescription.tempDurationStep30mAllowed = true;
pumpDescription.tempMaxDuration = 24 * 60;
pumpDescription.isSetBasalProfileCapable = true; // leave this for now
pumpDescription.isSetBasalProfileCapable = true;
pumpDescription.is30minBasalRatesCapable = true;
pumpDescription.basalStep = 0.01d;
pumpDescription.basalMinimumRate = 0.02d;
pumpDescription.isRefillingCapable = true;
pumpDescription.storesCarbInfo = false;
pumpDescription.storesCarbInfo = false;
}

1
app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java
View file

@ -101,6 +101,7 @@ public class VirtualPumpPlugin implements PluginBase, PumpInterface {
pumpDescription.isRefillingCapable = false;
pumpDescription.storesCarbInfo = false;
pumpDescription.is30minBasalRatesCapable = true;
}
@Override

4
app/src/main/res/layout/overview_newinsulin_dialog.xml
View file

@ -37,13 +37,13 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginTop="5dp"
android:text="Start eating soon TT" />
android:text="@string/start_eating_soon_tt" />
<CheckBox
android:id="@+id/newinsulin_record_only"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="Don't bolus, record only" />
android:text="@string/don_t_bolus_record_only" />
<LinearLayout
android:layout_width="wrap_content"

92
app/src/main/res/values-cs/strings.xml
View file

@ -777,4 +777,96 @@
<string name="combo_read_full_history_confirmation">Opravdu chcete přečíst historii z pumpy a nést důsledky z toho vyplývající?</string>
<string name="combo_reservoir_level_insufficient_for_bolus">Nedostatek inzulínu pro takovýto bolus</string>
<string name="extendedbolusdeliveryerror">Chyba spuštění extended bolusu</string>
<string name="smb_shortname">SMB</string>
<string name="openapssmb">OpenAPS SMB</string>
<string name="enableuam">Povolit UAM</string>
<string name="enablesmb">Povolit SMB</string>
<string name="enablesmb_summary">Použít super mikro bolusy místo dočasných bazálů pro zrychlení účinku</string>
<string name="enableuam_summary">Detekce neoznámených jídel</string>
<string name="insightpump_shortname">Insight</string>
<string name="insightpump">Pumpa Insight</string>
<string name="status_no_colon">Stav</string>
<string name="changed">Změněno</string>
<string name="pump_stopped_uppercase">PUMPA ZASTAVENA</string>
<string name="status_updated">Stav aktualizován</string>
<string name="ago">zpět</string>
<string name="with">s</string>
<string name="insight_active_tbr">Aktivní dočasný bazál</string>
<string name="insight_min_left">min zbývá</string>
<string name="log_book">Historie</string>
<string name="insight_last_completed_action">Poslední vykonaný příkaz</string>
<string name="insight_needs">potřebuje</string>
<string name="insight_startup_uppercase">SPOUŠTĚNÍ</string>
<string name="insight_history_synced">SYNCHRONIZOVÁNO</string>
<string name="insight_history_busy">ZANEPRÁZDNĚN</string>
<string name="insight_history_syncing">SYNCHRONIZUJI</string>
<string name="insight_history_idle">NEČINNÝ</string>
<string name="insight_actually_cancel_tbr_summary">Momentálně zruší dočasný bazál (spouští alarm na pumpě) místo nastavení 90% na 1 min</string>
<string name="insight_use_real_tbr_cancels">Použít skutečné ukončení dočasného bazálu</string>
<string name="insight_stay_always_connected">Zůstat stále připojený</string>
<string name="insight_not_connected_to_companion_app">Nepřipojen k podpůrné aplikaci!</string>
<string name="insight_companion_app_not_installed">Podpůrná aplikace patrně není nainstalovaná!</string>
<string name="insight_incompatible_compantion_app_we_need_version">Nekompatibilní podpůrná aplikace, je požadována verze</string>
<string name="insight_unknown">Neznámý</string>
<string name="insight_waiting_for_code">Čekám na potrvzení kódu</string>
<string name="insight_code_rejected">Kód odmítnut</string>
<string name="insight_app_binding">Připojování aplikace</string>
<string name="insight_not_authorized">Neautorizován</string>
<string name="insight_incompatible">Nekompatibilní</string>
<string name="second">sekund</string>
<string name="minute">minut</string>
<string name="hour">hodin</string>
<string name="day">dní</string>
<string name="week">týdnů</string>
<string name="time_plural">" "</string>
<string name="enablesmbalways">Vždy povolit SMB</string>
<string name="enablesmbwithcob">Povolit SMB se sacharidy</string>
<string name="enablesmbwithcob_summary">Povolit SMB, pokud zbývají aktivní sacharidy</string>
<string name="enablesmbwithtemptarget">Povolit SMB s dočasnými cíly</string>
<string name="enablesmbwithtemptarget_summary">Povolit SMB, pokud je aktivní dočasný cíl (aktivita, blížící se jídlo)</string>
<string name="enablesmbwithhightemptarget">Povolit SMB s vysokými dočasnými cíly</string>
<string name="enablesmbwithhightemptarget_summary">Povolit SMB, pokud je aktivní vysoký dočasný cíl (aktivita)</string>
<string name="enablesmbaftercarbs">Povolit SMB po jídle</string>
<string name="enablesmbalways_summary">Povolit SMB nezávisle na bolusech. Možno pouze se zdroji glykémií s dobrým filtrováním dat, jako např. G5</string>
<string name="enablesmbaftercarbs_summary">Povolit SMB 6 hodin po bolusu i při nulovém COB. Možno pouze se zdroji glykémií s dobrým filtrováním dat, jako např. G5</string>
<string name="fr_lang">Francouzština</string>
<string name="ro_lang">Rumunština</string>
<string name="zh_lang">Čínština</string>
<string name="resistantadult">Dospělý s nízkou citlivostí</string>
<string name="combopump">Accu-Chek Combo</string>
<string name="combopump_shortname">COMBO</string>
<string name="insight_keepalive_format_string">%d vyprší %s</string>
<string name="insight_keep_alive_status">Stav keep-alive</string>
<string name="statistics">Statistika</string>
<string name="connect_preemptively">Připojování dopředu</string>
<string name="automatically_connect_when">Automaticky připojit při otevření obrazovky AndroidAPS, dříve než dojde k poslání příkazu, aby se omezila doba připojování</string>
<string name="not_recommended_due_to_battery_drain">Nedoporučeno kvůli vybíjení baterie</string>
<string name="let_temp_basal_run">Nechat běžet aktuální dočasný bazál</string>
<string name="mute">Ztlumit</string>
<string name="overview_insulin_label">Inzulín</string>
<string name="overview_carbs_label">Sacharidy</string>
<string name="overview_buttons_selection">Tlačítka</string>
<string name="show_calibration_button_summary">Odeslání kalibrace do xDripu+, nebo otevření kalibračního dialogu na G5</string>
<string name="show_cgm_button_summary">Otevře xDrip+, tlačítko zpět vrátí do AndroidAPS</string>
<string name="carb_increment_button_message">Množství sacharidů přidané po stisknutí tlačítka</string>
<string name="insulin_increment_button_message">Množství inzulínu přidané po stisknutí tlačítka</string>
<string name="error_starting_cgm">Nelze spustit aplikace CGM. Ujistěte se, že je nainstalovaná</string>
<string name="overview_cgm">CGM</string>
<string name="nav_historybrowser">Prohlížeč historie</string>
<string name="wear_notifysmb_title">Oznámení při SMB</string>
<string name="wear_notifysmb_summary">Ukazovat SMB na hodinkách jako normální bolus</string>
<string name="ns_create_announcements_from_errors_title">Vytvořit oznámení pro chyby</string>
<string name="ns_create_announcements_from_errors_summary">Vytvořit oznámení v NS pro chyby a místní výstrahy (zobrazitelné v Péči pod Ošetřením)</string>
<string name="wear_predictions_summary">Zobrazovat predikce na hodinkách</string>
<string name="wear_predictions_title">Predikce</string>
<string name="data_choices">Možnosti dat</string>
<string name="fabric_upload">Odesílání do Fabric</string>
<string name="allow_automated_crash_reporting">Automatické odesílání chyb aplikace a statistiky používání vývojářům pomocí služby fabric.io</string>
<string name="g5appnotdetected">Prosím aktualizujte G5 aplikaci na podporovanou verzi</string>
<string name="suspendloopfor30min">Pozastavit na 30 min</string>
<string name="start_activity_tt">Spustit Dočasný cíl Aktivita</string>
<string name="start_eating_soon_tt">Spustit Dočasný cíl Blížící se jídlo</string>
<string name="temptargetshort">DoCíl</string>
<string name="insight_min">min</string>
<string name="don_t_bolus_record_only">Nepouštět bolus, jen zaznamenat</string>
</resources>

2
app/src/main/res/values-de/strings.xml
View file

@ -375,7 +375,7 @@
<string name="tempbasaldeliveryerror">TBR Abgabe-Fehler</string>
<string name="temptarget">Temporäres Ziel</string>
<string name="timeshift_hint">Zeit in Stunden, um die das Profil verschoben wird.</string>
<string name="treatments_wizard_bgtrend_label">15-Min.-Trend</string>
<string name="treatments_wizard_bgtrend_label">15\'-Trend</string>
<string name="treatments_wizard_cob_label">COB</string>
<string name="unsupportednsversion">Nicht unterstütze Nightscout-Version</string>
<string name="uploader">Uploader</string>

1
app/src/main/res/values-es/strings.xml
View file

@ -389,7 +389,6 @@
<string name="smscommunicator_calibrationreplywithcode" formatted="false">Para enviar calibracion %.2f responder con código %s</string>
<string name="bolusrequested" formatted="false">Entregaré %.2fU</string>
<string name="danarprofile_dia_summary">Duración de acitividad de insulina</string>
<string name="pump_errors_history">Errores</string>
<string name="objectives_7_objective">habilitar funciones adicionales para uso durante el día como SMB</string>
<string name="valuelimitedto" formatted="false">%.2f limitado a %.2f</string>
<string name="smscommunicator_remotecommandnotallowed">no permitido el mando remoto</string>

14
app/src/main/res/values-ro/strings.xml
View file

@ -50,11 +50,7 @@
<string name="treatments_wizard_total_label">TOTAL</string>
<string name="openapsma_run">Fă acum</string>
<string name="vitualpump_label">POMPĂ VIRTUALĂ</string>
<string name="virtualpump_basebasalrate_label">Rata bazală normală</string>
<string name="virtualpump_tempbasal_label">Bazală temporară</string>
<string name="virtualpump_extendedbolus_label">Bolus extins</string>
<string name="virtualpump_battery_label">Baterie</string>
<string name="virtualpump_reservoir_label">Rezervor</string>
<string name="virtualpump_resultok">OK</string>
<string name="virtualpump_sqlerror">Eroare SQL</string>
<string name="openapsma_lastrun_label">Ultima acțiune</string>
@ -64,13 +60,11 @@
<string name="openapsma_iobdata_label">Date IOB</string>
<string name="openapsma_profile_label">Profil</string>
<string name="openapsma_mealdata_label">Date despre masă</string>
<string name="openapsma_result_label">Rezultat</string>
<string name="openapsma_noglucosedata">Nu există date despre glicemie</string>
<string name="openapsma_noprofile">Niciun profil disponibil</string>
<string name="openapsma_nopump">Nicio pompă disponibilă</string>
<string name="nochangerequested">Nu este solicitată nicio schimbare</string>
<string name="openapsma_request_label">Solicită</string>
<string name="openapsma_minbg_label">Ținta de jos</string>
<string name="rate">Rată</string>
<string name="duration">Durată</string>
<string name="reason">Motiv</string>
@ -85,7 +79,6 @@
<string name="overview">Privire ansamblu</string>
<string name="profileviewer">Profil NS</string>
<string name="simpleprofile">Profil simplu</string>
<string name="tempbasals">Bazale temporare</string>
<string name="treatments">Tratamente</string>
<string name="virtualpump">Pompă virtuală</string>
<string name="careportal">Careportal</string>
@ -369,7 +362,6 @@
<string name="percentagefactor_hint">Procentul factorului cu care profilul bazal va fi mărit.</string>
Time in hours by which the profile will be shifted round robin.</string>
<string name="timeshift_hint">Timpul în ore în care profilul va fi rotunjit prin metoda round-robin</string>
<string name="send_to_pump">TRIMITE CĂTRE POMPĂ</string>
<string name="units">Unități:</string>
<string name="mgdl">mg/dl</string>
<string name="mmol">mmol/l</string>
@ -379,8 +371,6 @@
<string name="edit_base_isf">Editează ISF normal:</string>
<string name="edit_base_ic">Editează IC normal:</string>
<string name="base_profile_label">Profilul de bază:</string>
<string name="androidaps_tempbasalendnote">Sfârșit bazală temporară</string>
<string name="androidaps_tempbasalstartnote">Început bazală temporară</string>
<string name="prefs_range_title">Intervalul pentru vizualizare</string>
<string name="prefs_range_summary">Valoarea maximă și minimă pentru graficele din vizualizare și pentru smartwatch</string>
<string name="low_mark">Pragul HIPO</string>
@ -393,7 +383,6 @@
<string name="pumpshutdown">Pompa se oprește</string>
<string name="batterydischarged">Bateria pompei este descărcată</string>
<string name="danarkoreanpump">DanaR Korean</string>
<string name="wrongpumpdriverselected">Driver de pompă selectat greșit</string>
<string name="basal_rate">Rată bazală:</string>
<string name="profile_set_failed">Setarea profilului bazalei a eșuat</string>
<string name="profile_set_ok">Profilul bazalei a fost modificat în pompă</string>
@ -417,8 +406,6 @@
<string name="openapsma_autosensdata_label">Date Autosens</string>
<string name="openapsma_scriptdebugdata_label">Script debug</string>
<string name="openapsama_useautosens">Folosește opțiunea autosens AMA</string>
<string name="temptargetrange">Țintă temporară</string>
<string name="temptargetrange_refreshfromnightscout">Reîncarcă țintele temporare din NS</string>
<string name="eatingsoon">Masă în curând</string>
<string name="activity">Activitate</string>
<string name="removerecord">Șterge înregistrarea:</string>
@ -573,7 +560,6 @@
<string name="predictionshortlabel">PRE</string>
<string name="basalshortlabel">BAS</string>
<string name="virtualpump_firmware_label">Firmware</string>
<string name="virtualpump_lastconnection_label">Ultima conectare</string>
<string name="danar_bluetooth_status">Status bluetooth</string>
<string name="nav_about">Despre</string>
<string name="smscommunicator_missingsmspermission">Lipsesc permisiunile de SMS</string>

1
app/src/main/res/values/strings.xml
View file

@ -975,5 +975,6 @@
<string name="start_activity_tt">Start Activity TT</string>
<string name="start_eating_soon_tt">Start Eating soon TT</string>
<string name="temptargetshort">TT</string>
<string name="don_t_bolus_record_only">Don\'t bolus, record only</string>
</resources>