spacecruft
/
farmbot_os
1
0
Fork 0
Code Issues Pull Requests Releases Activity

v9.1.0-rc13 - Syntax error fix

pull/1145/head
Rick Carlino 2020-02-11 20:33:10 -06:00
parent 16c2a5cd98
commit b87a582579
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
9.1.0-rc12
9.1.0-rc13

4
farmbot_os/lib/farmbot_os/configurator/router.ex
View File

@ -23,7 +23,9 @@ defmodule FarmbotOS.Configurator.Router do
plug(:match)
plug(:dispatch)
@network_layer Application.get_env(:farmbot, FarmbotOS.Configurator)[:network_layer]
@network_layer Application.get_env(:farmbot, FarmbotOS.Configurator)[
:network_layer
]
@telemetry_layer FarmbotOS.Configurator.DetsTelemetryLayer
# Trigger for captive portal for various operating systems

8
farmbot_os/lib/farmbot_os/sys_calls/flash_firmware.ex
View File

@ -32,7 +32,7 @@ defmodule FarmbotOS.SysCalls.FlashFirmware do
{_, 0} <- Avrdude.flash(hex_file, tty, fun) do
FarmbotCore.Logger.success(2, "Firmware flashed successfully!")
%{ firmware_path: tty }
%{firmware_path: tty}
|> Asset.update_fbos_config!()
|> Private.mark_dirty!(%{})
@ -61,11 +61,13 @@ defmodule FarmbotOS.SysCalls.FlashFirmware do
defp find_reset_fun("express_k10") do
FarmbotCore.Logger.debug(3, "Using special reset function for express")
&FarmbotOS.Platform.Target.FirmwareReset.GPIO.reset/0
fun = &FarmbotOS.Platform.Target.FirmwareReset.GPIO.reset/0
{:ok, fun}
end
defp find_reset_fun(_) do
FarmbotCore.Logger.debug(3, "Using default reset function")
&FarmbotFirmware.NullReset.reset/0
fun = &FarmbotFirmware.NullReset.reset/0
{:ok, fun}
end
end