From 4a96e5094257580eb8ad27d3fc484fa19c7f39a4 Mon Sep 17 00:00:00 2001 From: Sebastiano Tronto Date: Wed, 16 Aug 2023 20:58:17 +0200 Subject: Bugfix in DR from EO --- Makefile | 3 +-- src/steps.c | 15 +++++++++++---- www/index.html | 17 ++++++++++++++--- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index fa40765..b120d85 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # See LICENSE file for copyright and license details. -VERSION = 2.0.4 +VERSION = 2.0.5 PREFIX = /usr/local MANPREFIX = ${PREFIX}/share/man @@ -66,4 +66,3 @@ uninstall: for s in ${SCRIPTS}; do rm -rf ${DESTDIR}${PREFIX}/bin/$$s; done .PHONY: all debug clean dist install uninstall upload - diff --git a/src/steps.c b/src/steps.c index a380494..b499b30 100644 --- a/src/steps.c +++ b/src/steps.c @@ -12,6 +12,7 @@ static bool check_corners_URF(Cube cube); static bool check_cornershtr(Cube cube); static bool check_eofb(Cube cube); static bool check_drud(Cube cube); +static bool check_drud_or_drrl(Cube cube); static bool check_htr(Cube cube); static int estimate_eofb_HTM(DfsArg *arg); @@ -551,7 +552,7 @@ dr_eo = { .name = "DR without breaking EO (automatically detected)", .final = false, - .is_done = check_drud, + .is_done = check_drud_or_drrl, .estimate = estimate_dr_eofb, .ready = check_eofb, .ready_msg = check_eo_msg, @@ -570,7 +571,7 @@ dr_eofb = { .name = "DR on U/D or R/L without breaking EO on F/B", .final = false, - .is_done = check_drud, + .is_done = check_drud_or_drrl, .estimate = estimate_dr_eofb, .ready = check_eofb, .ready_msg = check_eo_msg, @@ -589,7 +590,7 @@ dr_eorl = { .name = "DR on U/D or F/B without breaking EO on R/L", .final = false, - .is_done = check_drud, + .is_done = check_drud_or_drrl, .estimate = estimate_dr_eofb, .ready = check_eofb, .ready_msg = check_eo_msg, @@ -608,7 +609,7 @@ dr_eoud = { .name = "DR on R/L or F/B without breaking EO on U/D", .final = false, - .is_done = check_drud, + .is_done = check_drud_or_drrl, .estimate = estimate_dr_eofb, .ready = check_eofb, .ready_msg = check_eo_msg, @@ -1115,6 +1116,12 @@ check_drud(Cube cube) return cube.eofb == 0 && cube.eorl == 0 && cube.coud == 0; } +static bool +check_drud_or_drrl(Cube cube) +{ + return check_drud(cube) || check_drud(apply_trans(rf, cube)); +} + static bool check_htr(Cube cube) { diff --git a/www/index.html b/www/index.html index 839790e..9ae7734 100644 --- a/www/index.html +++ b/www/index.html @@ -79,8 +79,8 @@ You can get the latest version of nissy at the following links: Latest version - nissy-2.0.4.tar.gz (67Kb) - nissy-2.0.4.exe (714Kb) + nissy-2.0.5.tar.gz (67Kb) + nissy-2.0.5.exe (714Kb) @@ -163,6 +163,10 @@ file.

Upgrading

+ Upgrading from 2.0.4 to 2.0.5: +Follow the general upgrading instructions below, now other step required. +

+

Important note for upgrading to 2.0.4: A bug in 2.0.3 and earlier versions caused HTR-related tables to be generated incorrectly on ARM platforms (Mac M1, Android...). @@ -173,6 +177,7 @@ downloading the new tables and replacing the old ones.

+ General upgrading instrutions If you already have nissy installed and you want to upgrade to a more recent version, you can simply repeat the installation process:

@@ -187,7 +192,8 @@ a new folder and run make and make install again.

Between each version new table files might have been added, or old ones -may be not used anymore. Nissy will deal with this automatically. +may be not used anymore. Nissy will deal with this automatically unless +otherwise reported in this page (see above).

Version history

@@ -200,6 +206,11 @@ may be not used anymore. Nissy will deal with this automatically. Date Comment + + 2.0.5 + 2023-08-16 + Bugfix: DR from EO did not check both sides + 2.0.4 2023-05-03 -- cgit v1.3