mirror of
https://codeberg.org/Freeyourgadget/Gadgetbridge
synced 2024-08-31 03:25:52 +02:00
Pebble: Support for latest version of Morpheuz (4.6)
Also a few simplifications and minor fixes. Morpheuz 3.7 should still work (last version for FW 2.x)
This commit is contained in:
parent
a7b9ae5596
commit
e05d40dc7e
@ -23,22 +23,37 @@ import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
|
|||||||
public class AppMessageHandlerMorpheuz extends AppMessageHandler {
|
public class AppMessageHandlerMorpheuz extends AppMessageHandler {
|
||||||
|
|
||||||
public static final int KEY_POINT = 1;
|
public static final int KEY_POINT = 1;
|
||||||
|
public static final int KEY_POINT_46 = 10000;
|
||||||
public static final int KEY_CTRL = 2;
|
public static final int KEY_CTRL = 2;
|
||||||
|
public static final int KEY_CTRL_46 = 10001;
|
||||||
public static final int KEY_FROM = 3;
|
public static final int KEY_FROM = 3;
|
||||||
|
public static final int KEY_FROM_46 = 10002;
|
||||||
public static final int KEY_TO = 4;
|
public static final int KEY_TO = 4;
|
||||||
|
public static final int KEY_TO_46 = 10003;
|
||||||
public static final int KEY_BASE = 5;
|
public static final int KEY_BASE = 5;
|
||||||
|
public static final int KEY_BASE_46 = 10004;
|
||||||
public static final int KEY_VERSION = 6;
|
public static final int KEY_VERSION = 6;
|
||||||
|
public static final int KEY_VERSION_46 = 10005;
|
||||||
public static final int KEY_GONEOFF = 7;
|
public static final int KEY_GONEOFF = 7;
|
||||||
|
public static final int KEY_GONEOFF_46 = 10006;
|
||||||
public static final int KEY_TRANSMIT = 8;
|
public static final int KEY_TRANSMIT = 8;
|
||||||
|
public static final int KEY_TRANSMIT_46 = 10007;
|
||||||
public static final int KEY_AUTO_RESET = 9;
|
public static final int KEY_AUTO_RESET = 9;
|
||||||
|
public static final int KEY_AUTO_RESET_46 = 10008;
|
||||||
|
public static final int KEY_SNOOZES = 10;
|
||||||
|
public static final int KEY_SNOOZES_46 = 10009;
|
||||||
|
public static final int KEY_FAULT_46 = 10010;
|
||||||
|
|
||||||
public static final int CTRL_TRANSMIT_DONE = 1;
|
public static final int CTRL_TRANSMIT_DONE = 1;
|
||||||
public static final int CTRL_VERSION_DONE = 2;
|
public static final int CTRL_VERSION_DONE = 2;
|
||||||
public static final int CTRL_GONEOFF_DONE = 4;
|
public static final int CTRL_GONEOFF_DONE = 4;
|
||||||
public static final int CTRL_DO_NEXT = 8;
|
public static final int CTRL_DO_NEXT = 8;
|
||||||
public static final int CTRL_SET_LAST_SENT = 16;
|
public static final int CTRL_SET_LAST_SENT = 16;
|
||||||
|
public static final int CTRL_LAZARUS = 32;
|
||||||
|
public static final int CTRL_SNOOZES_DONE = 64;
|
||||||
|
|
||||||
// data received from Morpheuz in native format
|
// data received from Morpheuz in native format
|
||||||
|
private int version = 0;
|
||||||
private int smartalarm_from = -1; // time in minutes relative from 0:00 for smart alarm (earliest)
|
private int smartalarm_from = -1; // time in minutes relative from 0:00 for smart alarm (earliest)
|
||||||
private int smartalarm_to = -1;// time in minutes relative from 0:00 for smart alarm (latest)
|
private int smartalarm_to = -1;// time in minutes relative from 0:00 for smart alarm (latest)
|
||||||
private int recording_base_timestamp = -1; // timestamp for the first "point", all folowing are +10 minutes offset each
|
private int recording_base_timestamp = -1; // timestamp for the first "point", all folowing are +10 minutes offset each
|
||||||
@ -71,21 +86,25 @@ public class AppMessageHandlerMorpheuz extends AppMessageHandler {
|
|||||||
for (Pair<Integer, Object> pair : pairs) {
|
for (Pair<Integer, Object> pair : pairs) {
|
||||||
switch (pair.first) {
|
switch (pair.first) {
|
||||||
case KEY_TRANSMIT:
|
case KEY_TRANSMIT:
|
||||||
case KEY_GONEOFF:
|
case KEY_TRANSMIT_46:
|
||||||
if (pair.first == KEY_GONEOFF) {
|
|
||||||
alarm_gone_off = (int) pair.second;
|
|
||||||
LOG.info("got gone off: " + alarm_gone_off / 60 + ":" + alarm_gone_off % 60);
|
|
||||||
}
|
|
||||||
sleepMonitorResult = new GBDeviceEventSleepMonitorResult();
|
sleepMonitorResult = new GBDeviceEventSleepMonitorResult();
|
||||||
sleepMonitorResult.smartalarm_from = smartalarm_from;
|
sleepMonitorResult.smartalarm_from = smartalarm_from;
|
||||||
sleepMonitorResult.smartalarm_to = smartalarm_to;
|
sleepMonitorResult.smartalarm_to = smartalarm_to;
|
||||||
sleepMonitorResult.alarm_gone_off = alarm_gone_off;
|
sleepMonitorResult.alarm_gone_off = alarm_gone_off;
|
||||||
sleepMonitorResult.recording_base_timestamp = recording_base_timestamp;
|
sleepMonitorResult.recording_base_timestamp = recording_base_timestamp;
|
||||||
|
ctrl_message |= CTRL_TRANSMIT_DONE;
|
||||||
|
break;
|
||||||
|
case KEY_GONEOFF:
|
||||||
|
case KEY_GONEOFF_46:
|
||||||
|
alarm_gone_off = (int) pair.second;
|
||||||
|
LOG.info("got gone off: " + alarm_gone_off / 60 + ":" + alarm_gone_off % 60);
|
||||||
|
ctrl_message |= CTRL_DO_NEXT | CTRL_GONEOFF_DONE;
|
||||||
break;
|
break;
|
||||||
case KEY_POINT:
|
case KEY_POINT:
|
||||||
|
case KEY_POINT_46:
|
||||||
if (recording_base_timestamp == -1) {
|
if (recording_base_timestamp == -1) {
|
||||||
// we have no base timestamp but received points, stop this
|
// we have no base timestamp but received points, stop this
|
||||||
ctrl_message = AppMessageHandlerMorpheuz.CTRL_VERSION_DONE | AppMessageHandlerMorpheuz.CTRL_GONEOFF_DONE | AppMessageHandlerMorpheuz.CTRL_TRANSMIT_DONE | AppMessageHandlerMorpheuz.CTRL_SET_LAST_SENT;
|
ctrl_message = CTRL_VERSION_DONE | CTRL_GONEOFF_DONE | CTRL_TRANSMIT_DONE | CTRL_SET_LAST_SENT;
|
||||||
} else {
|
} else {
|
||||||
int index = ((int) pair.second >> 16);
|
int index = ((int) pair.second >> 16);
|
||||||
int intensity = ((int) pair.second & 0xffff);
|
int intensity = ((int) pair.second & 0xffff);
|
||||||
@ -109,32 +128,46 @@ public class AppMessageHandlerMorpheuz extends AppMessageHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ctrl_message = AppMessageHandlerMorpheuz.CTRL_VERSION_DONE | AppMessageHandlerMorpheuz.CTRL_SET_LAST_SENT | AppMessageHandlerMorpheuz.CTRL_DO_NEXT;
|
ctrl_message |= CTRL_SET_LAST_SENT | CTRL_DO_NEXT;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case KEY_FROM:
|
case KEY_FROM:
|
||||||
|
case KEY_FROM_46:
|
||||||
smartalarm_from = (int) pair.second;
|
smartalarm_from = (int) pair.second;
|
||||||
LOG.info("got from: " + smartalarm_from / 60 + ":" + smartalarm_from % 60);
|
LOG.info("got from: " + smartalarm_from / 60 + ":" + smartalarm_from % 60);
|
||||||
ctrl_message = AppMessageHandlerMorpheuz.CTRL_VERSION_DONE | AppMessageHandlerMorpheuz.CTRL_SET_LAST_SENT | AppMessageHandlerMorpheuz.CTRL_DO_NEXT;
|
ctrl_message |= CTRL_SET_LAST_SENT | CTRL_DO_NEXT;
|
||||||
break;
|
break;
|
||||||
case KEY_TO:
|
case KEY_TO:
|
||||||
|
case KEY_TO_46:
|
||||||
smartalarm_to = (int) pair.second;
|
smartalarm_to = (int) pair.second;
|
||||||
LOG.info("got to: " + smartalarm_to / 60 + ":" + smartalarm_to % 60);
|
LOG.info("got to: " + smartalarm_to / 60 + ":" + smartalarm_to % 60);
|
||||||
ctrl_message = AppMessageHandlerMorpheuz.CTRL_VERSION_DONE | AppMessageHandlerMorpheuz.CTRL_SET_LAST_SENT | AppMessageHandlerMorpheuz.CTRL_DO_NEXT;
|
ctrl_message |= CTRL_SET_LAST_SENT | CTRL_DO_NEXT;
|
||||||
break;
|
break;
|
||||||
case KEY_VERSION:
|
case KEY_VERSION:
|
||||||
LOG.info("got version: " + ((float) ((int) pair.second) / 10.0f));
|
case KEY_VERSION_46:
|
||||||
ctrl_message = AppMessageHandlerMorpheuz.CTRL_VERSION_DONE;
|
version = (int) pair.second;
|
||||||
|
LOG.info("got version: " + ((float) version / 10.0f));
|
||||||
|
ctrl_message |= CTRL_VERSION_DONE;
|
||||||
break;
|
break;
|
||||||
case KEY_BASE:
|
case KEY_BASE:
|
||||||
|
case KEY_BASE_46:
|
||||||
// fix timestamp
|
// fix timestamp
|
||||||
TimeZone tz = SimpleTimeZone.getDefault();
|
TimeZone tz = SimpleTimeZone.getDefault();
|
||||||
recording_base_timestamp = (int) pair.second - (tz.getOffset(System.currentTimeMillis())) / 1000;
|
recording_base_timestamp = (int) pair.second - (tz.getOffset(System.currentTimeMillis())) / 1000;
|
||||||
LOG.info("got base: " + recording_base_timestamp);
|
LOG.info("got base: " + recording_base_timestamp);
|
||||||
ctrl_message = AppMessageHandlerMorpheuz.CTRL_VERSION_DONE | AppMessageHandlerMorpheuz.CTRL_SET_LAST_SENT | AppMessageHandlerMorpheuz.CTRL_DO_NEXT;
|
ctrl_message |= CTRL_SET_LAST_SENT | CTRL_DO_NEXT;
|
||||||
break;
|
break;
|
||||||
case KEY_AUTO_RESET:
|
case KEY_AUTO_RESET:
|
||||||
ctrl_message = AppMessageHandlerMorpheuz.CTRL_VERSION_DONE | AppMessageHandlerMorpheuz.CTRL_SET_LAST_SENT | AppMessageHandlerMorpheuz.CTRL_DO_NEXT;
|
case KEY_AUTO_RESET_46:
|
||||||
|
ctrl_message |= CTRL_SET_LAST_SENT | CTRL_DO_NEXT;
|
||||||
|
break;
|
||||||
|
case KEY_SNOOZES:
|
||||||
|
case KEY_SNOOZES_46:
|
||||||
|
ctrl_message |= CTRL_SNOOZES_DONE | CTRL_DO_NEXT;
|
||||||
|
break;
|
||||||
|
case KEY_FAULT_46:
|
||||||
|
LOG.info("fault code: " + (int) pair.second);
|
||||||
|
ctrl_message |= CTRL_DO_NEXT;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
LOG.info("unhandled key: " + pair.first);
|
LOG.info("unhandled key: " + pair.first);
|
||||||
@ -150,7 +183,11 @@ public class AppMessageHandlerMorpheuz extends AppMessageHandler {
|
|||||||
GBDeviceEventSendBytes sendBytesCtrl = null;
|
GBDeviceEventSendBytes sendBytesCtrl = null;
|
||||||
if (ctrl_message > 0) {
|
if (ctrl_message > 0) {
|
||||||
sendBytesCtrl = new GBDeviceEventSendBytes();
|
sendBytesCtrl = new GBDeviceEventSendBytes();
|
||||||
sendBytesCtrl.encodedBytes = encodeMorpheuzMessage(AppMessageHandlerMorpheuz.KEY_CTRL, ctrl_message);
|
int ctrlkey = KEY_CTRL;
|
||||||
|
if (version >= 46) {
|
||||||
|
ctrlkey = KEY_CTRL_46;
|
||||||
|
}
|
||||||
|
sendBytesCtrl.encodedBytes = encodeMorpheuzMessage(ctrlkey, ctrl_message);
|
||||||
}
|
}
|
||||||
|
|
||||||
// ctrl and sleep monitor might be null, thats okay
|
// ctrl and sleep monitor might be null, thats okay
|
||||||
|
Loading…
Reference in New Issue
Block a user