From 24314c22bfe69d1319008cf8574627a9fb266ebf Mon Sep 17 00:00:00 2001
From: Carlos Venegas <carlos@magnitude.es>
Date: Wed, 22 May 2024 00:47:25 +0200
Subject: [PATCH 1/7] Automatic sign dmg osx package in github actions TEST 2

---
 .github/workflows/main-osx-arm64.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main-osx-arm64.yml b/.github/workflows/main-osx-arm64.yml
index 41e65cf9b..fd0287437 100644
--- a/.github/workflows/main-osx-arm64.yml
+++ b/.github/workflows/main-osx-arm64.yml
@@ -42,7 +42,7 @@ jobs:
 
           npm run buildOSXARM64
           ls dist/
-            
+
       # Loading vars from icestudio package.json
       - id: icestudio_json
         run: |
@@ -54,7 +54,15 @@ jobs:
         run: |
           content=`tr '\n' ' ' < app/buildinfo.json`
           echo "buildJson=${content}" >> $GITHUB_OUTPUT
-      
+ 
+      - name: Sign binary
+        uses: lando/code-sign-action@v2
+        with:
+          file: dist/icestudio-${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}-osxarm64.dmg
+          certificate-data: ${{ secrets.APPLE_CERT_DATA }}
+          certificate-password: ${{ secrets.APPLE_CERT_PASSWORD }}
+          apple-team-id: ${{ secrets.APPLE_TEAM_ID }}
+     
      
       - name: 'Upload DMG/OSX64'
         env:

From 7a91e717acf9cdb2d7155d6e7c66370eb7ad88de Mon Sep 17 00:00:00 2001
From: Carlos Venegas <carlos@magnitude.es>
Date: Wed, 22 May 2024 00:53:59 +0200
Subject: [PATCH 2/7] Automatic sign dmg osx package in github actions TEST 3

---
 .github/workflows/main-osx-arm64.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/main-osx-arm64.yml b/.github/workflows/main-osx-arm64.yml
index fd0287437..753a08e07 100644
--- a/.github/workflows/main-osx-arm64.yml
+++ b/.github/workflows/main-osx-arm64.yml
@@ -56,6 +56,9 @@ jobs:
           echo "buildJson=${content}" >> $GITHUB_OUTPUT
  
       - name: Sign binary
+        env:
+          ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}"
+          TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}"
         uses: lando/code-sign-action@v2
         with:
           file: dist/icestudio-${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}-osxarm64.dmg

From 89a830080cef247ac80b5189caba642d300f51b2 Mon Sep 17 00:00:00 2001
From: Carlos Venegas <carlos@magnitude.es>
Date: Wed, 22 May 2024 01:37:01 +0200
Subject: [PATCH 3/7] Automatic sign dmg osx package in github actions TEST 4

---
 .github/workflows/main-osx-arm64.yml | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main-osx-arm64.yml b/.github/workflows/main-osx-arm64.yml
index 753a08e07..5e3026322 100644
--- a/.github/workflows/main-osx-arm64.yml
+++ b/.github/workflows/main-osx-arm64.yml
@@ -55,18 +55,23 @@ jobs:
           content=`tr '\n' ' ' < app/buildinfo.json`
           echo "buildJson=${content}" >> $GITHUB_OUTPUT
  
-      - name: Sign binary
+      - name: Sign DMG
         env:
           ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}"
           TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}"
-        uses: lando/code-sign-action@v2
-        with:
-          file: dist/icestudio-${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}-osxarm64.dmg
-          certificate-data: ${{ secrets.APPLE_CERT_DATA }}
-          certificate-password: ${{ secrets.APPLE_CERT_PASSWORD }}
-          apple-team-id: ${{ secrets.APPLE_TEAM_ID }}
-     
-     
+          MACOS_CERTIFICATE: ${{ secrets.APPLE_CERT_DATA }}
+          MACOS_CERTIFICATE_PWD: ${{ secrets.APPLE_CERT_PASSWORD }}
+          MACOS_APPLE_UID: ${{ secrets.APPLE_TEAM_ID }}
+          MACOS_KEYCHAIN_PASS: ${{ secrets.LOCAL_KEYCHAIN_PASS }}
+        run: |
+          echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
+          security create-keychain -p $MACOS_KEYCHAIN_PASS build.keychain
+          security default-keychain -s build.keychain
+          security unlock-keychain -p $MACOS_KEYCHAIN_PASS build.keychain
+          security import certificate.p12 -k build.keychain -P $MACOS_CERTIFICATE_PWD -T /usr/bin/codesign
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $MACOS_KEYCHAIN_PASS build.keychain
+          codesign --force --deep --sign ${MACOS_APPLE_UID} dist/icestudio-${ICESTUDIO_VERSION}${TIMESTAMP}-osxarm64.dmg -v
+
       - name: 'Upload DMG/OSX64'
         env:
           ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}"

From 0e986b14ba74f842fb29cb3586e242c0214a1365 Mon Sep 17 00:00:00 2001
From: Carlos Venegas <carlos@magnitude.es>
Date: Wed, 22 May 2024 02:10:43 +0200
Subject: [PATCH 4/7] Only DMG artifact for OSX build and added default high
 speed configs to serial term

---
 .github/workflows/main-osx-arm64.yml         | 10 ----------
 app/resources/plugins/serial-term/index.html | 11 ++++++++++-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/main-osx-arm64.yml b/.github/workflows/main-osx-arm64.yml
index 5e3026322..a312fac64 100644
--- a/.github/workflows/main-osx-arm64.yml
+++ b/.github/workflows/main-osx-arm64.yml
@@ -81,13 +81,3 @@ jobs:
           name: "osxarm64_DMG_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}"
           path: "dist/icestudio-${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}-osxarm64.dmg"
           if-no-files-found: error
-          
-      - name: 'Upload ZIP/OSX64'
-        env:
-          ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}"
-          TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}"
-        uses: actions/upload-artifact@v3
-        with:
-          name: "osxarm64_ZIP_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}"
-          path: "dist/icestudio-${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}-osxarm64.zip"
-          if-no-files-found: error
diff --git a/app/resources/plugins/serial-term/index.html b/app/resources/plugins/serial-term/index.html
index 8727c65df..4cd2d2dc1 100644
--- a/app/resources/plugins/serial-term/index.html
+++ b/app/resources/plugins/serial-term/index.html
@@ -81,6 +81,15 @@
                 <option value="115200" selected>115200</option>
                 <option value="460800">460800</option>
                 <option value="921600">921600</option>
+                <option value="1000000">1Mbps</option>
+                <option value="1000000">1Mbps</option>
+                <option value="1200000">1.2Mbps</option>
+                <option value="1500000">1.5Mbps</option>
+                <option value="200000">2Mbps</option>
+                <option value="300000">3Mbps</option>
+                <option value="9000000">9Mbps</option>
+                <option value="12000000">12Mbps</option>
+                <option value="24000000">24Mbps</option>
                 <option value="-1">Custom</option>
               </select>
 
@@ -347,4 +356,4 @@
   <script src="js/main.js"></script>
 </body>
 
-</html>
+</html>
\ No newline at end of file

From 03f690d4d4d8b70c5778f762bce30bcc01c7fa1a Mon Sep 17 00:00:00 2001
From: Carlos Venegas <carlos@magnitude.es>
Date: Wed, 22 May 2024 02:41:52 +0200
Subject: [PATCH 5/7] OSX sign app before dmg creation for easy install

---
 .github/workflows/main-osx-arm64.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main-osx-arm64.yml b/.github/workflows/main-osx-arm64.yml
index a312fac64..62093c43e 100644
--- a/.github/workflows/main-osx-arm64.yml
+++ b/.github/workflows/main-osx-arm64.yml
@@ -38,8 +38,20 @@ jobs:
           npm install --legacy-peer-deps
       
       - name: Build OSX ARM64 packages
+        env:
+          ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}"
+          TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}"
+          MACOS_CERTIFICATE: ${{ secrets.APPLE_CERT_DATA }}
+          MACOS_CERTIFICATE_PWD: ${{ secrets.APPLE_CERT_PASSWORD }}
+          CODESIGN_ID: ${{ secrets.APPLE_TEAM_ID }}
+          MACOS_KEYCHAIN_PASS: ${{ secrets.LOCAL_KEYCHAIN_PASS }}
         run: |
-
+          echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
+          security create-keychain -p $MACOS_KEYCHAIN_PASS build.keychain
+          security default-keychain -s build.keychain
+          security unlock-keychain -p $MACOS_KEYCHAIN_PASS build.keychain
+          security import certificate.p12 -k build.keychain -P $MACOS_CERTIFICATE_PWD -T /usr/bin/codesign
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $MACOS_KEYCHAIN_PASS build.keychain
           npm run buildOSXARM64
           ls dist/
 

From af758f8c6434d2432c111576c02b8016df43965e Mon Sep 17 00:00:00 2001
From: Carlos Venegas <carlos@magnitude.es>
Date: Wed, 22 May 2024 02:45:54 +0200
Subject: [PATCH 6/7] OSX sign app fix

---
 .github/workflows/main-osx-arm64.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/main-osx-arm64.yml b/.github/workflows/main-osx-arm64.yml
index 62093c43e..b8ecbea45 100644
--- a/.github/workflows/main-osx-arm64.yml
+++ b/.github/workflows/main-osx-arm64.yml
@@ -39,8 +39,6 @@ jobs:
       
       - name: Build OSX ARM64 packages
         env:
-          ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}"
-          TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}"
           MACOS_CERTIFICATE: ${{ secrets.APPLE_CERT_DATA }}
           MACOS_CERTIFICATE_PWD: ${{ secrets.APPLE_CERT_PASSWORD }}
           CODESIGN_ID: ${{ secrets.APPLE_TEAM_ID }}

From 8def5757d5d35370eca75a769ec147de5b92dfaf Mon Sep 17 00:00:00 2001
From: Carlos Venegas <carlos@magnitude.es>
Date: Wed, 22 May 2024 02:51:12 +0200
Subject: [PATCH 7/7] OSX sign app fix (duplicate cert deploy)

---
 .github/workflows/main-osx-arm64.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.github/workflows/main-osx-arm64.yml b/.github/workflows/main-osx-arm64.yml
index b8ecbea45..92a5e3702 100644
--- a/.github/workflows/main-osx-arm64.yml
+++ b/.github/workflows/main-osx-arm64.yml
@@ -69,17 +69,8 @@ jobs:
         env:
           ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}"
           TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}"
-          MACOS_CERTIFICATE: ${{ secrets.APPLE_CERT_DATA }}
-          MACOS_CERTIFICATE_PWD: ${{ secrets.APPLE_CERT_PASSWORD }}
           MACOS_APPLE_UID: ${{ secrets.APPLE_TEAM_ID }}
-          MACOS_KEYCHAIN_PASS: ${{ secrets.LOCAL_KEYCHAIN_PASS }}
         run: |
-          echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
-          security create-keychain -p $MACOS_KEYCHAIN_PASS build.keychain
-          security default-keychain -s build.keychain
-          security unlock-keychain -p $MACOS_KEYCHAIN_PASS build.keychain
-          security import certificate.p12 -k build.keychain -P $MACOS_CERTIFICATE_PWD -T /usr/bin/codesign
-          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $MACOS_KEYCHAIN_PASS build.keychain
           codesign --force --deep --sign ${MACOS_APPLE_UID} dist/icestudio-${ICESTUDIO_VERSION}${TIMESTAMP}-osxarm64.dmg -v
 
       - name: 'Upload DMG/OSX64'