From 556497ae5a51c2e793aa03869c173a2699fba44a Mon Sep 17 00:00:00 2001
From: RaZe <razeslothc@gmail.com>
Date: Thu, 12 Jan 2023 11:14:04 +0200
Subject: [PATCH] fix: code cleanup, bug fix

---
 .../rubiks_cube_scrambler.c                   |  1 -
 src/rubiks_cube_scrambler/scrambler.c         | 27 +++++++------------
 src/rubiks_cube_scrambler/scrambler.h         |  3 ---
 3 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/rubiks_cube_scrambler/rubiks_cube_scrambler.c b/src/rubiks_cube_scrambler/rubiks_cube_scrambler.c
index b82d7ca..8857c6b 100644
--- a/src/rubiks_cube_scrambler/rubiks_cube_scrambler.c
+++ b/src/rubiks_cube_scrambler/rubiks_cube_scrambler.c
@@ -54,7 +54,6 @@ static void draw_callback(Canvas *canvas, void *ctx)
     {
         genScramble();
         scrambleReplace();
-        valid();
         strcpy(scramble_str, printData());
         if (notifications_enabled)
         {
diff --git a/src/rubiks_cube_scrambler/scrambler.c b/src/rubiks_cube_scrambler/scrambler.c
index 2ccbf93..98ebaed 100644
--- a/src/rubiks_cube_scrambler/scrambler.c
+++ b/src/rubiks_cube_scrambler/scrambler.c
@@ -59,8 +59,8 @@ void scrambleReplace()
     // Initialize the mainScramble array with all the possible moves
     for (int i = 0; i < SLEN; i++)
     {
-        a.mainScramble[i][0] = moves[getRand(6, 0)];
-        a.mainScramble[i][1] = dir[getRand(3, 0)];
+        a.mainScramble[i][0] = moves[furi_hal_random_get() % 6];
+        a.mainScramble[i][1] = dir[furi_hal_random_get() % 3];
     }
 
     // Perform the Fisher-Yates shuffle
@@ -76,28 +76,21 @@ void scrambleReplace()
     // Select the first 10 elements as the scramble, using only the first three elements of the dir array
     for (int i = 0; i < SLEN; i++)
     {
-        a.mainScramble[i][1] = dir[rand() % 3];
+        a.mainScramble[i][1] = dir[furi_hal_random_get() % 3];
+    }
+     for (int i = 1; i < SLEN; i++) {
+        while ( a.mainScramble[i][0] == a.mainScramble[i - 2][0] || a.mainScramble[i][0] == a.mainScramble[i - 1][0]) {
+            a.mainScramble[i][0] = moves[furi_hal_random_get()%5];
+        }
     }
 }
 
 
 
 
-void valid() {
-    for (int i = 2; i < SLEN; i++) {
-        while ( a.mainScramble[i][0] == a.mainScramble[i - 2][0] || a.mainScramble[i][0] == a.mainScramble[i - 1][0]) {
-            a.mainScramble[i][0] = moves[rand()%5];
-        }
-    }
-    // Scramble generation complete
-}
 
-int getRand(int upr, int lwr)
-{
-	int randNum;
-	randNum = (rand() % (upr - lwr + 1)) + lwr;
-	return randNum;
-}
+
+
 // Let this function be here for now till I find out what is causing the extra space bug in the scrambles
 void remove_double_spaces(char *str) {
   int i, j;
diff --git a/src/rubiks_cube_scrambler/scrambler.h b/src/rubiks_cube_scrambler/scrambler.h
index c7b7cdb..66f6b22 100644
--- a/src/rubiks_cube_scrambler/scrambler.h
+++ b/src/rubiks_cube_scrambler/scrambler.h
@@ -1,6 +1,3 @@
 void scrambleReplace ();
 void genScramble ();
-void valid ();
-int getRand (int upr,int lwr);
 char *printData ();
-void writeToFile ();