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

get rid of IO.inspects

pull/197/head
connor rigby 2016-11-08 07:20:08 -08:00
parent 870919245c
commit 658d33818e
16 changed files with 35 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/bot_state/bot_config_event_manager.ex
View File

@ -1,4 +1,8 @@
defmodule BotState.EventManager do
@doc """
Don't worry about compiler warnings in this module. I need to add some things
to FakeNerves
"""
use GenEvent
require Logger

12
lib/extras/extras.ex
View File

@ -1,12 +0,0 @@
defmodule Extras do
use Supervisor
def init(_args) do
children = []
opts = [strategy: :one_for_one, name: Extras]
supervise(children, opts)
end
def start_link(args) do
Supervisor.start_link(__MODULE__, args)
end
end

70
lib/extras/nes_controller/bot_control.ex
View File

@ -1,70 +0,0 @@
defmodule NesBotControl do
use GenServer
@moduledoc """
Use a new controller to control the bots servos.
"""
def init(_) do
{:ok, pid} = NesController.start_link(self())
{:ok, {:none, pid}}
end
def start_link(args) do
GenServer.start_link(__MODULE__, args, name: __MODULE__)
end
# if there is already something happening, dont allow other stuff
def handle_info(button, {last_button, pid})
when button == last_button do
{:noreply, {button, pid}}
end
def handle_info(:up, {:none, pid}) do
Command.move_relative({:y, 100, 100})
{:noreply, {:up, pid}}
end
def handle_info(:down, {:none, pid}) do
Command.move_relative({:y, 100, -100})
{:noreply, {:down, pid}}
end
def handle_info(:left, {:none, pid}) do
Command.move_relative({:x, 100, -100})
{:noreply, {:left, pid}}
end
def handle_info(:right, {:none, pid} ) do
Command.move_relative({:x, 100, 100})
{:noreply, {:right, pid}}
end
def handle_info(:a, {:none, pid}) do
Command.move_relative({:z, 100, 100})
{:noreply, {:a, pid}}
end
def handle_info(:b, {:none, pid}) do
Command.move_relative({:z, 100, -100})
{:noreply, {:b, pid}}
end
def handle_info(:select, {:none, pid}) do
Command.home_all(100)
{:noreply, {:select, pid}}
end
def handle_info(:start, {:none, pid}) do
Command.home_all(100)
{:noreply, {:start, pid}}
end
def handle_info(:done, {_old_button, pid}) do
Process.sleep(200) # wait for bot position to be updated
{:noreply, {:none, pid}}
end
def handle_info(_button, {last_button, pid}) do
{:noreply, {last_button, pid}}
end
end

127
lib/extras/nes_controller/nes_controller.ex
View File

@ -1,127 +0,0 @@
defmodule NesController do
require Bitwise
@latch_out 10
@clock_out 9
@data_in 25
# | A | B | SEL | STA | UP | DWN | LFT | RIGHT |
@a 01111111
@b 10111111
@select 11011111
@start 11101111
@up 11110111
@down 11111011
@left 11111101
@right 11111110
@none 11111111
def start_link(pid) do
GenServer.start_link(__MODULE__, pid, name: __MODULE__)
end
def init(pid) do
{:ok, latch} = Gpio.start_link(@latch_out, :output)
{:ok, clock} = Gpio.start_link(@clock_out, :output)
{:ok, data} = Gpio.start_link(@data_in, :input)
Gpio.write(latch,1) # Write latch high
Gpio.write(clock,1) # write clock high
spawn fn -> read_controller(latch, clock, data) end
state = {@none, pid}
{:ok, state}
end
def handle_info(@up, {button, pid})
when button != @up do
send(pid, :up)
{:noreply, {@up, pid}}
end
def handle_info(@down, {button, pid})
when button != @down do
send(pid, :down)
{:noreply, {@down, pid}}
end
def handle_info(@left, {button, pid})
when button != @left do
send(pid, :left)
{:noreply, {@left, pid}}
end
def handle_info(@right, {button, pid})
when button != @right do
send(pid, :right)
{:noreply, {@right, pid}}
end
def handle_info(@a, {button, pid})
when button != @a do
send(pid, :a)
{:noreply, {@a, pid}}
end
def handle_info(@b, {button, pid})
when button != @b do
send(pid, :b)
{:noreply, {@b, pid}}
end
def handle_info(@start, {button, pid})
when button != @start do
send(pid, :start)
{:noreply, {@start, pid}}
end
def handle_info(@select, {button, pid})
when button != @select do
send(pid, :select)
{:noreply, {@select, pid}}
end
def handle_info(button, {last_button, pid})
when button == last_button do
{:noreply, {last_button, pid}}
end
# If the callback wants to handle multiple button pushes.
def handle_info(button, {_, pid}) do
send(pid, button)
{:noreply, {button, pid}}
end
def handle_info(@none, {_, pid}) do
{:noreply, {@none, pid}}
end
def handle_info(info, state) do
IO.inspect info
IO.inspect state
{:noreply, state}
end
def read_controller(latch, clock, data) do
Gpio.write(latch, 0)
Gpio.write(clock, 0)
Gpio.write(latch, 1)
Gpio.write(latch, 0)
first_bit = Gpio.read(data)
controller_loop({latch, clock, data}, first_bit, 1)
end
def controller_loop({latch, clock, data},bit, 8) do
send(__MODULE__, Integer.to_string(bit, 2) |> String.to_integer)
read_controller(latch, clock, data)
end
def controller_loop({latch, clock, data}, bit, loop) do
Gpio.write(clock, 1)
Process.sleep(1)
next_bit = bit
|> Bitwise.bsl(1)
|> Kernel.+( Gpio.read(data) )
Gpio.write(clock, 0)
controller_loop({latch, clock, data}, next_bit, loop+1)
end
end

30
lib/factory_reset.ex
View File

@ -1,30 +0,0 @@
defmodule FactoryReset do
@reset_pin Application.get_env(:fb, :factory_reset_pin)
require Logger
use GenServer
def init(_args) do
{:ok, pid} = Gpio.start_link(@reset_pin, :input)
Gpio.set_int(pid, :both)
{:ok, pid}
end
def start_link(args) do
GenServer.start_link(__MODULE__, args, name: __MODULE__)
end
def handle_info({:gpio_interrupt, @reset_pin, :falling}, state) do
{:noreply, state}
end
def handle_info({:EXIT, _pid, reason}, state) do
Logger.debug("hes dead jim")
IO.inspect(reason)
{:noreply, state}
end
def handle_info(event, state) do
Logger.debug("got event: #{inspect event}" )
{:noreply, state}
end
end

8
lib/farm_event/farm_event_manager.ex
View File

@ -264,8 +264,8 @@ end
@doc """
Gets the current state of FarmEventManager.
"""
@spec state() :: FarmEventManager.State.t
def state do
@spec get_state() :: FarmEventManager.State.t
def get_state do
GenServer.call(__MODULE__, :state)
end
@ -276,7 +276,7 @@ end
def terminate(reason, state) do
Logger.error("Farm Event Manager died. This is not good.")
spawn fn -> RPC.MessageHandler.send_status end
IO.inspect reason
IO.inspect state
Logger.debug("REASON: #{inspect reason}")
Logger.debug("STATE: #{inspect state}")
end
end

2
lib/fw.ex
View File

@ -55,7 +55,7 @@ defmodule Fw do
end
def start(_type, args) do
IO.inspect fs_init(@env)
fs_init(@env)
Logger.debug("Starting Firmware on Target: #{@target}")
Supervisor.start_link(__MODULE__, args)
end

10
lib/json_rpc/json_rpc_message_handler.ex
View File

@ -37,7 +37,7 @@ defmodule RPC.MessageHandler do
# JSON RPC RESPONSE ERROR
def ack_msg(id, {name, message}) when is_bitstring(id) and is_bitstring(name) and is_bitstring(message) do
Logger.error("RPC ERROR")
IO.inspect({name, message})
Logger.debug("#{inspect {name, message}}")
Poison.encode!(
%{id: id,
error: %{name: name,
@ -76,7 +76,7 @@ defmodule RPC.MessageHandler do
def handle_rpc(broken_rpc) do
Logger.debug("Got a broken RPC message!!")
IO.inspect broken_rpc
Logger.debug("#{inspect broken_rpc}")
end
# E STOP
@ -92,9 +92,8 @@ defmodule RPC.MessageHandler do
:ok
end
def do_handle("home_all", params) do
def do_handle("home_all", _params) do
Logger.debug("bad params for home_all")
IO.inspect(params)
{:error, "BAD_PARAMS",
Poison.encode!(%{"speed" => "number"})}
end
@ -143,9 +142,8 @@ defmodule RPC.MessageHandler do
:ok
end
def do_handle("move_absolute", params) do
def do_handle("move_absolute", _params) do
Logger.debug("bad params for Move Absolute")
IO.inspect params
{:error, "BAD_PARAMS",
Poison.encode!(%{"x" => "number", "y" => "number", "z" => "number", "speed" => "number"})}
end

8
lib/mqtt/mqtt_handler.ex
View File

@ -132,7 +132,13 @@ defmodule Mqtt.Handler do
def handle_info({:EXIT, pid, reason}, {client, token})
when pid == client do
Logger.debug("Hulaki died.")
Logger.error("Hulaki died.")
{:crashme, {client, token}}
end
def handle_info({:EXIT, pid, reason}, {client, token}) do
Logger.debug("something. died.")
{:noreply, {client, token}}
end
def handle_info({:authorization, token}, {client, _old_token}) do

2
lib/safe_storage.ex
View File

@ -107,7 +107,7 @@ defmodule SafeStorage do
@doc """
Delete me
"""
def state() do
def get_state do
GenServer.call(__MODULE__, :state)
end

4
lib/sequence/sequence_instruction_set_0.ex
View File

@ -63,9 +63,7 @@ defmodule SequenceInstructionSet_0 do
end
def terminate(reason, parent) do
Logger.debug(\"Corpus died.\")
IO.inspect(reason)
IO.inspect(parent)
Logger.error(\"Corpus died.\")
end
end" |> Code.string_to_quoted!
end

6
lib/sequence/sequence_manager.ex
View File

@ -100,9 +100,7 @@ defmodule SequenceManager do
Logger.debug("Sequence Manager shutting down")
end
def terminate(reason, state) do
Logger.debug("Sequence Manager died unnaturally: ")
IO.inspect reason
IO.inspect state
def terminate(reason, _state) do
Logger.debug("Sequence Manager died unnaturally: #{inspect reason}")
end
end

4
lib/serial/gcode_handler.ex
View File

@ -84,13 +84,13 @@ defmodule Gcode.Handler do
end
# If we arent waiting on anything right now. (current is nil and log is empty)
def handle_call({:send, message, caller}, _from, %{ nerves: nerves, current: nil, log: [] }) do
def handle_call({:send, message, caller}, _from, %{nerves: nerves, current: nil, log: []}) do
Serial.Handler.write(nerves,message)
{:reply, :sending, %{nerves: nerves, current: {message, caller}, log: []} }
end
def handle_call({:send, message, caller}, _from, %{nerves: nerves, current: current, log: log}) do
{:reply, :logging, %{nerves: nerves, current: current, log: log ++ [{message, caller}]} }
{:reply, :logging, %{nerves: nerves, current: current, log: log ++ [{message, caller}]}}
end
def handle_call(:state, _from, state) do

1
lib/ssh.ex
View File

@ -33,7 +33,6 @@ defmodule SSH do
end
def handle_info(info, port) do
IO.inspect info
{:noreply, port}
end

5
mix.exs
View File

@ -100,7 +100,10 @@ defmodule Fw.Mixfile do
end
def deps(:dev) do
deps ++ [{:fake_nerves, github: "ConnorRigby/fake_nerves"}]
deps ++ [
# {:fake_nerves, github: "ConnorRigby/fake_nerves"},
{:fake_nerves, path: "../fake_nerves"},
{:credo, "~> 0.4"}]
end
def platform_deps("rpi3") do

8
mix.lock
View File

@ -1,10 +1,12 @@
%{"bbmustache": {:hex, :bbmustache, "1.0.4", "7ba94f971c5afd7b6617918a4bb74705e36cab36eb84b19b6a1b7ee06427aa38", [:rebar], []},
"bunt": {:hex, :bunt, "0.1.6", "5d95a6882f73f3b9969fdfd1953798046664e6f77ec4e486e6fafc7caad97c6f", [:mix], []},
"certifi": {:hex, :certifi, "0.7.0", "861a57f3808f7eb0c2d1802afeaae0fa5de813b0df0979153cbafcd853ababaf", [:rebar3], []},
"cf": {:hex, :cf, "0.2.1", "69d0b1349fd4d7d4dc55b7f407d29d7a840bf9a1ef5af529f1ebe0ce153fc2ab", [:rebar3], []},
"combine": {:hex, :combine, "0.9.2", "cd3c8721f378ebe032487d8a4fa2ced3181a456a3c21b16464da8c46904bb552", [:mix], []},
"cors_plug": {:hex, :cors_plug, "1.1.2", "3e7451286996f745c7b629c39d24a6493e59b0c8191f27e67f6ab097f96ffd23", [:mix], [{:cowboy, "~> 1.0.0", [hex: :cowboy, optional: false]}, {:plug, "> 0.8.0", [hex: :plug, optional: false]}]},
"cowboy": {:hex, :cowboy, "1.0.4", "a324a8df9f2316c833a470d918aaf73ae894278b8aa6226ce7a9bf699388f878", [:rebar, :make], [{:cowlib, "~> 1.0.0", [hex: :cowlib, optional: false]}, {:ranch, "~> 1.0", [hex: :ranch, optional: false]}]},
"cowlib": {:hex, :cowlib, "1.0.2", "9d769a1d062c9c3ac753096f868ca121e2730b9a377de23dec0f7e08b1df84ee", [:make], []},
"credo": {:hex, :credo, "0.5.2", "92e8c9f86e0ffbf9f688595e9f4e936bc96a52e5606d2c19713e9e4d191d5c74", [:mix], [{:bunt, "~> 0.1.6", [hex: :bunt, optional: false]}]},
"elixir_ale": {:hex, :elixir_ale, "0.5.6", "a94c89a17ec39ad4c4a9a90d4f00bd9f33b2f2e98703317fbdf5efceab276b44", [:mix, :make], [{:elixir_make, "~> 0.3", [hex: :elixir_make, optional: false]}]},
"elixir_make": {:hex, :elixir_make, "0.4.0", "992f38fabe705bb45821a728f20914c554b276838433349d4f2341f7a687cddf", [:mix], []},
"erlware_commons": {:hex, :erlware_commons, "0.21.0", "a04433071ad7d112edefc75ac77719dd3e6753e697ac09428fc83d7564b80b15", [:rebar3], [{:cf, "0.2.1", [hex: :cf, optional: false]}]},
@ -16,7 +18,7 @@
"gen_stage": {:hex, :gen_stage, "0.8.0", "a76e3f0530f86fae8b8a1021c06527b1ec171cf4c0bdfecd8d5ad0376d1205af", [:mix], []},
"getopt": {:hex, :getopt, "0.8.2", "b17556db683000ba50370b16c0619df1337e7af7ecbf7d64fbf8d1d6bce3109b", [:rebar], []},
"gettext": {:hex, :gettext, "0.12.1", "c0624f52763469ef7a3674919ae28b8286d88195b90fa1516180f31bbbd26d14", [:mix], []},
"hackney": {:hex, :hackney, "1.6.3", "d489d7ca2d4323e307bedc4bfe684323a7bf773ecfd77938f3ee8074e488e140", [:rebar3, :mix], [{:certifi, "0.7.0", [hex: :certifi, optional: false]}, {:idna, "1.2.0", [hex: :idna, optional: false]}, {:metrics, "1.0.1", [hex: :metrics, optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, optional: false]}, {:ssl_verify_fun, "1.1.1", [hex: :ssl_verify_fun, optional: false]}]},
"hackney": {:hex, :hackney, "1.6.3", "d489d7ca2d4323e307bedc4bfe684323a7bf773ecfd77938f3ee8074e488e140", [:mix, :rebar3], [{:certifi, "0.7.0", [hex: :certifi, optional: false]}, {:idna, "1.2.0", [hex: :idna, optional: false]}, {:metrics, "1.0.1", [hex: :metrics, optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, optional: false]}, {:ssl_verify_fun, "1.1.1", [hex: :ssl_verify_fun, optional: false]}]},
"httpotion": {:hex, :httpotion, "3.0.2", "525b9bfeb592c914a61a8ee31fdde3871e1861dfe805f8ee5f711f9f11a93483", [:mix], [{:ibrowse, "~> 4.2", [hex: :ibrowse, optional: false]}]},
"hulaaki": {:git, "https://github.com/ConnorRigby/hulaaki.git", "47b77e8673ce522f9475e0c2e29f97648ce8598c", []},
"ibrowse": {:hex, :ibrowse, "4.2.2", "b32b5bafcc77b7277eff030ed32e1acc3f610c64e9f6aea19822abcadf681b4b", [:rebar3], []},
@ -40,7 +42,7 @@
"nerves_toolchain": {:hex, :nerves_toolchain, "0.7.1", "164f5fcf07f717d5e8f918965ea043c860b75065768c93a726f763498a7d8792", [:mix], []},
"nerves_toolchain_arm_unknown_linux_gnueabihf": {:hex, :nerves_toolchain_arm_unknown_linux_gnueabihf, "0.7.1", "44753bb9c301704de8b5d238cda7eba8a96b9975563d1b146316699c5c0cb129", [:mix], [{:nerves_toolchain, "~> 0.7", [hex: :nerves_toolchain, optional: false]}, {:nerves_toolchain_ctng, "~> 0.7", [hex: :nerves_toolchain_ctng, optional: false]}]},
"nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "0.7.1", "6f46b1591b23d1a017347f8cd9962c24775b2a6fde4e2f2b5251439efef8d6a4", [:mix], []},
"nerves_uart": {:hex, :nerves_uart, "0.1.1", "32e6186b1a1b1d744631126df0b6c4049ddde5b04bc0303de29ab86a2edf60a2", [:mix, :make], [{:elixir_make, "~> 0.3", [hex: :elixir_make, optional: false]}]},
"nerves_uart": {:hex, :nerves_uart, "0.1.1", "32e6186b1a1b1d744631126df0b6c4049ddde5b04bc0303de29ab86a2edf60a2", [:make, :mix], [{:elixir_make, "~> 0.3", [hex: :elixir_make, optional: false]}]},
"nerves_wpa_supplicant": {:hex, :nerves_wpa_supplicant, "0.2.2", "da829baec94a8afa7da3a6beaaf1725b9ca7f5f58779ba50b73568b7d37d3d98", [:mix, :make], [{:elixir_make, "~> 0.3", [hex: :elixir_make, optional: false]}]},
"plug": {:hex, :plug, "1.2.2", "cfbda521b54c92ab8ddffb173fbaabed8d8fc94bec07cd9bb58a84c1c501b0bd", [:mix], [{:cowboy, "~> 1.0", [hex: :cowboy, optional: true]}, {:mime, "~> 1.0", [hex: :mime, optional: false]}]},
"poison": {:hex, :poison, "2.2.0", "4763b69a8a77bd77d26f477d196428b741261a761257ff1cf92753a0d4d24a63", [:mix], []},
@ -48,6 +50,6 @@
"ranch": {:hex, :ranch, "1.2.1", "a6fb992c10f2187b46ffd17ce398ddf8a54f691b81768f9ef5f461ea7e28c762", [:make], []},
"relx": {:hex, :relx, "3.21.1", "f989dc520730efd9075e9f4debcb8ba1d7d1e86b018b0bcf45a2eb80270b4ad6", [:rebar3], [{:bbmustache, "1.0.4", [hex: :bbmustache, optional: false]}, {:cf, "0.2.1", [hex: :cf, optional: false]}, {:erlware_commons, "0.21.0", [hex: :erlware_commons, optional: false]}, {:getopt, "0.8.2", [hex: :getopt, optional: false]}, {:providers, "1.6.0", [hex: :providers, optional: false]}]},
"rsa": {:hex, :rsa, "0.0.1", "a63069f88ce342ffdf8448b7cdef4b39ba7dee3c1510644a39385c7e63ba246f", [:mix], []},
"ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.1", "28a4d65b7f59893bc2c7de786dec1e1555bd742d336043fe644ae956c3497fbe", [:rebar, :make], []},
"ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.1", "28a4d65b7f59893bc2c7de786dec1e1555bd742d336043fe644ae956c3497fbe", [:make, :rebar], []},
"timex": {:hex, :timex, "3.1.3", "3f9e7cd03190faf143098857bebd26c6d33e0709e7d3c42095da2393765fa225", [:mix], [{:combine, "~> 0.7", [hex: :combine, optional: false]}, {:gettext, "~> 0.10", [hex: :gettext, optional: false]}, {:tzdata, "~> 0.1.8 or ~> 0.5", [hex: :tzdata, optional: false]}]},
"tzdata": {:hex, :tzdata, "0.5.9", "575be217b039057a47e133b72838cbe104fb5329b19906ea4e66857001c37edb", [:mix], [{:hackney, "~> 1.0", [hex: :hackney, optional: false]}]}}