Merge branch 'main' of github.com:jankae/LibreCAL

jankae · Dec 15, 2023 · b9f7a11 · b9f7a11
2 parents 690e46c + 9f5163c
commit b9f7a11
Show file tree

Hide file tree

Showing 45 changed files with 100,519 additions and 123,381 deletions.
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -12,7 +12,7 @@ jobs:
   PC_Application_Ubuntu:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
 
       - name: Install dependencies
         run: |
@@ -21,7 +21,7 @@ jobs:
 
       - name: Get build timestamp
         id: id_date
-        run: echo "::set-output name=timestamp::$(date +%Y-%m-%d-%H-%M-%S)"
+        run: echo "timestamp=$(date +%Y-%m-%d-%H-%M-%S)" >> $GITHUB_OUTPUT
 
       - name: Get app version
         id: id_version
@@ -30,7 +30,7 @@ jobs:
           fw_major=`grep -oP '(?<=FW_MAJOR=)[0-9]+' LibreCAL-GUI.pro`
           fw_minor=`grep -oP '(?<=FW_MINOR=)[0-9]+' LibreCAL-GUI.pro`
           fw_patch=`grep -oP '(?<=FW_PATCH=)[0-9]+' LibreCAL-GUI.pro` 
-          echo "::set-output name=app_version::v$fw_major.$fw_minor.$fw_patch-${{steps.id_date.outputs.timestamp}}"
+          echo "app_version=v$fw_major.$fw_minor.$fw_patch-${{steps.id_date.outputs.timestamp}}" >> $GITHUB_OUTPUT
 
       - name: Build application
         run: |
@@ -42,19 +42,19 @@ jobs:
       - name: Upload artifact
         env: 
           LIBRECAL_VERSION: "${{steps.id_version.outputs.app_version}}"
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: LibreCAL-GUI-Ubuntu-${{env.LIBRECAL_VERSION}}
           path: Software/LibreCAL-GUI/LibreCAL-GUI
 
   PC_Application_Windows:
     runs-on: windows-2019
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - uses: msys2/setup-msys2@v2
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v2
+        uses: jurplel/install-qt-action@v3
         with:
           version: '5.15.1'
           arch: 'win64_mingw81'
@@ -71,7 +71,7 @@ jobs:
       - name: Get build timestamp
         shell: msys2 {0}
         id: id_date
-        run: echo "::set-output name=timestamp::$(date +%Y-%m-%d-%H-%M-%S)"
+        run: echo "timestamp=$(date +%Y-%m-%d-%H-%M-%S)" >> $GITHUB_OUTPUT
 
       - name: Get app version
         id: id_version
@@ -81,7 +81,7 @@ jobs:
           fw_major=`grep -oP '(?<=FW_MAJOR=)[0-9]+' LibreCAL-GUI.pro`
           fw_minor=`grep -oP '(?<=FW_MINOR=)[0-9]+' LibreCAL-GUI.pro`
           fw_patch=`grep -oP '(?<=FW_PATCH=)[0-9]+' LibreCAL-GUI.pro` 
-          echo "::set-output name=app_version::v$fw_major.$fw_minor.$fw_patch-${{steps.id_date.outputs.timestamp}}"
+          echo "app_version=v$fw_major.$fw_minor.$fw_patch-${{steps.id_date.outputs.timestamp}}" >> $GITHUB_OUTPUT
 
       - name: Build application
         run: |
@@ -102,29 +102,29 @@ jobs:
         shell: cmd
 
       - name: Upload
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         env: 
           LIBRECAL_VERSION: "${{steps.id_version.outputs.app_version}}"
         with:
           name: GUI_Windows-${{env.LIBRECAL_VERSION}}
           path: Software/LibreCAL-GUI/release
 
   PC_Application_OSX:
-    runs-on: macos-10.15
+    runs-on: macos-12
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
 
       - name: Install dependencies
         run: |
-          brew install qt@5 libusb
+          brew install qt@5 libusb pcre
           
       - name: Set Environment
         run: |
           echo "/usr/local/opt/qt@5/bin" >> $GITHUB_PATH
           
       - name: Get build timestamp
         id: id_date
-        run: echo "::set-output name=timestamp::$(date +%Y-%m-%d-%H-%M-%S)"
+        run: echo "timestamp=$(date +%Y-%m-%d-%H-%M-%S)" >> $GITHUB_OUTPUT
 
       - name: Get app version
         id: id_version
@@ -133,8 +133,8 @@ jobs:
           fw_major=`pcregrep -o '(?<=FW_MAJOR=)[0-9]+' LibreCAL-GUI.pro`
           fw_minor=`pcregrep -o '(?<=FW_MINOR=)[0-9]+' LibreCAL-GUI.pro`
           fw_patch=`pcregrep -o '(?<=FW_PATCH=)[0-9]+' LibreCAL-GUI.pro` 
-          echo "::set-output name=app_version::v$fw_major.$fw_minor.$fw_patch-${{steps.id_date.outputs.timestamp}}"
-
+          echo "app_version=v$fw_major.$fw_minor.$fw_patch-${{steps.id_date.outputs.timestamp}}" >> $GITHUB_OUTPUT
+          
       - name: Build application
         run: |
           cd Software/LibreCAL-GUI
@@ -147,15 +147,15 @@ jobs:
       - name: Upload artifact
         env: 
           LIBRECAL_VERSION: "${{steps.id_version.outputs.app_version}}"
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: LibreCAL-GUI-OSX-${{env.LIBRECAL_VERSION}}
           path: Software/LibreCAL-GUI/LibreCAL-GUI.zip
 
   Embedded_Firmware:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
 
       - name: Install toolchain
         run: |
@@ -169,7 +169,7 @@ jobs:
         
       - name: Get build timestamp
         id: id_date
-        run: echo "::set-output name=timestamp::$(date +%Y-%m-%d-%H-%M-%S)"
+        run: echo "timestamp=$(date +%Y-%m-%d-%H-%M-%S)" >> $GITHUB_OUTPUT
 
       - name: Get app version
         id: id_version
@@ -178,7 +178,7 @@ jobs:
           fw_major=`grep -oP '(?<=FW_MAJOR=)[0-9]+' CMakeLists.txt`
           fw_minor=`grep -oP '(?<=FW_MINOR=)[0-9]+' CMakeLists.txt`
           fw_patch=`grep -oP '(?<=FW_PATCH=)[0-9]+' CMakeLists.txt`
-          echo "::set-output name=app_version::-v$fw_major.$fw_minor.$fw_patch-${{steps.id_date.outputs.timestamp}}"
+          echo "app_version=v$fw_major.$fw_minor.$fw_patch-${{steps.id_date.outputs.timestamp}}" >> $GITHUB_OUTPUT
 
       - name: Build application
         run: |
@@ -191,7 +191,7 @@ jobs:
         shell: bash
 
       - name: Upload
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         env: 
           LIBRECAL_VERSION: "${{steps.id_version.outputs.app_version}}"
         with:

diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 /.metadata/
-/LibreCAL-Eclipse-build/
-/LibreCAL-GUI/build-*
+Software/LibreCAL-Eclipse-build/
+Software/LibreCAL-GUI/build-*
 Software/build-*
 Software/.metadata/
 

diff --git a/Hardware/BOM.csv b/Hardware/BOM.csv
@@ -1,37 +1,38 @@
-"Source:","/home/jan/Projekte/LibreCAL/Hardware/LibreCAL/LibreCAL.kicad_sch"
-"Date:","Do 10 Nov 2022 22:32:58 CET"
-"Tool:","Eeschema 6.0.7-f9a2dced07~116~ubuntu20.04.1"
-"Generator:","/usr/share/kicad/plugins/bom_csv_grouped_by_value_with_fp.py"
-"Component Count:","123"
-"Ref","Qnty","Value","Cmp name","Footprint","Description","Vendor"
-"C1, C2, C7, C8, ","4","10n","C","Capacitor_SMD:C_0402_1005Metric","Unpolarized capacitor",""
-"C3, C4, C5, C6, C9, C11, C14, C15, C16, C17, C18, C19, C20, C22, C26, C30, C31, ","17","100n","C","Capacitor_SMD:C_0402_1005Metric","Unpolarized capacitor",""
-"C10, C21, C23, C24, C25, C27, C28, C29, C32, ","9","2u2","C","Capacitor_SMD:C_0402_1005Metric","Unpolarized capacitor",""
-"C12, C13, ","2","12p","C","Capacitor_SMD:C_0402_1005Metric","Unpolarized capacitor",""
-"C33, C49, ","2","NFM21PC475B1A3D","C_Feedthrough","LibreCAL:NFM21PC","Feedthrough capacitor",""
-"C34, C35, C36, C37, C38, C39, C40, C41, C42, C43, C44, C45, C48, C50, ","14","NFM18CC223R1C3D","C_Feedthrough","LibreCAL:NFM18CC","Feedthrough capacitor",""
-"C46, C47, ","2","22u","C","Capacitor_SMD:C_0805_2012Metric","Unpolarized capacitor",""
-"D1, D2, D4, D5, D6, D7, D8, D9, D10, D11, ","10","Green","LED","LED_SMD:LED_0603_1608Metric","Light emitting diode",""
-"D3, ","1","Red","LED","LED_SMD:LED_0603_1608Metric","Light emitting diode",""
-"FB1, FB2, FB5, FB6, ","4","MMZ1005S121CTD25","FerriteBead_Small","Inductor_SMD:L_0402_1005Metric","Ferrite bead, small symbol",""
-"FB3, FB4, ","2","MMZ1005A222ET000","FerriteBead_Small","Inductor_SMD:L_0402_1005Metric","Ferrite bead, small symbol",""
-"J1, J2, J3, J4, ","4","901-10510-2","901-10510-2","LibreCAL:901-10510-2","High quality SMA connector, Amphenol",""
-"J5, ","1","USB_C_Receptacle_USB2.0","USB_C_Receptacle_USB2.0","Connector_USB:USB_C_Receptacle_HRO_TYPE-C-31-M-12","USB 2.0-only Type-C Receptacle connector",""
-"Q1, ","1","IRLML2060","IRLML2060","Package_TO_SOT_SMD:SOT-23","1.2A Id, 60V Vds, 480mOhm Rds, N-Channel HEXFET Power MOSFET, SOT-23",""
-"R1, R2, R3, R4, ","4","49R9","R","Resistor_SMD:R_0402_1005Metric","Resistor",""
-"R5, R6, ","2","5k1","R","Resistor_SMD:R_0402_1005Metric","Resistor",""
-"R7, ","1","1k","R","Resistor_SMD:R_0402_1005Metric","Resistor",""
-"R8, R9, ","2","6R2","R","Resistor_SMD:R_2512_6332Metric","Resistor",""
-"R10, R11, R25, R26, R27, R28, R29, R30, R31, R32, R33, R34, R35, ","13","47k","R","Resistor_SMD:R_0402_1005Metric","Resistor",""
-"R12, R13, ","2","10k","R","Resistor_SMD:R_0402_1005Metric","Resistor",""
-"R14, R15, R16, R17, R18, R19, R20, R21, R22, R23, R24, ","11","330","R","Resistor_SMD:R_0402_1005Metric","Resistor",""
-"R36, ","1","100","R","Resistor_SMD:R_0402_1005Metric","Resistor",""
-"SW1, ","1","TL3301NF160QG","SW_MEC_5E","LibreCAL:TL3301N-J","MEC 5E single pole normally-open tactile switch",""
-"SW2, SW3, ","2","TL3301CF160QG","SW_MEC_5E","LibreCAL:TL3301C-J","MEC 5E single pole normally-open tactile switch",""
-"TH1, ","1","ERT-J0ER103J","Thermistor_NTC","Resistor_SMD:R_0402_1005Metric","Temperature dependent resistor, negative temperature coefficient",""
-"U1, U2, U3, U4, ","4","PE426462","PE426462","Package_DFN_QFN:QFN-24-1EP_4x4mm_P0.5mm_EP2.7x2.7mm","",""
-"U5, U8, ","2","W25Q16JVSNIQ","W25Q16JVSNIQ","Package_SO:SOIC-8_3.9x4.9mm_P1.27mm","",""
-"U6, ","1","IP4234CZ6","IP4234CZ6","Package_TO_SOT_SMD:SOT-23-6","",""
-"U7, ","1","RP2040","RP2040","LibreCAL:RP2040","A microcontroller by Raspberry Pi",""
-"U9, ","1","MIC5528-3.3YMT-TR","MIC5528","LibreCAL:DFN-6-1EP_1.2x1.2mm_P0.4mm_EP0.3x0.94mm","LDO",""
-"Y1, ","1","ECS-120-8-36-CKM-TR3","Crystal_GND24","Crystal:Crystal_SMD_2520-4Pin_2.5x2.0mm","Four pin crystal, GND on pins 2 and 4",""
+"Source:","/home/jan/Projekte/LibreCAL/Hardware/LibreCAL/LibreCAL.kicad_sch"
+"Date:","Do 30 Nov 2023 18:18:11 CET"
+"Tool:","Eeschema 7.0.8-7.0.8~ubuntu22.04.1"
+"Generator:","/usr/share/kicad/plugins/bom_csv_grouped_by_value_with_fp.py"
+"Component Count:","123"
+"Ref","Qnty","Value","Cmp name","Footprint","Description","Vendor","DNP"
+"C1, C2, C7, C8","4","10n","C","Capacitor_SMD:C_0402_1005Metric","Unpolarized capacitor","",""
+"C3, C4, C5, C6, C9, C11, C14, C15, C16, C17, C18, C19, C20, C22, C26, C30, C31","17","100n","C","Capacitor_SMD:C_0402_1005Metric","Unpolarized capacitor","",""
+"C10, C21, C23, C24, C25, C27, C28, C29, C32","9","2u2","C","Capacitor_SMD:C_0402_1005Metric","Unpolarized capacitor","",""
+"C12, C13","2","12p","C","Capacitor_SMD:C_0402_1005Metric","Unpolarized capacitor","",""
+"C33, C49","2","NFM21PC475B1A3D","C_Feedthrough","LibreCAL:NFM21PC","Feedthrough capacitor","",""
+"C34, C35, C36, C37, C38, C39, C40, C41, C42, C43, C44, C45, C48, C50","14","NFM18CC223R1C3D","C_Feedthrough","LibreCAL:NFM18CC","Feedthrough capacitor","",""
+"C46, C47","2","22u","C","Capacitor_SMD:C_0805_2012Metric","Unpolarized capacitor","",""
+"D1, D2, D4, D5, D6, D7, D8, D9, D10, D11","10","Green","LED","LED_SMD:LED_0603_1608Metric","Light emitting diode","",""
+"D3","1","Red","LED","LED_SMD:LED_0603_1608Metric","Light emitting diode","",""
+"FB1, FB2, FB5, FB6","4","MMZ1005S121CTD25","FerriteBead_Small","Inductor_SMD:L_0402_1005Metric","Ferrite bead, small symbol","",""
+"FB3, FB4","2","MMZ1005A222ET000","FerriteBead_Small","Inductor_SMD:L_0402_1005Metric","Ferrite bead, small symbol","",""
+"J1, J2, J3, J4","4","901-10510-2","901-10510-2","LibreCAL:901-10510-2","High quality SMA connector, Amphenol","",""
+"J5","1","USB_C_Receptacle_USB2.0","USB_C_Receptacle_USB2.0","Connector_USB:USB_C_Receptacle_HRO_TYPE-C-31-M-12","USB 2.0-only Type-C Receptacle connector","",""
+"Q1","1","IRLML2060","IRLML2060","Package_TO_SOT_SMD:SOT-23","1.2A Id, 60V Vds, 480mOhm Rds, N-Channel HEXFET Power MOSFET, SOT-23","",""
+"R1, R2, R3, R4","4","CH0402-50RGFTA","R","Resistor_SMD:R_0402_1005Metric","Resistor","",""
+"R5, R6","2","5k1","R","Resistor_SMD:R_0402_1005Metric","Resistor","",""
+"R7","1","1k","R","Resistor_SMD:R_0402_1005Metric","Resistor","",""
+"R8, R9","2","6R2","R","Resistor_SMD:R_2512_6332Metric","Resistor","",""
+"R10, R11, R25, R26, R27, R28, R29, R30, R31, R32, R33, R34, R35","13","47k","R","Resistor_SMD:R_0402_1005Metric","Resistor","",""
+"R12, R13","2","10k","R","Resistor_SMD:R_0402_1005Metric","Resistor","",""
+"R14, R15, R16, R17, R18, R19, R20, R21, R22, R23, R24","11","330","R","Resistor_SMD:R_0402_1005Metric","Resistor","",""
+"R36","1","100","R","Resistor_SMD:R_0402_1005Metric","Resistor","",""
+"SW1","1","TL3301NF160QG","SW_MEC_5E","LibreCAL:TL3301N-J","MEC 5E single pole normally-open tactile switch","",""
+"SW2, SW3","2","TL3301CF160QG","SW_MEC_5E","LibreCAL:TL3301C-J","MEC 5E single pole normally-open tactile switch","",""
+"TH1","1","ERT-J0ER103J","Thermistor_NTC","Resistor_SMD:R_0402_1005Metric","Temperature dependent resistor, negative temperature coefficient","",""
+"U1, U2, U3, U4","4","PE426462","PE426462","Package_DFN_QFN:QFN-24-1EP_4x4mm_P0.5mm_EP2.7x2.7mm","","",""
+"U5","1","W25Q16JVSNIQ","W25Q16JVSNIQ","Package_SO:SOIC-8_3.9x4.9mm_P1.27mm","","",""
+"U6","1","IP4234CZ6","IP4234CZ6","Package_TO_SOT_SMD:SOT-23-6","","",""
+"U7","1","RP2040","RP2040","LibreCAL:RP2040","A microcontroller by Raspberry Pi","",""
+"U8","1","W25Q128JVSIQ","W25Q16JVSNIQ","Package_SO:SOIC-8_5.23x5.23mm_P1.27mm","","",""
+"U9","1","MIC5528-3.3YMT-TR","MIC5528","LibreCAL:DFN-6-1EP_1.2x1.2mm_P0.4mm_EP0.3x0.94mm","LDO","",""
+"Y1","1","ECS-120-8-36-CKM-TR3","Crystal_GND24","Crystal:Crystal_SMD_2520-4Pin_2.5x2.0mm","Four pin crystal, GND on pins 2 and 4","",""