Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update pocketpy from v1.x to v2.0.1 #2714

Merged
merged 33 commits into from
Nov 11, 2024
Merged
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
b0dc078
unchange python.c
PrimedErwin Oct 31, 2024
2cfe30a
add pkpy2 submodule
PrimedErwin Oct 31, 2024
bb7517a
pyfunc not updated
PrimedErwin Nov 2, 2024
c38a639
added debug feature
PrimedErwin Nov 2, 2024
efb376e
[dev]boot returns emptyp
PrimedErwin Nov 3, 2024
f25830d
[dev]basic func finished
PrimedErwin Nov 3, 2024
823924e
[dev]hello world enabled
PrimedErwin Nov 3, 2024
d0ea8c9
[dev]..
PrimedErwin Nov 3, 2024
7d598d2
[dev]all bind
PrimedErwin Nov 4, 2024
bdcb3c6
[dev]add valueError
PrimedErwin Nov 4, 2024
71bfec0
[dev]fix some bug
PrimedErwin Nov 4, 2024
926411f
[dev]fix some bugs
PrimedErwin Nov 4, 2024
0279784
[dev]all api test pass
PrimedErwin Nov 5, 2024
5c7bec8
Merge pull request #1 from PrimedErwin/master201
PrimedErwin Nov 5, 2024
fbb64e5
[release]..
PrimedErwin Nov 5, 2024
3a46c09
Merge pull request #2 from PrimedErwin/master201
PrimedErwin Nov 5, 2024
6e332b4
[release]pkpy update to v2
PrimedErwin Nov 3, 2024
a6e3b90
[dev]core unchange
PrimedErwin Nov 5, 2024
68970e5
[dev].
PrimedErwin Nov 5, 2024
b5d9319
[dev]castfloat+core saved+exception raise
PrimedErwin Nov 5, 2024
df4fe51
[dev]fixed mouse()
PrimedErwin Nov 5, 2024
fdf8864
[dev]fixed mouse() alloc
PrimedErwin Nov 6, 2024
2357968
[dev]delete tmp in mouse()
PrimedErwin Nov 6, 2024
4efd34a
[dev]add assert, update pkpy.cmake
PrimedErwin Nov 7, 2024
c3fe29b
[dev]update pkpy submodule
PrimedErwin Nov 7, 2024
3044c3e
some fix
blueloveTH Nov 8, 2024
758c84a
some fix
blueloveTH Nov 8, 2024
9e0f8b1
fix IPO issue
blueloveTH Nov 8, 2024
fa0a967
fix time.c
blueloveTH Nov 8, 2024
1093fda
fix time.c
blueloveTH Nov 8, 2024
fd8fcf2
fix time.c
blueloveTH Nov 8, 2024
d4725f2
fix time.c
blueloveTH Nov 8, 2024
1952005
[dev]assign none to retval() as default
PrimedErwin Nov 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
[dev]assign none to retval() as default
  • Loading branch information
PrimedErwin committed Nov 8, 2024
commit 19520051c382737d363991726a028365026d230a
28 changes: 28 additions & 0 deletions src/api/python.c
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ static bool py_circ(int argc, py_Ref argv)
color = py_toint(py_arg(3));

core->api.circ(tic, x, y, radius, color);
py_assign(py_retval(), py_None());
return true;
}

Expand All @@ -236,6 +237,7 @@ static bool py_circb(int argc, py_Ref argv)
color = py_toint(py_arg(3));

core->api.circb(tic, x, y, radius, color);
py_assign(py_retval(), py_None());
return true;
}

Expand All @@ -253,6 +255,7 @@ static bool py_clip(int argc, py_Ref argv)
height = py_toint(py_arg(3));

core->api.clip(tic, x, y, width, height);
py_assign(py_retval(), py_None());
return true;
}

Expand All @@ -271,6 +274,7 @@ static bool py_elli(int argc, py_Ref argv)
color = py_toint(py_arg(4));

core->api.elli(tic, x, y, a, b, color);
py_assign(py_retval(), py_None());
return true;
}

Expand All @@ -289,6 +293,7 @@ static bool py_ellib(int argc, py_Ref argv)
color = py_toint(py_arg(4));

core->api.ellib(tic, x, y, a, b, color);
py_assign(py_retval(), py_None());
return true;
}

Expand All @@ -299,6 +304,7 @@ static bool py_exit(int argc, py_Ref argv)
tic_mem* tic = (tic_mem*)core;

core->api.exit(tic);
py_assign(py_retval(), py_None());
return true;
}

Expand Down Expand Up @@ -334,6 +340,7 @@ static bool py_fset(int argc, py_Ref argv)
b = py_tobool(py_arg(2));

core->api.fset(tic, spid, flag, b);
py_assign(py_retval(), py_None());
return true;
}

Expand Down Expand Up @@ -441,6 +448,7 @@ static bool py_line(int argc, py_Ref argv)
tic_mem* tic = (tic_mem*)core;

core->api.line(tic, x0, y0, x1, y1, color);
py_assign(py_retval(), py_None());
return true;
}

Expand Down Expand Up @@ -508,6 +516,7 @@ static bool py_map(int argc, py_Ref argv)
else
core->api.map(tic, x, y, w, h, sx, sy, colors, colorkey, scale, NULL, NULL);

py_assign(py_retval(), py_None());
return true;
}

Expand All @@ -525,6 +534,7 @@ static bool py_memcpy(int argc, py_Ref argv)
tic_mem* tic = (tic_mem*)core;

core->api.memcpy(tic, dest, src, size);
py_assign(py_retval(), py_None());
return true;
}

Expand All @@ -542,6 +552,7 @@ static bool py_memset(int argc, py_Ref argv)
tic_mem* tic = (tic_mem*)core;

core->api.memset(tic, dest, val, size);
py_assign(py_retval(), py_None());
return true;
}

Expand Down Expand Up @@ -575,6 +586,7 @@ static bool py_mset(int argc, py_Ref argv)
tic_mem* tic = (tic_mem*)core;

core->api.mset(tic, x, y, title_id);
py_assign(py_retval(), py_None());
return true;
}

Expand Down Expand Up @@ -629,6 +641,7 @@ static bool py_music(int argc, py_Ref argv)
}
core->api.music(tic, -1, 0, 0, false, false, -1, -1);
core->api.music(tic, track, frame, row, loop, sustain, tempo, speed);
py_assign(py_retval(), py_None());
return true;
}

Expand Down Expand Up @@ -706,6 +719,7 @@ static bool py_pix(int argc, py_Ref argv)
if (color >= 0) //set pixel
{
core->api.pix(tic, x, y, color, false);
py_assign(py_retval(), py_None());
return true;
}
else //get pixel to retval
Expand Down Expand Up @@ -743,6 +757,7 @@ static bool py_pmem(int argc, py_Ref argv)
if (has_val)
{
core->api.pmem(tic, index, val, true);
py_assign(py_retval(), py_None());
}
return true;
}
Expand All @@ -761,6 +776,7 @@ static bool py_poke(int argc, py_Ref argv)
tic_mem* tic = (tic_mem*)core;

core->api.poke(tic, addr, val, bits);
py_assign(py_retval(), py_None());
return true;
}

Expand All @@ -776,6 +792,7 @@ static bool py_poke1(int argc, py_Ref argv)
tic_mem* tic = (tic_mem*)core;

core->api.poke1(tic, addr, val);
py_assign(py_retval(), py_None());
return true;
}

Expand All @@ -791,6 +808,7 @@ static bool py_poke2(int argc, py_Ref argv)
tic_mem* tic = (tic_mem*)core;

core->api.poke2(tic, addr, val);
py_assign(py_retval(), py_None());
return true;
}

Expand All @@ -806,6 +824,7 @@ static bool py_poke4(int argc, py_Ref argv)
tic_mem* tic = (tic_mem*)core;

core->api.poke4(tic, addr, val);
py_assign(py_retval(), py_None());
return true;
}

Expand All @@ -827,6 +846,7 @@ static bool py_rect(int argc, py_Ref argv)
tic_mem* tic = (tic_mem*)core;

core->api.rect(tic, x, y, w, h, color);
py_assign(py_retval(), py_None());
return true;
}

Expand All @@ -848,6 +868,7 @@ static bool py_rectb(int argc, py_Ref argv)
tic_mem* tic = (tic_mem*)core;

core->api.rectb(tic, x, y, w, h, color);
py_assign(py_retval(), py_None());
return true;
}

Expand All @@ -858,6 +879,7 @@ static bool py_reset(int argc, py_Ref argv)
tic_mem* tic = (tic_mem*)core;

core->api.reset(tic);
py_assign(py_retval(), py_None());
return true;
}

Expand Down Expand Up @@ -915,6 +937,7 @@ static bool py_sfx(int argc, py_Ref argv)
}

core->api.sfx(tic, id, note, octave, duration, channel, volume & 0xf, volume & 0xf, speed);
py_assign(py_retval(), py_None());
return true;
}

Expand All @@ -938,6 +961,7 @@ static bool py_sync(int argc, py_Ref argv)
}

core->api.sync(tic, mask, bank, tocart);
py_assign(py_retval(), py_None());
return true;
}

Expand Down Expand Up @@ -981,6 +1005,7 @@ static bool py_ttri(int argc, py_Ref argv)
colors, chromakey,
z1, z2, z3,
z1 != 0 || z2 != 0 || z3 != 0);
py_assign(py_retval(), py_None());
return true;
}

Expand Down Expand Up @@ -1008,6 +1033,7 @@ static bool py_trace(int argc, py_Ref argv)
tic_mem* tic = (tic_mem*)core;

core->api.trace(tic, msg, (u8)color);
py_assign(py_retval(), py_None());
return true;
}

Expand All @@ -1028,6 +1054,7 @@ static bool py_tri(int argc, py_Ref argv)
tic_mem* tic = (tic_mem*)core;

core->api.tri(tic, x1, y1, x2, y3, x3, y3, (u8)color);
py_assign(py_retval(), py_None());
return true;
}

Expand All @@ -1048,6 +1075,7 @@ static bool py_trib(int argc, py_Ref argv)
tic_mem* tic = (tic_mem*)core;

core->api.trib(tic, x1, y1, x2, y3, x3, y3, (u8)color);
py_assign(py_retval(), py_None());
return true;
}

Expand Down
Loading