Compare commits

..

No commits in common. "5d4fd6a2abeb11d71e99a2e9042d99690f627a08" and "6795c187c34150fdab9e7bbfce3caee6f2545ff1" have entirely different histories.

7 changed files with 23 additions and 28 deletions

View File

@ -3,6 +3,6 @@
{registered,[]},
{included_applications,[]},
{applications,[stdlib,kernel]},
{vsn,"0.2.6"},
{vsn,"0.2.5"},
{modules,[gajumine,gmc_con,gmc_conf,gmc_gui,gmc_sup]},
{mod,{gajumine,[]}}]}.

View File

@ -3,7 +3,7 @@
%%% @end
-module(gajumine).
-vsn("0.2.6").
-vsn("0.2.5").
-behavior(application).
-author("Craig Everett <craigeverett@qpq.swiss>").
-copyright("QPQ AG <craigeverett@qpq.swiss>").

View File

@ -3,7 +3,7 @@
%%% @end
-module(gmc_con).
-vsn("0.2.6").
-vsn("0.2.5").
-author("Craig Everett <craigeverett@qpq.swiss>").
-copyright("QPQ AG <craigeverett@qpq.swiss>").
-license("GPL-3.0-or-later").
@ -270,13 +270,8 @@ platform_dir() ->
{unix, linux} ->
"linux_x86_64";
{unix, darwin} ->
case erlang:system_info(system_architecture) of
"aarch64-" ++ _ ->
% TODO: Check M2 vs x86
"mac_m2";
Other ->
ok = log(info, "system_architecture: ~p", [Other]),
"mac_x86_64"
end;
{win32, nt} ->
"win_x86_64"
end,

View File

@ -3,7 +3,7 @@
%%% @end
-module(gmc_conf).
-vsn("0.2.6").
-vsn("0.2.5").
-author("Craig Everett <craigeverett@qpq.swiss>").
-copyright("QPQ AG <craigeverett@qpq.swiss>").
-license("GPL-3.0-or-later").
@ -25,8 +25,8 @@
net = none :: none | wx:wx_object(),
acc = none :: none | wx:wx_object(),
keys = none :: none | wx:wx_object(),
cores = 2 :: pos_integer(),
memory = 3550722201 :: pos_integer()}).
cores = none :: none | wx:wx_object(),
memory = none :: none | wx:wx_object()}).
@ -213,16 +213,16 @@ done(State = #s{net = Network, acc = AccTx, keys = KeysTx, cores = CoresTx, memo
buh_bye(State).
cores("") ->
2;
none;
cores(CoreS) ->
try
list_to_integer(CoreS)
catch
_:_ -> 2
_:_ -> none
end.
bytes("") ->
3550722201;
none;
bytes(GigsS) ->
try
list_to_integer(GigsS) * gig()
@ -231,7 +231,7 @@ bytes(GigsS) ->
try
trunc(list_to_float(GigsS) * gig())
catch
_:_ -> 3550722201
_:_ -> none
end
end.

View File

@ -3,7 +3,7 @@
%%% @end
-module(gmc_gui).
-vsn("0.2.6").
-vsn("0.2.5").
-author("Craig Everett <craigeverett@qpq.swiss>").
-copyright("QPQ AG <craigeverett@qpq.swiss>").
-license("GPL-3.0-or-later").

View File

@ -12,7 +12,7 @@
%%% @end
-module(gmc_sup).
-vsn("0.2.6").
-vsn("0.2.5").
-behaviour(supervisor).
-author("Craig Everett <craigeverett@qpq.swiss>").
-copyright("QPQ AG <craigeverett@qpq.swiss>").

View File

@ -2,9 +2,9 @@
{type,gui}.
{modules,[]}.
{prefix,"gmc"}.
{desc,"Mining client for the Gajumaru Root"}.
{author,"Craig Everett"}.
{package_id,{"qpq","gajumine",{0,2,6}}}.
{desc,"Mining client for the Gajumaru Root"}.
{package_id,{"qpq","gajumine",{0,2,5}}}.
{deps,[{"uwiger","gmhive_client",{0,4,4}},
{"uwiger","gmcuckoo",{1,2,3}},
{"qpq","cuckoo_cpu",{0,3,0}},