diff --git a/java_console/bin/broadcast.sh b/java_console/bin/broadcast.sh index 821e851de7..8e2b38c533 100755 --- a/java_console/bin/broadcast.sh +++ b/java_console/bin/broadcast.sh @@ -16,7 +16,7 @@ do # in java code that's UPDATE_RELEASE_SBC_EXIT_CODE magic number if [ $exit_status -eq 17 ]; then echo Connector software update to latest was requested - bin/update_bundle_latest.sh + bin/update_bundle_release.sh fi # in java code that's UPDATE_FIRMWARE_EXIT_CODE magic number if [ $exit_status -eq 16 ]; then @@ -28,7 +28,7 @@ do # in java code that's UPDATE_RELEASE_FIRMWARE_EXIT_CODE magic number if [ $exit_status -eq 18 ]; then echo Firmware update was requested - bin/update_bundle_latest.sh + bin/update_bundle_release.sh # todo: we need to start validating that SBC software matches board type, maybe update bundle type based on existing controller? bin/dfu_switch_and_program.sh fi diff --git a/java_tools/proxy_server/src/main/java/com/rusefi/server/UpdateRequestHandler.java b/java_tools/proxy_server/src/main/java/com/rusefi/server/UpdateRequestHandler.java index 401b0a1519..5e249610bc 100644 --- a/java_tools/proxy_server/src/main/java/com/rusefi/server/UpdateRequestHandler.java +++ b/java_tools/proxy_server/src/main/java/com/rusefi/server/UpdateRequestHandler.java @@ -46,10 +46,11 @@ public class UpdateRequestHandler implements Take { if (state == null) throw new IOException("Not acquired " + tuner); + UpdateType type = UpdateType.valueOf(updateTypeString); + // should controller communication happen on http thread or not? new Thread(() -> { try { - UpdateType type = UpdateType.valueOf(updateTypeString); state.invokeOnlineCommand(type.getCode()); } catch (IOException e) { throw new IllegalStateException(e); @@ -58,7 +59,7 @@ public class UpdateRequestHandler implements Take { } }).start(); - log.debug("Update request " + tuner); + log.debug("Update request " + tuner + " " + type); } catch (IOException e) { objectBuilder.add("result", "error: " + e); return new RsJson(objectBuilder.build());