nixo
/
GadgetBridge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pebble: Support installing .pbl (language files) on firmware 3.x

master
Andreas Shimokawa 2015-12-08 12:06:27 +01:00
parent 7f8ba83aab
commit 3ac00a004f
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,8 +1,9 @@
###Changelog
####Next Version
* Pebble: store app details in pbw-cache and display them in app manager on firmware 3.x
* Pebble: Store app details in pbw-cache and display them in app manager on firmware 3.x
* Pebble: Increase maximum notification body length from 255 to 512 bytes on firmware 3.x
* Pebble: Support installing .pbl (language files) on firmware 3.x
####Version 0.6.8
* Mi Band support for Firmware upgrade/downgrade on Mi Band 1A (white LEDs, no heartrate sensor)

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWInstallHandler.java
View File

@ -110,7 +110,7 @@ public class PBWInstallHandler implements InstallHandler {
@Override
public void onStartInstall(GBDevice device) {
if (mPBWReader.isFirmware()) {
if (mPBWReader.isFirmware() || mPBWReader.isLanguage()) {
return;
}

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWReader.java
View File

@ -64,7 +64,7 @@ public class PBWReader {
InputStream fin = new BufferedInputStream(cr.openInputStream(uri));
if (uri.toString().endsWith(".pbl") && platform.equals("aplite")) {
if (uri.toString().endsWith(".pbl")) {
STM32CRC stm32crc = new STM32CRC();
try {
byte[] buf = new byte[2000];

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java
View File

@ -581,7 +581,7 @@ public class PebbleIoThread extends GBDeviceIoThread {
writeInstallApp(mPebbleProtocol.encodeGetTime());
} else {
GBDeviceApp app = mPBWReader.getGBDeviceApp();
if (mPebbleProtocol.isFw3x) {
if (mPebbleProtocol.isFw3x && !mPBWReader.isLanguage()) {
if (appId == 0) {
// only install metadata - not the binaries
write(mPebbleProtocol.encodeInstallMetadata(app.getUUID(), app.getName(), mPBWReader.getAppVersion(), mPBWReader.getSdkVersion(), mPBWReader.getFlags(), mPBWReader.getIconId()));

4
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java
View File

@ -1029,7 +1029,7 @@ public class PebbleProtocol extends GBDeviceProtocol {
/* pebble specific install methods */
public byte[] encodeUploadStart(byte type, int app_id, int size, String filename) {
short length;
if (isFw3x) {
if (isFw3x && (type != PUTBYTES_TYPE_FILE)) {
length = LENGTH_UPLOADSTART_3X;
type |= 0b10000000;
} else {
@ -1048,7 +1048,7 @@ public class PebbleProtocol extends GBDeviceProtocol {
buf.putInt(size);
buf.put(type);
if (isFw3x) {
if (isFw3x && (type != PUTBYTES_TYPE_FILE)) {
buf.putInt(app_id);
} else {
// slot