Skip to content

Commit

Permalink
webMAN MOD 1.47.33
Browse files Browse the repository at this point in the history
- XMB waves now change on each boot if 1.qrc, 2.qrc exist in /dev_hdd0/tmp/lines
- Added new web command /lines.ps3
- Added missing .BIN extension in ROMS scanning
- Improved mount of ROMS through /app_home
  • Loading branch information
aldostools committed Jan 31, 2021
1 parent ac7b0d8 commit 5cd6afc
Show file tree
Hide file tree
Showing 14 changed files with 37 additions and 18 deletions.
Binary file modified _Projects_/updater/pkgfiles/USRDIR/webftp_server_full.sprx
Binary file not shown.
Binary file modified _Projects_/updater/pkgfiles/USRDIR/webftp_server_lite.sprx
Binary file not shown.
Binary file modified _Projects_/updater/pkgfiles/USRDIR/webftp_server_noncobra.sprx
Binary file not shown.
Binary file not shown.
Binary file modified _Projects_/updater/update/dev_hdd0/plugins/webftp_server.sprx
Binary file not shown.
Binary file not shown.
2 changes: 2 additions & 0 deletions include/_mount.h
Original file line number Diff line number Diff line change
Expand Up @@ -896,6 +896,8 @@ static void set_app_home(const char *game_path)
// mount custom app in /app_home/PS3_GAME if has USRDIR/EBOOT.BIN
if(!game_path && (webman_config->homeb && is_app_dir(webman_config->home_url, ".")))
sys_map_path(APP_HOME_DIR, webman_config->home_url);
else if(IS(game_path, PKGLAUNCH_DIR))
sys_map_path(APP_HOME_DIR, PKGLAUNCH_DIR "/PS3_GAME");
else
sys_map_path(APP_HOME_DIR, game_path);

Expand Down
22 changes: 15 additions & 7 deletions include/file.h
Original file line number Diff line number Diff line change
Expand Up @@ -1401,19 +1401,24 @@ static bool do_custom_combo(const char *filename)
#endif

#ifdef COBRA_ONLY
#ifndef LITE_EDITION
static void map_visualizer(u8 visualizer_id, u8 id, char *param)
{
char *hdd_path = visualizer_id ? (char*)"/dev_hdd0/tmp/canyon" :
(char*)"/dev_hdd0/tmp/earth";
char *qrc_path = visualizer_id ? (char*)"/dev_flash/vsh/resource/qgl/canyon.qrc" :
(char*)"/dev_flash/vsh/resource/qgl/earth.qrc";
char *hdd_path = (visualizer_id == 1) ? (char*)"/dev_hdd0/tmp/canyon" :
(visualizer_id == 2) ? (char*)"/dev_hdd0/tmp/lines" :
(char*)"/dev_hdd0/tmp/earth";
char *qrc_path = (visualizer_id == 1) ? (char*)"/dev_flash/vsh/resource/qgl/canyon.qrc" :
(visualizer_id == 2) ? (char*)"/dev_flash/vsh/resource/qgl/lines.qrc" :
(char*)"/dev_flash/vsh/resource/qgl/earth.qrc";

if(isDir(hdd_path))
{
if(!id)
{
if(visualizer_id)
if(visualizer_id == 1)
id = webman_config->canyon_id;
else if(visualizer_id == 2)
id = webman_config->lines_id;
else
id = webman_config->earth_id;
id++;
Expand All @@ -1427,15 +1432,18 @@ static void map_visualizer(u8 visualizer_id, u8 id, char *param)
sprintf(param, "%s", qrc_path); id = 0;
}

if(visualizer_id)
if(visualizer_id == 1)
webman_config->canyon_id = id;
else if(visualizer_id == 2)
webman_config->lines_id = id;
else
webman_config->earth_id = id;

save_settings();
}
}
#endif
#endif // #ifndef LITE_EDITION
#endif // #ifdef COBRA_ONLY

#ifdef MOUNT_ROMS
static void copy_rom_media(char *src_path)
Expand Down
2 changes: 1 addition & 1 deletion include/games_html.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define SUFIX2(a) ((a==1)?" (1)":(a==2)?" (2)":(a==3)?" (3)":(a==4)?" (4)":"")
#define SUFIX3(a) ((a==1)?" (1).ntfs[":(a==2)?" (2).ntfs[":(a==3)?" (3).ntfs[":(a==4)?" (4).ntfs[":"")

#define ROMS_EXTENSIONS ".ZIP.GBA.NES.UNIF.GB.GBC.DMG.MD.SMD.GEN.SMS.GG.SG.IOS.FLAC.NGP.NGC.PCE.SGX.VB.VBOY.WS.WSC.FDS.EXE.WAD.IWAD.SMC.FIG.SFC.GD3.GD7.DX2.BSX.SWC.A26.PAK.LUA.ADF.DMS.FDI.IPF.UAE.A78.MGW.LNX.VEC.J64.JAG.PRG.XFD.XEX"
#define ROMS_EXTENSIONS ".ZIP.GBA.BIN.NES.UNIF.GB.GBC.DMG.MD.SMD.GEN.SMS.GG.SG.IOS.FLAC.NGP.NGC.PCE.SGX.VB.VBOY.WS.WSC.FDS.EXE.WAD.IWAD.SMC.FIG.SFC.GD3.GD7.DX2.BSX.SWC.A26.PAK.LUA.ADF.DMS.FDI.IPF.UAE.A78.MGW.LNX.VEC.J64.JAG.PRG.XFD.XEX"

// paths: 0="GAMES", 1="GAMEZ", 2="PS3ISO", 3="BDISO", 4="DVDISO", 5="PS2ISO", 6="PSXISO", 7="PSXGAMES", 8="PSPISO", 9="ISO", 10="video", 11="GAMEI", 12="ROMS"

Expand Down
2 changes: 1 addition & 1 deletion include/mount_misc.h
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@

mount_unk = EMU_ROMS;

if(!(webman_config->app_home) && launch_app_home_icon()) ret = true;
if(!(webman_config->app_home) && launch_app_home_icon()) {set_app_home(PKGLAUNCH_DIR); ret = true;}

goto mounting_done; //goto exit_mount;
}
Expand Down
3 changes: 2 additions & 1 deletion include/wm_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,9 @@ typedef struct
u8 earth_id; // 0-255: select a different #.qrc in /dev_hdd0/tmp/earth on each boot
u8 msg_icon; // 0=VSH notify with icon, 1=vshtask_notify (info)
u8 canyon_id;// 0-255: select a different #.qrc in /dev_hdd0/tmp/canyon on each boot
u8 lines_id; // 0-255: select a different #.qrc in /dev_hdd0/tmp/lines on each boot

u8 padding11[28];
u8 padding11[27];

// spoof console id

Expand Down
11 changes: 7 additions & 4 deletions include/www_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -1536,12 +1536,15 @@ static void handleclient_www(u64 conn_s_p)

goto exit_handleclient_www;
}
else if(islike(param, "/earth.ps3") || islike(param, "/canyon.ps3"))
else if(islike(param, "/earth.ps3") || islike(param, "/canyon.ps3") || islike(param, "/lines.ps3"))
{
u8 visualizer_id = (param[1] == 'c'); // 0 = earth, 1 = canyon
u8 visualizer_id = (param[1] == 'c') ? 1 :
(param[1] == 'l') ? 2 : 0; // 0 = earth, 1 = canyon, 2 = lines

if(param[visualizer_id + 10] == '?')
map_visualizer(visualizer_id, (u8)val(param + visualizer_id + 11), param);
u8 param_id = (visualizer_id & 1); // 0 = earth/lines, 1 = canyon

if(param[param_id + 10] == '?')
map_visualizer(visualizer_id, (u8)val(param + param_id + 11), param);
else
map_visualizer(visualizer_id, 0, param);

Expand Down
2 changes: 2 additions & 0 deletions include/www_start.h
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,11 @@ if(conn_s_p == START_DAEMON || conn_s_p == REFRESH_CONTENT)
#ifdef COBRA_ONLY
{sys_map_path("/dev_flash/vsh/resource/coldboot_stereo.ac3", NULL);}
{sys_map_path("/dev_flash/vsh/resource/coldboot_multi.ac3", NULL);}
#ifndef LITE_EDITION
map_visualizer(0, 0, param);
map_visualizer(1, 0, param);
#endif
#endif

#ifdef PLAY_MUSIC
if(webman_config->music)
Expand Down
11 changes: 7 additions & 4 deletions main.c
Original file line number Diff line number Diff line change
Expand Up @@ -463,18 +463,21 @@ static void wwwd_thread(u64 arg)

led(YELLOW, BLINK_FAST);

#ifdef COPY_PS3
memset(cp_path, 0, STD_PATH_LEN);
#endif

//WebmanCfg *webman_config = (WebmanCfg*) wmconfig;
read_settings();

#ifdef COBRA_ONLY
#ifndef LITE_EDITION
map_visualizer(2, 0, html_base_path);
#endif
#endif

if(webman_config->blind) enable_dev_blind(NO_MSG);

set_buffer_sizes(webman_config->foot);

#ifdef COPY_PS3
memset(cp_path, 0, STD_PATH_LEN);
parse_script("/dev_hdd0/boot_init.txt");
#endif

Expand Down

0 comments on commit 5cd6afc

Please sign in to comment.