Merge branch 'AIRDOS04A' of github.com:UniversalScientificTechnologie…

…s/AIRDOS04 into AIRDOS04A
UniversalScientificTechnologies · Dec 11, 2023 · a7a9d0e · a7a9d0e
2 parents 2a1872c + 00cfd5f
commit a7a9d0e
Show file tree

Hide file tree

Showing 10 changed files with 3,259 additions and 14 deletions.
diff --git a/.github/workflows/build_fw.yml b/.github/workflows/build_fw.yml
@@ -19,8 +19,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: PROTOTYPE3
-            type: PROTOTYPE3
+          - name: AIRDOS04
+            type: AIRDOS04
             channels: 0
             fqbn: clock=8MHz_external
 
@@ -49,7 +49,7 @@ jobs:
           uses: actions/checkout@v3
           continue-on-error: true
           with:
-            submodules: True
+            submodules: False
 
         - name: Update githash.h and compile  
           run: |
@@ -173,7 +173,7 @@ jobs:
       - uses: stefanzweifel/git-auto-commit-action@v4
         with:
           commit_message: ${{ steps.last-commit-message.outputs.msg }}, extended build
-          file_pattern: 'fw/build/* fw/LABDOS/githash.h fw/LABDOS/nextversion fw/UAVDOS/githash.h fw/UAVDOS/nextversion'
+          file_pattern: 'fw/build/* fw/AIRDOS04/githash.h fw/AIRDOS04/nextversion'
           #commit_options: '--amend --no-edit'
           #push_options: '--force'
           skip_fetch: true

diff --git a/.github/workflows/create_prerelease.yml b/.github/workflows/create_prerelease.yml
@@ -0,0 +1,64 @@
+name: Create AIRDOS04 Pre-Release (BETA)
+
+on:
+  workflow_dispatch:
+
+jobs:
+
+  build:
+    uses: ./.github/workflows/build_fw.yml
+    with:
+      build_type: B
+    secrets: inherit
+
+  release:  
+    runs-on: ubuntu-latest
+    needs: [build]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: AIRDOS04A
+
+      - name: Gen Release Name and preare assets
+        id: gen_release_name
+        run: |
+          MAJOR=`cat fw/AIRDOS04/nextversion|grep MAJOR|cut -d ' ' -f 2`
+          MINOR=`cat fw/AIRDOS04/nextversion|grep MINOR|cut -d ' ' -f 2`
+          NEXTRELEASE=`cat fw/AIRDOS04/nextversion|grep RELEASE|cut -d ' ' -f 2`
+          NEXTBUILD=`cat fw/AIRDOS04/nextversion|grep BUILD|cut -d ' ' -f 2`
+          RELEASE=`echo $NEXTRELEASE"-1"|bc`
+          BUILD=`echo $NEXTBUILD"-1"|bc`
+
+          echo "tagname=AIRDOS04-${MAJOR}.${MINOR}.${RELEASE}-BETA-${BUILD}"  >> $GITHUB_OUTPUT
+
+      - name: Create TAG
+        run: |
+          echo "${{ steps.gen_release_name.outputs.tagname }}"
+          git config user.name "${GITHUB_ACTOR}"
+          git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
+          git tag -a ${{ steps.gen_release_name.outputs.tagname }} -m "Release ${{ steps.gen_release_name.outputs.tagname }}"
+          git push origin ${{ steps.gen_release_name.outputs.tagname }}
+
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ steps.gen_release_name.outputs.tagname }}
+          release_name: BETA ${{ steps.gen_release_name.outputs.tagname }}
+          draft: false
+          prerelease: true
+
+      - name: Upload Release Assets
+        id: upload-release-assets
+        uses: dwenegar/upload-release-assets@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          release_id: ${{ steps.create_release.outputs.id }}
+          assets_path: fw/build/*.hex
+
+
+
diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml
@@ -0,0 +1,64 @@
+name: Create AIRDOS04 Release
+
+on:
+  workflow_dispatch:
+
+jobs:
+
+  build:
+    uses: ./.github/workflows/build_fw.yml
+    with:
+      build_type: R
+    secrets: inherit
+
+  release:  
+    runs-on: ubuntu-latest
+    needs: [build]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: AIRDOS04A
+
+      - name: Gen Release Name and preare assets
+        id: gen_release_name
+        run: |
+          MAJOR=`cat fw/AIRDOS04/nextversion|grep MAJOR|cut -d ' ' -f 2`
+          MINOR=`cat fw/AIRDOS04/nextversion|grep MINOR|cut -d ' ' -f 2`
+          NEXTRELEASE=`cat fw/AIRDOS04/nextversion|grep RELEASE|cut -d ' ' -f 2`
+          NEXTBUILD=`cat fw/${{ matrix.type }}/nextversion|grep BUILD|cut -d ' ' -f 2`
+          RELEASE=`echo $NEXTRELEASE"-1"|bc`
+          BUILD=`echo $NEXTBUILD"-1"|bc`
+
+          echo "tagname=AIRDOS04-${MAJOR}.${MINOR}.${RELEASE}-${BUILD}"  >> $GITHUB_OUTPUT
+
+      - name: Create TAG
+        run: |
+          echo "${{ steps.gen_release_name.outputs.tagname }}"
+          git config user.name "${GITHUB_ACTOR}"
+          git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
+          git tag -a ${{ steps.gen_release_name.outputs.tagname }} -m "Release ${{ steps.gen_release_name.outputs.tagname }}"
+          git push origin ${{ steps.gen_release_name.outputs.tagname }}
+
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ steps.gen_release_name.outputs.tagname }}
+          release_name: Release ${{ steps.gen_release_name.outputs.tagname }}
+          draft: false
+          prerelease: false
+
+      - name: Upload Release Assets
+        id: upload-release-assets
+        uses: dwenegar/upload-release-assets@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          release_id: ${{ steps.create_release.outputs.id }}
+          assets_path: fw/build/*.hex
+
+
+
diff --git a/fw/AIRDOS04/githash.h b/fw/AIRDOS04/githash.h
@@ -1,5 +1,5 @@
 // This file is overwritten by github actions, do not update it manually
-String githash = "71cdf196883fa3ab648ae47327ef2137eb69420f,User";
-#define GHRELEASE 0
+String githash = "a5558820423b33fbac20c32c4677790c4759b100,User";
+#define GHRELEASE 1
 #define GHBUILD 0
 #define GHBUILDTYPE User
diff --git a/fw/AIRDOS04/nextversion b/fw/AIRDOS04/nextversion
@@ -1,5 +1,5 @@
 #this file is maintained by github actions
 MAJOR 1
-MINOR 1
-RELEASE 0
-BUILD 1
+MINOR 0
+RELEASE 1
+BUILD 4
diff --git a/fw/PROTOTYPE3/PROTOTYPE3.ino b/fw/PROTOTYPE3/PROTOTYPE3.ino
@@ -1,7 +1,7 @@
 // AIRDOS04
 // Compiled with: Arduino 1.8.13
 // MightyCore 2.2.2 
-
+ 
 
 #define MAJOR 0   // Data format
 #define MINOR 0   // Features

diff --git a/fw/PROTOTYPE3/githash.h b/fw/PROTOTYPE3/githash.h
@@ -1,5 +1,5 @@
 // This file is overwritten by github actions, do not update it manually
-String githash = "71cdf196883fa3ab648ae47327ef2137eb69420f,User";
+String githash = "c70ff94987d7dd95c620b8e2d6ba4711ff3b70f4,User";
 #define GHRELEASE 0
 #define GHBUILD 0
 #define GHBUILDTYPE User
diff --git a/fw/PROTOTYPE3/nextversion b/fw/PROTOTYPE3/nextversion
@@ -1,5 +1,5 @@
 #this file is maintained by github actions
-MAJOR 1
-MINOR 1
+MAJOR 0
+MINOR 0
 RELEASE 0
-BUILD 1
+BUILD 2