diff --git a/src/gmc_con.erl b/src/gmc_con.erl index fb2519a..dc5e597 100644 --- a/src/gmc_con.erl +++ b/src/gmc_con.erl @@ -212,6 +212,9 @@ handle_cast(Unexpected, State) -> {noreply, State}. +handle_info({gproc_ps_event, Event, Data}, State) -> + ok = gmc_gui:message({Event, Data}), + {noreply, State}; handle_info(Unexpected, State) -> ok = log(warning, "Unexpected info: ~tp~n", [Unexpected]), {noreply, State}. @@ -347,7 +350,10 @@ do_start_stop(#s{key = #key{id = PubKey}, network = Network}) -> % Check memory. >7gb gets mean, <7gb gets lean % Check avx2. % Both should be provided by the F# start program - {"mean", "avx2"} + case Network of + <<"mainnet">> -> {"mean", "avx2.exe"}; + <<"testnet">> -> {"mean", "generic.exe"} + end end, Miner = unicode:characters_to_binary([Fatness, Bits, "-", Type]), Profile = @@ -355,7 +361,14 @@ do_start_stop(#s{key = #key{id = PubKey}, network = Network}) -> {mining, [#{<<"executable">> => Miner, <<"executable_group">> => <<"gajumine">>}]}, {pool_admin_url, Eureka}], {ok, Apps} = gmmpc_app:start(Profile), - log(info, "Apps started: ~p", [Apps]). + ok = log(info, "Apps started: ~p", [Apps]), + Events = + [pool_notification, + {pool_notification, new_generation}, + connected, + error, + disconnected], + lists:foreach(fun gmmpc_events:ensure_subscribed/1, Events). %%% Utils diff --git a/src/gmc_gui.erl b/src/gmc_gui.erl index 9d6a6f4..fff5f34 100644 --- a/src/gmc_gui.erl +++ b/src/gmc_gui.erl @@ -260,7 +260,7 @@ candidate(Block, #s{candy = Widget}) -> do_message(Terms, State = #s{mess = Mess, buff = Buff}) -> - Entry = io_lib:format("Received args: ~tp~n", [Terms]), + Entry = io_lib:format("~tp~n", [Terms]), NewBuff = add_message(Entry, Buff), String = unicode:characters_to_list(element(5, NewBuff)), ok = wxTextCtrl:changeValue(Mess, String), @@ -273,7 +273,9 @@ add_message(Entry, {OMax, OMax, IMax, ICur, [H | Buff]}) -> add_message(Entry, {OMax, OCur, IMax, IMax, Buff}) -> {OMax, OCur + 1, IMax, 1, [[Entry] | Buff]}; add_message(Entry, {OMax, OCur, IMax, ICur, [H | Buff]}) -> - {OMax, OCur, IMax, ICur + 1, [[Entry | H] | Buff]}. + {OMax, OCur, IMax, ICur + 1, [[Entry | H] | Buff]}; +add_message(Entry, {OMax, 0, IMax, 0, []}) -> + {OMax, 1, IMax, 1, [[Entry]]}. start_stop(State) ->