diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | src/steps.c | 15 | ||||
| -rw-r--r-- | www/index.html | 17 |
3 files changed, 26 insertions, 9 deletions
| @@ -1,6 +1,6 @@ | |||
| 1 | # See LICENSE file for copyright and license details. | 1 | # See LICENSE file for copyright and license details. |
| 2 | 2 | ||
| 3 | VERSION = 2.0.4 | 3 | VERSION = 2.0.5 |
| 4 | 4 | ||
| 5 | PREFIX = /usr/local | 5 | PREFIX = /usr/local |
| 6 | MANPREFIX = ${PREFIX}/share/man | 6 | MANPREFIX = ${PREFIX}/share/man |
| @@ -66,4 +66,3 @@ uninstall: | |||
| 66 | for s in ${SCRIPTS}; do rm -rf ${DESTDIR}${PREFIX}/bin/$$s; done | 66 | for s in ${SCRIPTS}; do rm -rf ${DESTDIR}${PREFIX}/bin/$$s; done |
| 67 | 67 | ||
| 68 | .PHONY: all debug clean dist install uninstall upload | 68 | .PHONY: all debug clean dist install uninstall upload |
| 69 | |||
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); | |||
| 12 | static bool check_cornershtr(Cube cube); | 12 | static bool check_cornershtr(Cube cube); |
| 13 | static bool check_eofb(Cube cube); | 13 | static bool check_eofb(Cube cube); |
| 14 | static bool check_drud(Cube cube); | 14 | static bool check_drud(Cube cube); |
| 15 | static bool check_drud_or_drrl(Cube cube); | ||
| 15 | static bool check_htr(Cube cube); | 16 | static bool check_htr(Cube cube); |
| 16 | 17 | ||
| 17 | static int estimate_eofb_HTM(DfsArg *arg); | 18 | static int estimate_eofb_HTM(DfsArg *arg); |
| @@ -551,7 +552,7 @@ dr_eo = { | |||
| 551 | .name = "DR without breaking EO (automatically detected)", | 552 | .name = "DR without breaking EO (automatically detected)", |
| 552 | 553 | ||
| 553 | .final = false, | 554 | .final = false, |
| 554 | .is_done = check_drud, | 555 | .is_done = check_drud_or_drrl, |
| 555 | .estimate = estimate_dr_eofb, | 556 | .estimate = estimate_dr_eofb, |
| 556 | .ready = check_eofb, | 557 | .ready = check_eofb, |
| 557 | .ready_msg = check_eo_msg, | 558 | .ready_msg = check_eo_msg, |
| @@ -570,7 +571,7 @@ dr_eofb = { | |||
| 570 | .name = "DR on U/D or R/L without breaking EO on F/B", | 571 | .name = "DR on U/D or R/L without breaking EO on F/B", |
| 571 | 572 | ||
| 572 | .final = false, | 573 | .final = false, |
| 573 | .is_done = check_drud, | 574 | .is_done = check_drud_or_drrl, |
| 574 | .estimate = estimate_dr_eofb, | 575 | .estimate = estimate_dr_eofb, |
| 575 | .ready = check_eofb, | 576 | .ready = check_eofb, |
| 576 | .ready_msg = check_eo_msg, | 577 | .ready_msg = check_eo_msg, |
| @@ -589,7 +590,7 @@ dr_eorl = { | |||
| 589 | .name = "DR on U/D or F/B without breaking EO on R/L", | 590 | .name = "DR on U/D or F/B without breaking EO on R/L", |
| 590 | 591 | ||
| 591 | .final = false, | 592 | .final = false, |
| 592 | .is_done = check_drud, | 593 | .is_done = check_drud_or_drrl, |
| 593 | .estimate = estimate_dr_eofb, | 594 | .estimate = estimate_dr_eofb, |
| 594 | .ready = check_eofb, | 595 | .ready = check_eofb, |
| 595 | .ready_msg = check_eo_msg, | 596 | .ready_msg = check_eo_msg, |
| @@ -608,7 +609,7 @@ dr_eoud = { | |||
| 608 | .name = "DR on R/L or F/B without breaking EO on U/D", | 609 | .name = "DR on R/L or F/B without breaking EO on U/D", |
| 609 | 610 | ||
| 610 | .final = false, | 611 | .final = false, |
| 611 | .is_done = check_drud, | 612 | .is_done = check_drud_or_drrl, |
| 612 | .estimate = estimate_dr_eofb, | 613 | .estimate = estimate_dr_eofb, |
| 613 | .ready = check_eofb, | 614 | .ready = check_eofb, |
| 614 | .ready_msg = check_eo_msg, | 615 | .ready_msg = check_eo_msg, |
| @@ -1116,6 +1117,12 @@ check_drud(Cube cube) | |||
| 1116 | } | 1117 | } |
| 1117 | 1118 | ||
| 1118 | static bool | 1119 | static bool |
| 1120 | check_drud_or_drrl(Cube cube) | ||
| 1121 | { | ||
| 1122 | return check_drud(cube) || check_drud(apply_trans(rf, cube)); | ||
| 1123 | } | ||
| 1124 | |||
| 1125 | static bool | ||
| 1119 | check_htr(Cube cube) | 1126 | check_htr(Cube cube) |
| 1120 | { | 1127 | { |
| 1121 | return check_drud(cube) && coord_htr_drud.index(cube) == 0; | 1128 | return check_drud(cube) && coord_htr_drud.index(cube) == 0; |
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: | |||
| 79 | </tr> | 79 | </tr> |
| 80 | <tr> | 80 | <tr> |
| 81 | <td><strong>Latest version</strong></td> | 81 | <td><strong>Latest version</strong></td> |
| 82 | <td><a href="/nissy-2.0.4.tar.gz">nissy-2.0.4.tar.gz (67Kb)</a></td> | 82 | <td><a href="/nissy-2.0.5.tar.gz">nissy-2.0.5.tar.gz (67Kb)</a></td> |
| 83 | <td><a href="/nissy-2.0.4.exe">nissy-2.0.4.exe (714Kb)</a></td> | 83 | <td><a href="/nissy-2.0.5.exe">nissy-2.0.5.exe (714Kb)</a></td> |
| 84 | </tr> | 84 | </tr> |
| 85 | </table> | 85 | </table> |
| 86 | 86 | ||
| @@ -163,6 +163,10 @@ file. | |||
| 163 | 163 | ||
| 164 | <h2 id="Upgrade">Upgrading</h2> | 164 | <h2 id="Upgrade">Upgrading</h2> |
| 165 | <p> | 165 | <p> |
| 166 | <strong> Upgrading from 2.0.4 to 2.0.5: </strong> | ||
| 167 | Follow the general upgrading instructions below, now other step required. | ||
| 168 | </p> | ||
| 169 | <p> | ||
| 166 | <strong> Important note for upgrading to 2.0.4:</strong> | 170 | <strong> Important note for upgrading to 2.0.4:</strong> |
| 167 | A bug in 2.0.3 and earlier versions caused HTR-related tables to be | 171 | A bug in 2.0.3 and earlier versions caused HTR-related tables to be |
| 168 | generated incorrectly on ARM platforms (Mac M1, Android...). | 172 | generated incorrectly on ARM platforms (Mac M1, Android...). |
| @@ -173,6 +177,7 @@ downloading the <a href="/nissy-tables-2.0.4.zip">new tables</a> and | |||
| 173 | replacing the old ones. | 177 | replacing the old ones. |
| 174 | </p> | 178 | </p> |
| 175 | <p> | 179 | <p> |
| 180 | <strong> General upgrading instrutions </strong> | ||
| 176 | If you already have nissy installed and you want to upgrade to a more | 181 | If you already have nissy installed and you want to upgrade to a more |
| 177 | recent version, you can simply repeat the installation process: | 182 | recent version, you can simply repeat the installation process: |
| 178 | </p> | 183 | </p> |
| @@ -187,7 +192,8 @@ a new folder and run <code>make</code> and <code>make install</code> again. | |||
| 187 | </ul> | 192 | </ul> |
| 188 | <p> | 193 | <p> |
| 189 | Between each version new table files might have been added, or old ones | 194 | Between each version new table files might have been added, or old ones |
| 190 | may be not used anymore. Nissy will deal with this automatically. | 195 | may be not used anymore. Nissy will deal with this automatically unless |
| 196 | otherwise reported in this page (see above). | ||
| 191 | </p> | 197 | </p> |
| 192 | 198 | ||
| 193 | <h2>Version history</h2> | 199 | <h2>Version history</h2> |
| @@ -201,6 +207,11 @@ may be not used anymore. Nissy will deal with this automatically. | |||
| 201 | <td><strong>Comment</strong></td> | 207 | <td><strong>Comment</strong></td> |
| 202 | </tr> | 208 | </tr> |
| 203 | <tr> | 209 | <tr> |
| 210 | <td><a href="/nissy-2.0.5.tar.gz">2.0.5</a></td> | ||
| 211 | <td>2023-08-16</td> | ||
| 212 | <td>Bugfix: DR from EO did not check both sides</td> | ||
| 213 | </tr> | ||
| 214 | <tr> | ||
| 204 | <td><a href="/nissy-2.0.4.tar.gz">2.0.4</a></td> | 215 | <td><a href="/nissy-2.0.4.tar.gz">2.0.4</a></td> |
| 205 | <td>2023-05-03</td> | 216 | <td>2023-05-03</td> |
| 206 | <td>Fixed bug on ARM; added corners-dr step</td> | 217 | <td>Fixed bug on ARM; added corners-dr step</td> |
