mirror of
https://codeberg.org/Freeyourgadget/Gadgetbridge
synced 2024-11-24 02:46:50 +01:00
Pebble: progress with app installtion (CRC, complete install of pebble-app.bin)
This is still not working and WIP. TODO: - install resources - install workers
This commit is contained in:
Andreas Shimokawa
parent
2c1cacedb3
commit
3498ddfc7a
@ -32,6 +32,7 @@ import java.nio.ByteOrder;
|
||||
import java.util.zip.ZipInputStream;
|
||||
|
||||
import nodomain.freeyourgadget.gadgetbridge.pebble.PBWReader;
|
||||
import nodomain.freeyourgadget.gadgetbridge.pebble.STM32CRC;
|
||||
import nodomain.freeyourgadget.gadgetbridge.protocol.GBDeviceCommand;
|
||||
import nodomain.freeyourgadget.gadgetbridge.protocol.GBDeviceCommandAppInfo;
|
||||
import nodomain.freeyourgadget.gadgetbridge.protocol.GBDeviceCommandAppManagementResult;
|
||||
@ -445,6 +446,8 @@ public class BluetoothCommunicationService extends Service {
|
||||
APP_START_INSTALL,
|
||||
APP_WAIT_TOKEN,
|
||||
APP_UPLOAD_CHUNK,
|
||||
APP_UPLOAD_COMMIT,
|
||||
APP_WAIT_COMMMIT,
|
||||
APP_UPLOAD_COMPLETE,
|
||||
RES_START_INSTALL,
|
||||
RES_WAIT_TOKEN,
|
||||
@ -466,6 +469,7 @@ public class BluetoothCommunicationService extends Service {
|
||||
private PBWReader mmPBWReader = null;
|
||||
private int mmAppInstallToken = -1;
|
||||
private ZipInputStream mmZis = null;
|
||||
private STM32CRC mmSTM32CRC = new STM32CRC();
|
||||
private PebbleAppInstallState mmInstallState = PebbleAppInstallState.UNKNOWN;
|
||||
|
||||
public PebbleIoThread(String btDeviceAddress) {
|
||||
@ -509,6 +513,7 @@ public class BluetoothCommunicationService extends Service {
|
||||
switch (mmInstallState) {
|
||||
case APP_START_INSTALL:
|
||||
Log.i(TAG, "start installing app binary");
|
||||
mmSTM32CRC.reset();
|
||||
mmPBWReader = new PBWReader(mmInstallURI, getApplicationContext());
|
||||
mmZis = mmPBWReader.getInputStreamAppBinary();
|
||||
int binarySize = mmPBWReader.getAppBinarySize();
|
||||
@ -526,16 +531,34 @@ public class BluetoothCommunicationService extends Service {
|
||||
bytes = mmZis.read(buffer);
|
||||
|
||||
if (bytes != -1) {
|
||||
mmSTM32CRC.addData(buffer, bytes);
|
||||
writeInstallApp(mmPebbleProtocol.encodeUploadChunk(mmAppInstallToken, buffer, bytes), -1);
|
||||
mmAppInstallToken = -1;
|
||||
mmInstallState = PebbleAppInstallState.APP_WAIT_TOKEN;
|
||||
} else {
|
||||
mmInstallState = PebbleAppInstallState.UNKNOWN;
|
||||
mmIsInstalling = false;
|
||||
mmZis = null;
|
||||
mmAppInstallToken = -1;
|
||||
mmInstallState = PebbleAppInstallState.APP_UPLOAD_COMMIT;
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
case APP_UPLOAD_COMMIT:
|
||||
writeInstallApp(mmPebbleProtocol.encodeUploadCommit(mmAppInstallToken, mmSTM32CRC.getResult()),-1);
|
||||
mmAppInstallToken = -1;
|
||||
mmInstallState = PebbleAppInstallState.APP_WAIT_COMMMIT;
|
||||
break;
|
||||
case APP_WAIT_COMMMIT:
|
||||
if (mmAppInstallToken != -1) {
|
||||
Log.i(TAG, "got token " + mmAppInstallToken);
|
||||
mmInstallState = PebbleAppInstallState.APP_UPLOAD_COMPLETE;
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
case APP_UPLOAD_COMPLETE:
|
||||
writeInstallApp(mmPebbleProtocol.encodeUploadComplete(mmAppInstallToken),-1);
|
||||
mmInstallState = PebbleAppInstallState.UNKNOWN;
|
||||
mmIsInstalling = false;
|
||||
mmZis = null;
|
||||
mmAppInstallToken = -1;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
@ -10,8 +10,6 @@ import android.view.View;
|
||||
import android.widget.Button;
|
||||
import android.widget.TextView;
|
||||
|
||||
import java.util.zip.ZipInputStream;
|
||||
|
||||
import nodomain.freeyourgadget.gadgetbridge.BluetoothCommunicationService;
|
||||
import nodomain.freeyourgadget.gadgetbridge.GBDeviceApp;
|
||||
import nodomain.freeyourgadget.gadgetbridge.R;
|
||||
@ -38,21 +36,6 @@ public class PebbleAppInstallerActivity extends Activity {
|
||||
PBWReader pbwReader = new PBWReader(uri, getApplicationContext());
|
||||
|
||||
GBDeviceApp app = pbwReader.getGBDeviceApp();
|
||||
ZipInputStream zis = pbwReader.getInputStreamAppBinary();
|
||||
/*
|
||||
STM32CRC stm32crc = new STM32CRC();
|
||||
byte[] buffer = new byte[1000];
|
||||
int count = 0;
|
||||
try {
|
||||
while ((count = zis.read(buffer)) != -1) {
|
||||
stm32crc.addData(buffer, count);
|
||||
}
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
Log.i("TEST", "STMCRC32: " + stm32crc.getResult());
|
||||
*/
|
||||
if (pbwReader != null && app != null) {
|
||||
debugTextView.setText("This is just a test, you cant install anything yet \n\n" + app.getName() + " Version " + app.getVersion() + " by " + app.getCreator() + "\n");
|
||||
installButton.setEnabled(true);
|
||||
|
||||
@ -0,0 +1,146 @@
|
||||
package nodomain.freeyourgadget.gadgetbridge.pebble;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.ByteOrder;
|
||||
|
||||
public class STM32CRC {
|
||||
private int crc;
|
||||
private byte rem;
|
||||
private byte buffer[] = {0, 0, 0, 0};
|
||||
|
||||
private static final int[] crc_table = {
|
||||
0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9,
|
||||
0x130476dc, 0x17c56b6b, 0x1a864db2, 0x1e475005,
|
||||
0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61,
|
||||
0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd,
|
||||
0x4c11db70, 0x48d0c6c7, 0x4593e01e, 0x4152fda9,
|
||||
0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75,
|
||||
0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011,
|
||||
0x791d4014, 0x7ddc5da3, 0x709f7b7a, 0x745e66cd,
|
||||
0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039,
|
||||
0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5,
|
||||
0xbe2b5b58, 0xbaea46ef, 0xb7a96036, 0xb3687d81,
|
||||
0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d,
|
||||
0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49,
|
||||
0xc7361b4c, 0xc3f706fb, 0xceb42022, 0xca753d95,
|
||||
0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1,
|
||||
0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d,
|
||||
0x34867077, 0x30476dc0, 0x3d044b19, 0x39c556ae,
|
||||
0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072,
|
||||
0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16,
|
||||
0x018aeb13, 0x054bf6a4, 0x0808d07d, 0x0cc9cdca,
|
||||
0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde,
|
||||
0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02,
|
||||
0x5e9f46bf, 0x5a5e5b08, 0x571d7dd1, 0x53dc6066,
|
||||
0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba,
|
||||
0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e,
|
||||
0xbfa1b04b, 0xbb60adfc, 0xb6238b25, 0xb2e29692,
|
||||
0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6,
|
||||
0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a,
|
||||
0xe0b41de7, 0xe4750050, 0xe9362689, 0xedf73b3e,
|
||||
0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2,
|
||||
0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686,
|
||||
0xd5b88683, 0xd1799b34, 0xdc3abded, 0xd8fba05a,
|
||||
0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637,
|
||||
0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb,
|
||||
0x4f040d56, 0x4bc510e1, 0x46863638, 0x42472b8f,
|
||||
0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53,
|
||||
0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47,
|
||||
0x36194d42, 0x32d850f5, 0x3f9b762c, 0x3b5a6b9b,
|
||||
0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff,
|
||||
0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623,
|
||||
0xf12f560e, 0xf5ee4bb9, 0xf8ad6d60, 0xfc6c70d7,
|
||||
0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b,
|
||||
0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f,
|
||||
0xc423cd6a, 0xc0e2d0dd, 0xcda1f604, 0xc960ebb3,
|
||||
0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7,
|
||||
0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b,
|
||||
0x9b3660c6, 0x9ff77d71, 0x92b45ba8, 0x9675461f,
|
||||
0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3,
|
||||
0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640,
|
||||
0x4e8ee645, 0x4a4ffbf2, 0x470cdd2b, 0x43cdc09c,
|
||||
0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8,
|
||||
0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24,
|
||||
0x119b4be9, 0x155a565e, 0x18197087, 0x1cd86d30,
|
||||
0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec,
|
||||
0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088,
|
||||
0x2497d08d, 0x2056cd3a, 0x2d15ebe3, 0x29d4f654,
|
||||
0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0,
|
||||
0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c,
|
||||
0xe3a1cbc1, 0xe760d676, 0xea23f0af, 0xeee2ed18,
|
||||
0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4,
|
||||
0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0,
|
||||
0x9abc8bd5, 0x9e7d9662, 0x933eb0bb, 0x97ffad0c,
|
||||
0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668,
|
||||
0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4,
|
||||
};
|
||||
|
||||
public void reset() {
|
||||
crc = 0xffffffff;
|
||||
rem = 0;
|
||||
buffer[0] = 0;
|
||||
buffer[1] = 0;
|
||||
buffer[2] = 0;
|
||||
buffer[3] = 0;
|
||||
}
|
||||
|
||||
public STM32CRC() {
|
||||
reset();
|
||||
}
|
||||
|
||||
private int calc_crc(int crc, int word) {
|
||||
crc ^= word;
|
||||
crc = (crc << 8) ^ crc_table[(crc >>> 24) & 0xFF];
|
||||
crc = (crc << 8) ^ crc_table[(crc >>> 24) & 0xFF];
|
||||
crc = (crc << 8) ^ crc_table[(crc >>> 24) & 0xFF];
|
||||
crc = (crc << 8) ^ crc_table[(crc >>> 24) & 0xFF];
|
||||
return crc;
|
||||
}
|
||||
|
||||
public void addData(byte[] data, int length) {
|
||||
ByteBuffer buf = ByteBuffer.wrap(data, 0, length);
|
||||
buf.order(ByteOrder.LITTLE_ENDIAN);
|
||||
|
||||
if (rem > 0) {
|
||||
for (; rem < 4 && buf.hasRemaining(); ++rem) {
|
||||
buffer[rem] = buf.get();
|
||||
}
|
||||
|
||||
if (rem == 4) {
|
||||
int word = ((buffer[0] & 0xff)) |
|
||||
((buffer[1] & 0xff) << 8) |
|
||||
((buffer[2] & 0xff) << 16) |
|
||||
((buffer[3] & 0xff) << 24);
|
||||
crc = calc_crc(crc, word);
|
||||
buffer[0] = 0;
|
||||
buffer[1] = 0;
|
||||
buffer[2] = 0;
|
||||
buffer[3] = 0;
|
||||
rem = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
while (buf.remaining() >= 4) {
|
||||
int word = buf.getInt();
|
||||
crc = calc_crc(crc, word);
|
||||
}
|
||||
|
||||
while (buf.hasRemaining()) {
|
||||
buffer[rem++] = buf.get();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public int getResult() {
|
||||
if (rem > 0) {
|
||||
int word = ((buffer[0] & 0xff)) |
|
||||
((buffer[1] & 0xff) << 8) |
|
||||
((buffer[2] & 0xff) << 16) |
|
||||
((buffer[3] & 0xff) << 24);
|
||||
return calc_crc(crc, word);
|
||||
} else {
|
||||
return crc;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -94,7 +94,7 @@ public class PebbleProtocol extends GBDeviceProtocol {
|
||||
static final byte PHONEVERSION_APPVERSION_PATCH = 0;
|
||||
|
||||
|
||||
static final int PHONEVERSION_SESSION_CAPS_GAMMARAY = (int) 0x80000000;
|
||||
static final int PHONEVERSION_SESSION_CAPS_GAMMARAY = (int)0x80000000;
|
||||
|
||||
static final int PHONEVERSION_REMOTE_CAPS_TELEPHONY = 0x00000010;
|
||||
static final int PHONEVERSION_REMOTE_CAPS_SMS = 0x00000020;
|
||||
@ -119,6 +119,8 @@ public class PebbleProtocol extends GBDeviceProtocol {
|
||||
static final short LENGTH_PHONEVERSION = 17;
|
||||
static final short LENGTH_UPLOADSTART = 7;
|
||||
static final short LENGTH_UPLOADCHUNK = 9;
|
||||
static final short LENGTH_UPLOADCOMMIT = 9;
|
||||
static final short LENGTH_UPLOADCOMPLETE = 5;
|
||||
|
||||
private static byte[] encodeMessage(short endpoint, byte type, int cookie, String[] parts) {
|
||||
// Calculate length first
|
||||
@ -306,6 +308,28 @@ public class PebbleProtocol extends GBDeviceProtocol {
|
||||
return buf.array();
|
||||
}
|
||||
|
||||
public byte[] encodeUploadCommit(int token, int crc) {
|
||||
ByteBuffer buf = ByteBuffer.allocate(LENGTH_PREFIX + LENGTH_UPLOADCOMMIT);
|
||||
buf.order(ByteOrder.BIG_ENDIAN);
|
||||
buf.putShort(LENGTH_UPLOADCOMMIT);
|
||||
buf.putShort(ENDPOINT_PUTBYTES);
|
||||
buf.put(PUTBYTES_COMMIT);
|
||||
buf.putInt(token);
|
||||
buf.putInt(crc);
|
||||
return buf.array();
|
||||
}
|
||||
|
||||
public byte[] encodeUploadComplete(int token) {
|
||||
ByteBuffer buf = ByteBuffer.allocate(LENGTH_PREFIX + LENGTH_UPLOADCOMPLETE);
|
||||
buf.order(ByteOrder.BIG_ENDIAN);
|
||||
buf.putShort(LENGTH_UPLOADCOMPLETE);
|
||||
buf.putShort(ENDPOINT_PUTBYTES);
|
||||
buf.put(PUTBYTES_COMPLETE);
|
||||
buf.putInt(token);
|
||||
return buf.array();
|
||||
}
|
||||
|
||||
|
||||
public GBDeviceCommand decodeResponse(byte[] responseData) {
|
||||
ByteBuffer buf = ByteBuffer.wrap(responseData);
|
||||
buf.order(ByteOrder.BIG_ENDIAN);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user