Fixed demo.script

Fixed ScriptChecker PC tool
Moved helper function in ScriptEngine
Added setting reset on boot with button combination on xpad (broke xpad
in XBE version on 1.0 consoles)

Author: bennyboy

Makefile

@@ -199,6 +199,7 @@ OBJECTS-CROM += $(TOPDIR)/obj/crc32.o
 OBJECTS-CROM += $(TOPDIR)/obj/strtol.o
 OBJECTS-CROM += $(TOPDIR)/obj/cromSystem.o
 OBJECTS-CROM += $(TOPDIR)/obj/xblastScriptEngine.o
+OBJECTS-CROM += $(TOPDIR)/obj/functionsAccessor.o
 OBJECTS-CROM += $(TOPDIR)/obj/xblastSettings.o
 OBJECTS-CROM += $(TOPDIR)/obj/xblastSettingsChangeTracker.o
 OBJECTS-CROM += $(TOPDIR)/obj/xblastSettingsImportExport.o
@@ -341,7 +342,10 @@ crcbin:
 	gcc -o bin/crcbin bin/crcbin.o bin/crc32.o
 
 scriptchecker:
-	gcc -g -o bin/scriptChecker pc_tools/scriptChecker/scriptChecker.c
+	gcc -g -Iinclude -o pc_tools/scriptChecker/functionsAccessor.o -c pc_tools/scriptChecker/functionsAccessor.c
+	gcc -g -o pc_tools/scriptChecker/scriptChecker.o -c pc_tools/scriptChecker/scriptChecker.c
+	gcc -g -DSCRIPTCHECKER -Iinclude -Ipc_tools/scriptChecker -o pc_tools/scriptChecker/xblastScriptEngine.o -c xblast/scriptEngine/xblastScriptEngine.c
+	gcc -g -o bin/scriptChecker pc_tools/scriptChecker/functionsAccessor.o pc_tools/scriptChecker/scriptChecker.o pc_tools/scriptChecker/xblastScriptEngine.o
 
 imagecompress: obj/image-crom.bin bin/imagebld
 	cp obj/image-crom.bin obj/c

bin/demo.script

@@ -1,7 +1,7 @@
 VAR padButton = 0
 VAR newFanSpeed = 20
 VAR changeFanSpeed = 0
-VAR newLEDColor = 0
+VAR newLedColor = 0
 VAR quit = 0
 
 $buttonReleaseLoop

boot/BootResetAction.c

@@ -38,6 +38,7 @@
 #include "string.h"
 #include "xblast/HardwareIdentifier.h"
 #include "FlashDriver.h"
+#include "lib/time/timeManagement.h"
 
 JPEG jpegBackdrop;
 
@@ -249,6 +250,16 @@ extern void BootResetAction ( void )
     // Reset the AGP bus and start with good condition
     BootAGPBUSInitialization();
 
+    I2CTransmitByteGetReturn(0x10, 0x11);       // dummy Query IRQ
+    I2CTransmitWord(0x10, 0x1a01); // Enable PIC interrupts. Cannot be deactivated once set.
+
+    unsigned char readUSB = 0;
+    if(EjectButtonPressed == 0 && isXBE() == false)
+    {
+        setLED("rrrr");       //Signal the user to press Eject button to avoid Quickboot.
+    }
+    wait_us_blocking(760000);
+
     debugSPIPrint("Read persistent OS settings from flash.\n");
     if(bootReadXBlastOSSettings() == false)
     {
@@ -257,22 +268,18 @@ extern void BootResetAction ( void )
             LEDFirstBoot(NULL);
     }
 
-
-    I2CTransmitByteGetReturn(0x10, 0x11);       // dummy Query IRQ
-    I2CTransmitWord(0x10, 0x1a01); // Enable PIC interrupts. Cannot be deactivated once set.
+#if 0
+    /* We'll be doing it invariably berfore the 750ms delay instead...*/
     if(EjectButtonPressed == 0 && LPCmodSettings.OSsettings.Quickboot)
     {
         if(isXBE() == false)
         {
             setLED("rrrr");       //Signal the user to press Eject button to avoid Quickboot.
         }
     }
+#endif
 
 
-    //Let's set that up right here.
-    settingsTrackerInit();
-    setCFGFileTransferPtr(&LPCmodSettings, &settingsPtrStruct);
-
     if(isXBE() && isXBlastOnLPC() == false) //If coming from XBE and no XBlast Mod is detected
     {
         tempFanSpeed = I2CGetFanSpeed();
@@ -312,6 +319,24 @@ extern void BootResetAction ( void )
     BootLCDInit();    //Basic init. Do it even if no LCD is connected on the system.
     debugSPIPrint("BootLCDInit done.\n");
 
+    //Stuff to do right after loading persistent settings from flash.
+    if(fFirstBoot == false)
+    {
+        if(emergencyRecoverSettings())
+        {
+                debugSPIPrint("Emergency recover triggered. Resetting settings.\n");
+                fFirstBoot = true;
+                LEDFirstBoot(NULL);
+        }
+
+        if(isLCDSupported())
+        {
+            debugSPIPrint("Check if we need to drive the LCD.\n");
+            assertInitLCD();                            //Function in charge of checking if a init of LCD is needed.
+            debugSPIPrint("assertInitLCD done.\n");
+        }
+        //further init here.
+    }
 
 
     // We disable The CPU Cache
@@ -331,18 +356,9 @@ extern void BootResetAction ( void )
 
     I2CTransmitWord(0x10, 0x1b04); // unknown
 
-    
-    //Stuff to do right after loading persistent settings from flash.
-    if(fFirstBoot == false)
-    {
-        if(isLCDSupported())
-        {
-            debugSPIPrint("Check if we need to drive the LCD.\n");
-            assertInitLCD();                            //Function in charge of checking if a init of LCD is needed.
-            debugSPIPrint("assertInitLCD done.\n");
-        }
-        //further init here.
-    }
+    //Let's set that up right here.
+    settingsTrackerInit();
+    setCFGFileTransferPtr(&LPCmodSettings, &settingsPtrStruct);
 
     // Load and Init the Background image
     // clear the Video Ram
@@ -456,60 +472,63 @@ extern void BootResetAction ( void )
     if(tsaHarddiskInfo[0].m_fDriveExists && tsaHarddiskInfo[0].m_fAtapi == false)
     {
         debugSPIPrint("Master HDD exist.\n");
-        //TODO: Load optional JPEG backdrop from HDD here. Maybe fetch skin name from cfg file?
-        debugSPIPrint("Trying to load new JPEG from HDD.\n");
-        if(LPCMod_ReadJPGFromHDD("\\XBlast\\icons.jpg") == false)
+        if(fFirstBoot == false)
         {
-            debugSPIPrint("\"ìcons.jpg\" loaded. Moving on to \"backdrop.jpg\".\n");
-        }
-        if(LPCMod_ReadJPGFromHDD("\\XBlast\\backdrop.jpg") == false)
-        {
-            debugSPIPrint("\"backdrop.jpg\" loaded. Repainting.\n");
-            printMainMenuHeader();
-        }
+            //TODO: Load optional JPEG backdrop from HDD here. Maybe fetch skin name from cfg file?
+            debugSPIPrint("Trying to load new JPEG from HDD.\n");
+            if(LPCMod_ReadJPGFromHDD("\\XBlast\\icons.jpg") == false)
+            {
+                debugSPIPrint("\"ìcons.jpg\" loaded. Moving on to \"backdrop.jpg\".\n");
+            }
+            if(LPCMod_ReadJPGFromHDD("\\XBlast\\backdrop.jpg") == false)
+            {
+                debugSPIPrint("\"backdrop.jpg\" loaded. Repainting.\n");
+                printMainMenuHeader();
+            }
 
-        if(isXBE() && isXBlastOnLPC() == false)
-        {
-            debugSPIPrint("Trying to load settings from cfg file on HDD.\n");
-            _LPCmodSettings tempLPCmodSettings;
-            returnValue = LPCMod_ReadCFGFromHDD(&tempLPCmodSettings, &settingsPtrStruct);
-            if(returnValue == 0)
+            if(isXBE() && isXBlastOnLPC() == false)
             {
-                importNewSettingsFromCFGLoad(&tempLPCmodSettings);
-                
-                partition = OpenFATXPartition(0, SECTOR_SYSTEM, SYSTEM_SIZE);
-                if(partition != NULL)
+                debugSPIPrint("Trying to load settings from cfg file on HDD.\n");
+                _LPCmodSettings tempLPCmodSettings;
+                returnValue = LPCMod_ReadCFGFromHDD(&tempLPCmodSettings, &settingsPtrStruct);
+                if(returnValue == 0)
                 {
-                    dcluster = FATXFindDir(partition, FATX_ROOT_FAT_CLUSTER, "XBlast");
-                    if((dcluster != -1) && (dcluster != 1))
-                    {
-                        dcluster = FATXFindDir(partition, dcluster, "scripts");
-                    }
-                    if((dcluster != -1) && (dcluster != 1))
+                    importNewSettingsFromCFGLoad(&tempLPCmodSettings);
+
+                    partition = OpenFATXPartition(0, SECTOR_SYSTEM, SYSTEM_SIZE);
+                    if(partition != NULL)
                     {
-                        res = FATXFindFile(partition, "bank.script", FATX_ROOT_FAT_CLUSTER, &fileinfo);
-                        if(res == 0 || fileinfo.fileSize == 0)
+                        dcluster = FATXFindDir(partition, FATX_ROOT_FAT_CLUSTER, "XBlast");
+                        if((dcluster != -1) && (dcluster != 1))
                         {
-                            LPCmodSettings.OSsettings.runBankScript = 0;
+                            dcluster = FATXFindDir(partition, dcluster, "scripts");
                         }
-                        res = FATXFindFile(partition, "boot.script", FATX_ROOT_FAT_CLUSTER, &fileinfo);
-                        if(res == 0 || fileinfo.fileSize == 0)
+                        if((dcluster != -1) && (dcluster != 1))
                         {
-                            LPCmodSettings.OSsettings.runBootScript = 0;
+                            res = FATXFindFile(partition, "bank.script", FATX_ROOT_FAT_CLUSTER, &fileinfo);
+                            if(res == 0 || fileinfo.fileSize == 0)
+                            {
+                                LPCmodSettings.OSsettings.runBankScript = 0;
+                            }
+                            res = FATXFindFile(partition, "boot.script", FATX_ROOT_FAT_CLUSTER, &fileinfo);
+                            if(res == 0 || fileinfo.fileSize == 0)
+                            {
+                                LPCmodSettings.OSsettings.runBootScript = 0;
+                            }
                         }
+                            CloseFATXPartition(partition);
                     }
-                        CloseFATXPartition(partition);
-                }
-                //bootScriptSize should not have changed if we're here.
-                if(LPCmodSettings.OSsettings.runBootScript && LPCmodSettings.flashScript.scriptSize == 0)
-                {
-                    debugSPIPrint("Running boot script.\n");
-                    if(loadScriptFromHDD("\\XBlast\\scripts\\boot.script", &fileinfo))
+                    //bootScriptSize should not have changed if we're here.
+                    if(LPCmodSettings.OSsettings.runBootScript && LPCmodSettings.flashScript.scriptSize == 0)
                     {
-                        i = BNKOS;
-                        runScript(fileinfo.buffer, fileinfo.fileSize, 1, &i);
+                        debugSPIPrint("Running boot script.\n");
+                        if(loadScriptFromHDD("\\XBlast\\scripts\\boot.script", &fileinfo))
+                        {
+                            i = BNKOS;
+                            runScript(fileinfo.buffer, fileinfo.fileSize, 1, &i);
+                        }
+                        debugSPIPrint("Boot script execution done.\n");
                     }
-                    debugSPIPrint("Boot script execution done.\n");
                 }
             }
         }

drivers/flash/FlashDriver.c

@@ -497,34 +497,29 @@ bool bootReadXBlastOSSettings(void)
 
     populateSettingsStructWithDefault(&LPCmodSettings);
 
-    if(risefall_xpad_BUTTON(TRIGGER_XPAD_TRIGGER_RIGHT) &&
-       risefall_xpad_BUTTON(TRIGGER_XPAD_TRIGGER_LEFT) &&
-       risefall_xpad_STATE(XPAD_STATE_START)
-       && XPAD_current[0].keys[5]) //white button
+    if(returnValue)
     {
-        return returnValue;
-    }
+        FlashProgress progress = Flash_ReadXBlastOSSettingsRequest();
 
-    FlashProgress progress = Flash_ReadXBlastOSSettingsRequest();
+        while(cromwellLoop())
+        {
+            progress = Flash_getProgress();
 
-    while(cromwellLoop())
-    {
-        progress = Flash_getProgress();
+            if(progress.currentFlashOp == FlashOp_Completed || progress.currentFlashOp == FlashOp_Error)
+            {
+                debugSPIPrint("Read Settings from flash completed.\n");
+                returnValue = Flash_LoadXBlastOSSettings(&LPCmodSettings);
 
-        if(progress.currentFlashOp == FlashOp_Completed || progress.currentFlashOp == FlashOp_Error)
-        {
-            debugSPIPrint("Read Settings from flash completed.\n");
-            returnValue = Flash_LoadXBlastOSSettings(&LPCmodSettings);
 
 
+                break;
+            }
 
-            break;
+            Flash_executeFlashFSM();
         }
-
-        Flash_executeFlashFSM();
+        memcpy(&LPCmodSettingsOrigFromFlash, &LPCmodSettings, sizeof(_LPCmodSettings));
     }
 
-    memcpy(&LPCmodSettingsOrigFromFlash, &LPCmodSettings, sizeof(_LPCmodSettings));
     Flash_freeFlashFSM();
 
     return returnValue;

pc_tools/scriptChecker/functionsAccessor.c

@@ -0,0 +1,88 @@
+/*
+ * functionsAccessor.c
+ *
+ *  Created on: May 6, 2017
+ *      Author: bennyboy
+ */
+
+#include "../../xblast/scriptEngine/functionsAccessor.h"
+#include <string.h>
+#include <stdio.h>
+
+bool gpiFunction(unsigned char port)
+{
+    return true;
+}
+
+bool gpoFunction(unsigned char port, unsigned char value)
+{
+    return true;
+}
+
+bool waitFunction(int ms)
+{
+    return true;
+}
+
+bool bootFunction(FlashBank bank)
+{
+    return true;
+}
+
+bool fanFunction(unsigned char value)
+{
+    return true;
+}
+
+bool ledFunction(char * value)
+{
+    printf("LED %s\n", value);
+    return true;
+}
+
+bool lcdPrintFunction(unsigned char line, char * text, unsigned char stringLength)
+{
+    return true;
+}
+
+bool lcdClearLineFunction(unsigned char line)
+{
+    return true;
+}
+bool lcdResetFunction(void)
+{
+    return true;
+}
+
+bool lcdBacklightFunction(unsigned char value)
+{
+    return true;
+}
+
+bool lcdPowerFunction(unsigned char value)
+{
+    return true;
+}
+
+unsigned char SPIRead(void)
+{
+    unsigned char i, result = 0;
+
+    return result;
+}
+
+bool SPIWrite(unsigned char data)
+{
+    return true;
+}
+
+unsigned char XPADRead(int xpadVariable)
+{
+    unsigned char pad = 1;
+    return pad;
+}
+
+bool emergencyEscape()
+{
+    return false;
+}