update to firmware build commands

changed to beta folder as third firmware option
maslowcnc repo references changed to webcontrolcnc repo
changed firmware all firmware build scripts with the above changes

Author: Orob-Maslow

Actions/actions.py

@@ -1436,7 +1436,7 @@ def upgradeFirmware(self, version):
                 path = home+"/firmware/beta/*.hex"
             if version == 1:
                 self.data.ui_queue1.put("SpinnerMessage", "", "Stock Firmware Update in Progress, Please Wait.")
-                path = home+"/firmware/maslowcnc/*.hex"
+                path = home+"/firmware/webcontrolcnc/*.hex"
             if version == 2:
                 self.data.ui_queue1.put("SpinnerMessage", "", "Holey Firmware Update in Progress, Please Wait.")
                 path = home+"/firmware/holey/*.hex"

buildFirmware.sh

@@ -4,35 +4,34 @@ mkdir build
 rm -rf firmware
 mkdir firmware
 cd firmware
-mkdir madgrizzle
-mkdir maslowcnc
+mkdir beta
+mkdir webcontrolcnc
 mkdir holey
 
 cd ../build
-madgrizzle_firmware_repo=https://github.com/madgrizzle/Firmware.git
-madgrizzle_firmware_sha=bf4350ffd9bc154832505fc0125abd2c4c04dba7
-git clone $madgrizzle_firmware_repo firmware/madgrizzle
-cd firmware/madgrizzle
-git checkout $madgrizzle_firmware_sha
+beta_firmware_repo=https://github.com/WebControlCNC/Firmware.git
+beta_firmware_sha=bf4350ffd9bc154832505fc0125abd2c4c04dba7
+git clone $beta_firmware_repo firmware/beta
+cd firmware/beta
+git checkout $beta_firmware_sha
 pio lib install "Servo"
 pio run -e megaatmega2560
-
-mv .pio/build/megaatmega2560/firmware.hex ./madgrizzle-$(sed -n -e 's/^.*VERSIONNUMBER //p' cnc_ctrl_v1/Maslow.h).hex
+mv .pio/build/megaatmega2560/firmware.hex ./beta-$(sed -n -e 's/^.*VERSIONNUMBER //p' cnc_ctrl_v1/Maslow.h).hex
 
 cd ../..
 
-maslowcnc_firmware_repo=https://github.com/MaslowCNC/Firmware.git
-maslowcnc_firmware_sha=e1e0d020fff1f4f7c6b403a26a85a16546b7e15b
-git clone $maslowcnc_firmware_repo firmware/maslowcnc
-cd firmware/maslowcnc
-git checkout $maslowcnc_firmware_sha
+webcontrolcnc_firmware_repo=https://github.com/WebControlCNC/Firmware.git
+webcontrolcnc_firmware_sha=e1e0d020fff1f4f7c6b403a26a85a16546b7e15b
+git clone $webcontrolcnc_firmware_repo firmware/webcontrolcnc
+cd firmware/webcontrolcnc
+git checkout $webcontrolcnc_firmware_sha
 pio lib install "Servo"
 pio run -e megaatmega2560
-mv .pio/build/megaatmega2560/firmware.hex ./maslowcnc-$(sed -n -e 's/^.*VERSIONNUMBER //p' cnc_ctrl_v1/Maslow.h).hex
+mv .pio/build/megaatmega2560/firmware.hex ./webcontrolcnc-$(sed -n -e 's/^.*VERSIONNUMBER //p' cnc_ctrl_v1/Maslow.h).hex
 
 cd ../..
 
-holey_firmware_repo=https://github.com/madgrizzle/Firmware.git
+holey_firmware_repo=https://github.com/WebControlCNC/Firmware.git
 holey_firmware_sha=950fb23396171cbd456c2d4149455cc45f5e6bc3
 git clone $holey_firmware_repo firmware/holey
 cd firmware/holey

buildFirmware10.bat

@@ -7,36 +7,36 @@ del firmware /s /f /q
 rmdir firmware /s /q
 mkdir firmware
 cd firmware
-mkdir madgrizzle
-mkdir maslowcnc
+mkdir beta
+mkdir webcontrolcnc
 mkdir holey
 
 cd ../build
-SET madgrizzle_firmware_repo=https://github.com/madgrizzle/Firmware.git
-SET madgrizzle_firmware_sha=bf4350ffd9bc154832505fc0125abd2c4c04dba7
-git clone %madgrizzle_firmware_repo% firmware/madgrizzle
-cd firmware/madgrizzle
-git checkout %madgrizzle_firmware_sha%
+SET beta_firmware_repo=https://github.com/WebControlCNC/Firmware.git
+SET beta_firmware_sha=bf4350ffd9bc154832505fc0125abd2c4c04dba7
+git clone %beta_firmware_repo% firmware/beta
+cd firmware/beta
+git checkout %beta_firmware_sha%
 pio run -e megaatmega2560
 
-copy .pio/build/megaatmega2560/firmware.hex ~/WebControl/firmware/madgrizzle/madgrizzle-$(sed -n -e 's/^.*VERSIONNUMBER //p' cnc_ctrl_v1/Maslow.h).hex
+copy .pio/build/megaatmega2560/firmware.hex ~/WebControl/firmware/beta/beta-$(sed -n -e 's/^.*VERSIONNUMBER //p' cnc_ctrl_v1/Maslow.h).hex
 
 cd ../..
 
-SET maslowcnc_firmware_repo=https://github.com/MaslowCNC/Firmware.git
-SET maslowcnc_firmware_sha=e1e0d020fff1f4f7c6b403a26a85a16546b7e15b
-git clone %maslowcnc_firmware_repo% firmware/maslowcnc
-cd firmware/maslowcnc
-git checkout %maslowcnc_firmware_sha%
+SET webcontrolcnc_firmware_repo=https://github.com/WebControlCNC/Firmware.git
+SET webcontrolcnc_firmware_sha=e1e0d020fff1f4f7c6b403a26a85a16546b7e15b
+git clone %webcontrolcnc_firmware_repo% firmware/maslowcnc
+cd firmware/webcontrolcnc
+git checkout %webcontrolcnc_firmware_sha%
 pio run -e megaatmega2560
-copy .pio/build/megaatmega2560/firmware.hex ~/WebControl/firmware/maslowcnc/maslowcnc-$(sed -n -e 's/^.*VERSIONNUMBER //p' cnc_ctrl_v1/Maslow.h).hex
+copy .pio/build/megaatmega2560/firmware.hex ~/WebControl/firmware/webcontrolcnc/webcontrolcnc-$(sed -n -e 's/^.*VERSIONNUMBER //p' cnc_ctrl_v1/Maslow.h).hex
 
 cd ../..
 
-SET holey_firmware_repo=https://github.com/madgrizzle/Firmware.git
+SET holey_firmware_repo=https://github.com/webcontrolcnc/Firmware.git
 SET holey_firmware_sha=950fb23396171cbd456c2d4149455cc45f5e6bc3
 git clone %holey_firmware_repo% firmware/holey
 cd firmware/holey
 git checkout %holey_firmware_sha%
 pio run -e megaatmega2560
-copy .pio/build/megaatmega2560/firmware.hex C:\Users\jhogan\Documents\Github\WebControlfirmware/holey/holey-$(sed -n -e 's/^.*VERSIONNUMBER //p' cnc_ctrl_v1/Maslow.h).hex
+copy .pio/build/megaatmega2560/firmware.hex ~\WebControlfirmware/holey/holey-$(sed -n -e 's/^.*VERSIONNUMBER //p' cnc_ctrl_v1/Maslow.h).hex

buildLinux1.sh

@@ -4,33 +4,33 @@ mkdir build
 rm -rf firmware
 mkdir firmware
 cd firmware
-mkdir madgrizzle
-mkdir maslowcnc
+mkdir beta
+mkdir webcontrolcnc
 mkdir holey
 
 cd ../build
-madgrizzle_firmware_repo=https://github.com/madgrizzle/Firmware.git
-madgrizzle_firmware_sha=bf4350ffd9bc154832505fc0125abd2c4c04dba7
-git clone $madgrizzle_firmware_repo firmware/madgrizzle
-cd firmware/madgrizzle
-git checkout $madgrizzle_firmware_sha
+beta_firmware_repo=https://github.com/WebControlCNC/Firmware.git
+beta_firmware_sha=bf4350ffd9bc154832505fc0125abd2c4c04dba7
+git clone $beta_firmware_repo firmware/beta
+cd firmware/beta
+git checkout $beta_firmware_sha
 pio run -e megaatmega2560
 
-mv .pio/build/megaatmega2560/firmware.hex ~/WebControl/firmware/madgrizzle/madgrizzle-$(sed -n -e 's/^.*VERSIONNUMBER //p' cnc_ctrl_v1/Maslow.h).hex
+mv .pio/build/megaatmega2560/firmware.hex ~/WebControl/firmware/beta/beta-$(sed -n -e 's/^.*VERSIONNUMBER //p' cnc_ctrl_v1/Maslow.h).hex
 
 cd ../..
 
-maslowcnc_firmware_repo=https://github.com/MaslowCNC/Firmware.git
-maslowcnc_firmware_sha=e1e0d020fff1f4f7c6b403a26a85a16546b7e15b
-git clone $maslowcnc_firmware_repo firmware/maslowcnc
-cd firmware/maslowcnc
-git checkout $maslowcnc_firmware_sha
+webcontrolcnc_firmware_repo=https://github.com/WebControlCNC/Firmware.git
+webcontrolcnc_firmware_sha=e1e0d020fff1f4f7c6b403a26a85a16546b7e15b
+git clone $webcontrolcnc_firmware_repo firmware/maslowcnc
+cd firmware/webcontrolcnc
+git checkout $webcontrolcnc_firmware_sha
 pio run -e megaatmega2560
-mv .pio/build/megaatmega2560/firmware.hex ~/WebControl/firmware/maslowcnc/maslowcnc-$(sed -n -e 's/^.*VERSIONNUMBER //p' cnc_ctrl_v1/Maslow.h).hex
+mv .pio/build/megaatmega2560/firmware.hex ~/WebControl/firmware/webcontrolcnc/webcontrolcnc-$(sed -n -e 's/^.*VERSIONNUMBER //p' cnc_ctrl_v1/Maslow.h).hex
 
 cd ../..
 
-holey_firmware_repo=https://github.com/madgrizzle/Firmware.git
+holey_firmware_repo=https://github.com/WebControlCNC/Firmware.git
 holey_firmware_sha=950fb23396171cbd456c2d4149455cc45f5e6bc3
 git clone $holey_firmware_repo firmware/holey
 cd firmware/holey

config/config.py

@@ -728,7 +728,7 @@ def parseFirmwareVersions(self):
         if hasattr(sys, '_MEIPASS'):
             home = os.path.join(sys._MEIPASS)
             print(self.home)
-        path = home+"/firmware/madgrizzle/*.hex"
+        path = home+"/firmware/beta/*.hex"
         for filename in glob.glob(path):
             version = filename.split("-")
             maxIndex = len(version)-1
@@ -737,7 +737,7 @@ def parseFirmwareVersions(self):
                 self.data.customFirmwareVersion = version[0]
             else:
                 self.data.customFirmwareVersion = "n/a"
-        path = home+"/firmware/maslowcnc/*.hex"
+        path = home+"/firmware/webcontrolcnc/*.hex"
         for filename in glob.glob(path):
             version = filename.split("-")
             maxIndex = len(version)-1