Merge pull request #3 from LAPSyLAB/main

Changes for RA, OR and VIN courses (still some TODOs in scripts)

roles/RA-63703/meta/main.yml

@@ -1,13 +1,14 @@
 # Računalniška arhitektura
-# Ziga.Pusnik@fri.uni-lj.si, Rok.Cesnovar@fri.uni-lj.si, Robert.Rozman@fri.uni-lj.si, Mira.Trebar@fri.uni-lj.si
+# Ziga.Pusnik@fri.uni-lj.si, Robert.Rozman@fri.uni-lj.si
-# Windows, RAVINOR, CubeIDE + QEMU Embedded plugin, WinIdea 9.21 + GCC + QEMU, WinIdea 9.12.256 (FRISMS kompatibilna), Visual2
+# Windows, RAVINOR, CubeIDE + tools, STMDuino, WinIdea 9.21 + GCC + QEMU, Visual2
 dependencies:
   - role: stm32cube
   - role: stm32duino
+  - role: vscode
   - role: winidea
-  - role: winidea-frisms
+  - role: gcc-arm
   - role: git
   - role: visual2
-  - role: algobuilder
+
-  - role: putty
+
-  - role: pulseview
+

roles/VN-63728/meta/main.yml

@@ -1,9 +1,12 @@
 # Vhodno-izhodne naprave
 # Robert.Rozman@fri.uni-lj.si
-# Windows, Logisim Evolution, RAVINOR, WinIdea 9.12.256 (FRISMS kompatibilna), LTSpice
+# Windows, CubeIDE + Tools, LTSpice, PulseView, RAVINOR
 dependencies:
-  - role: logisim
+  - role: stm32cube
-  - role: winidea-frisms
+  - role: stm32duino
-  - role: winidea
+  - role: vscode
   - role: ltspice
+  - role: pulseview
+  - role: putty
+  - role: algobuilder
 

roles/linroom/tasks/GNS3.yml

@@ -12,3 +12,4 @@
   ansible.builtin.apt:
     name: gns3-gui
     state: latest
+

roles/logisim/tasks/main_win.yml

@@ -15,5 +15,5 @@
 
 - name: Install Logisim-Evolution
   win_package:
-    path: https://github.com/logisim-evolution/logisim-evolution/releases/download/v3.7.2/logisim-evolution-3.7.2.msi
+    path: https://github.com/logisim-evolution/logisim-evolution/releases/download/v3.8.0/logisim-evolution-3.8.0-arm64.msi
-    product_id: b30fa00c-da3f-3769-aaea-6571cacf5c30
+  # TODO  product_id: b30fa00c-da3f-3769-aaea-6571cacf5c30

roles/ltspice/tasks/main_win.yml

@@ -1 +1,3 @@
-# TODO https://ltspice.analog.com/software/LTspice64.exe
+# TODO 
+# Win: https://ltspice.analog.com/software/LTspice64.msi
+# MAC: https://ltspice.analog.com/software/LTspice.pkg

roles/stm32algobuilder/tasks/main_win.yml

@@ -1,4 +1,5 @@
 # TODO check install status
+# TODO: Exe file is missing - Problem on ST site
 - name: Check AlgoBuilder install status
   win_stat:
     path: C:\Program Files (x86)\Thonny\thonny.exe
@@ -7,13 +8,13 @@
 - when: not file.stat.exists
   block:
     - name: Download AlgoBuilder
-      win_command: wget "https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/EZhqHxJoAfdEjdlMu0uGWGcBOqrT0vTVv2_nhynWZ3fOwQ?e=rcskhq&download=1" -O C:\AlgoBuilderSuite.exe
+      win_command: wget "https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/EdBQJN3I6fVFj7qgs6SjRp4BZ0QbWIV26NUlLv_4d9JsDQ?e=hA4Cbl&download=1" -O C:\AlgoBuilderSuite.exe
       args:  
         creates: C:\AlgoBuilderSuite.exe
       #win_get_url:
       #  follow_redirects: all
       #  http_agent: Wget/1.21.3
-      # url: https://unilj-my.sharepoint.com/:u:/r/personal/rozman_fri1_uni-lj_si/Documents/Arhiv/ImportantFiles/AlgoBuilderSuite.exe?download=1
+      # url: https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/EdBQJN3I6fVFj7qgs6SjRp4BZ0QbWIV26NUlLv_4d9JsDQ?e=hA4Cbl?download=1
       #  dest: C:\AlgoBuilderSuite.exe
       #register: download
     

roles/stm32cube/tasks/main_lin.yml

@@ -8,13 +8,13 @@
 #  register: download
 - name: Set filename
   set_fact:
-    dest_fname: /tmp/st-stm32cubeide_1.13.1_17479_20230728_0839_amd64.sh
+    dest_fname: /tmp/st-stm32cubeide_1.16.0_21983_20240628_1741_amd64.sh
 
 - name: Download stm32
   command:
-    cmd: wget 'https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/Eda8dp03JWtGrT3rdE4ECFUBv2qAGW_aujWujr5YkLp3JA?e=vJRUgY&download=1' -O {{ dest_fname }}
+    cmd: wget 'https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/EUrIkoWbod5OilNHLnReBvYBMK7mlwI-R1Qeqhb-ux7hjg?e=HGloHF&download=1' -O {{ dest_fname }}
     creates: "{{ dest_fname }} "
-    # url: https://unilj-my.sharepoint.com/:u:/r/personal/rozman_fri1_uni-lj_si/Documents/Arhiv/ImportantFiles/st-stm32cubeide_1.13.1_17479_20230728_0839_amd64.sh?download=1
+    # url: https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/EUrIkoWbod5OilNHLnReBvYBMK7mlwI-R1Qeqhb-ux7hjg?e=HGloHF?download=1
 
 - name: Change script permissions
   file:

roles/stm32cube/tasks/main_win.yml

@@ -7,17 +7,18 @@
   block:
     - name: Set download filenames
       set_fact:
-        cubemx_download_file: C:\CubeMX.exe
+    #    cubemx_download_file: C:\CubeMX.exe
         cubeprogrammer_download_file: C:\CubeProgrammer.exe
-        cufinder_download_file: C:\CUFinder.exe
+        cubemonitor_download_file: C:\CubeMonitor.exe
-        cubeide_download_file: C:\st-stm32cubeide_1.13.1_17479_20230728_0839_x86_64.exe
+    #    cufinder_download_file: C:\CUFinder.exe
-    - name: Download CubeMX
+        cubeide_download_file: C:\st-stm32cubeide_1.16.0_21983_20240628_1741_x86_64.exe
-      # win_get_url:
+    # - name: Download CubeMX
-      win_command: wget "https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/EZhqHxJoAfdEjdlMu0uGWGcBOqrT0vTVv2_nhynWZ3fOwQ?e=ilAlzP&download=1" -O "{{ cubemx_download_file }}"
+    #   # win_get_url:
-      #dest: C:\CubeMX.exe
+    #   win_command: wget "https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/EZhqHxJoAfdEjdlMu0uGWGcBOqrT0vTVv2_nhynWZ3fOwQ?e=ilAlzP&download=1" -O "{{ cubemx_download_file }}"
-      #register: cubemx_download
+    #   #dest: C:\CubeMX.exe
-      args:
+    #   #register: cubemx_download
-        creates: "{{ cubemx_download_file }}"
+    #   args:
+    #     creates: "{{ cubemx_download_file }}"
 
 #    - name: Install CubeMX
 #      win_package:
@@ -26,25 +27,41 @@
 #        arguments: /S
 
     - name: Download CubeProgrammer
-      win_command: wget "https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/EVXiui8gFQ1ClgLmaLb2Pn8BmSUK7OLmPapvKQ6JTCXcZQ?e=OUWTDK&download=1" -O "{{ cubeprogrammer_download_file }}"
+      win_command: wget "https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/EXHsKDjM6hVAuEGwEWcMyBEB6bHd3HuOP38D7Wjt41vjTw?e=7jatnu&download=1" -O "{{ cubeprogrammer_download_file }}"
       #win_get_url:
       #  dest: C:\CubeProgrammer.exe
       #register: cubeprogrammer_download
       args:
         creates: "{{ cubeprogrammer_download_file }}"
 
-#    - name: Install CubeProgrammer
+    # - name: Install CubeProgrammer
-#      win_package:
+    #   win_package:
-#        path: "{{ cubeprogrammer_download_file }}"
+    #     path: "{{ cubeprogrammer_download_file }}"
-#        arguments: /S
+    #     arguments: /S
 
-    - name: Download STM CUFinder
+    - name: Download CubeMonitor
-      win_command: wget "https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/EfesbSW7EftDoSjtt-nr_eYBH_EBzXnysW0Lk1wnNzx2Mw?e=HSSmDz&download=1" -O "{{ cufinder_download_file }}"
+    # TODO 2024: only zip distributions exists in zip file
+    # TODO 2024: URL: https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/ERUUr7knYFNNuv5rViOb-PgB596EvC3ev4P_Aa_MjRL57Q?e=tZssk4
+    # TODO 2024: Have extracted setup exe - not sure if this is enough!
+      win_command: wget "https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/EQnm_b359Q5IpmfCUuDG-PABH10q94ixaLx4_CMrYKoNtQ?e=rKp3cV&download=1" -O "{{ cubemonitor_download_file }}"
       #win_get_url:
-      #  dest: C:\CUFinder.exe
+      #  dest: C:\CubeMonitor.exe
-      #register: cubecufinder_download
+      #register: cubemonitor_download
       args:
-        creates: "{{ cufinder_download_file }}"
+        creates: "{{ cubemonitor_download_file}}"
+
+    # - name: Install CubeMonitor
+    #   win_package:
+    #     path: "{{ cubemonitor_download_file }}"
+    #     arguments: /S
+
+    # - name: Download STM CUFinder
+    #   win_command: wget "https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/EfesbSW7EftDoSjtt-nr_eYBH_EBzXnysW0Lk1wnNzx2Mw?e=HSSmDz&download=1" -O "{{ cufinder_download_file }}"
+    #   #win_get_url:
+    #   #  dest: C:\CUFinder.exe
+    #   #register: cubecufinder_download
+    #   args:
+    #     creates: "{{ cufinder_download_file }}"
 
 #    - name: Install STM CUFinder
 #      win_package:
@@ -53,8 +70,8 @@
 
     - name: Download CubeIDE
       # win_get_url:
-      win_command: wget "https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/EegJD8ol6BNBkKCc-wVEImEB6GnjmjEZFqAAWScDLDgUlw?e=BcxukR&download=1" -O "{{ cubeide_download_file }}"
+      win_command: wget "https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/ERpqeASbQ2hDrL9ANNWJf5QBJNhHieXoqaNtduppk42qwg?e=zI8rjI&download=1" -O "{{ cubeide_download_file }}"
-      #dest: C:\st-stm32cubeide_1.13.1_17479_20230728_0839_x86_64.exe
+      #dest: C:\st-stm32cubeide_1.16.0_21983_20240628_1741_x86_64.exe
       #register: cubeide_download
       args:
         creates: "{{ cubeide_download_file }}"

roles/stm32duino/tasks/main_win.yml

@@ -5,4 +5,9 @@
 #    arguments: /S /AllUsers
 #    creates_path: "%ProgramFiles%\\Arduino IDE\\Arduino IDE.exe"
 
+# 2024: update: Full directory structure ready zip for Windows only on this URL:
+# https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/EYTFhlsJOFtFk9xsaViP0eYBtILVS24ZF_dlkgodu_L9Nw?e=geavvJ
+
+
+
 # TODO check if anything else is needed (esp8266com)?

roles/stm32unicleogui/tasks/main.yml

@@ -0,0 +1,4 @@
+- import_tasks: main_win.yml
+  when: ansible_connection == 'winrm'
+- import_tasks: main_lin.yml
+  when: ansible_connection == 'ssh'

roles/stm32unicleogui/tasks/main_lin.yml

@@ -0,0 +1,4 @@
+- name: Do not install UnicleoGUI
+  debug:
+    msg: "Do not install UnicleoGUI on Linux"
+

roles/stm32unicleogui/tasks/main_win.yml

@@ -0,0 +1,31 @@
+# TODO check install status
+- name: Check UnicleoGUI install status
+  win_stat:
+    path: C:\Program Files (x86)\STMicroelectronics\Unicleo-GUI\Unicleo-GUI.exe
+  register: file
+- when: not file.stat.exists
+  block:
+    - name: Download UnicleoGUI
+      win_command: wget "https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/EQG4vStF7ApBsN2TDm5AjGQBiU0iFbZZiz91UqGeHKX9FA?e=QOQky2&download=1" -O C:\Unicleo-GUI_Setup.exe
+      args:  
+        creates: C:\Unicleo-GUI_Setup.exe
+      #win_get_url:
+      #  follow_redirects: all
+      #  http_agent: Wget/1.21.3
+      # url: https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/EQG4vStF7ApBsN2TDm5AjGQBiU0iFbZZiz91UqGeHKX9FA?e=QOQky2?download=1
+      #  dest: C:\Unicleo-GUI_Setup.exe
+      #register: download
+    
+    - name: Install UnicleoGUI
+      win_package:
+        path: C:\Unicleo-GUI_Setup.exe
+        # path: "{{ download.dest }}"
+        arguments: /Verysilent /AllUsers
+    
+    - name: Remove temporary files
+      win_file:
+        path: C:\Unicleo-GUI_Setup.exe
+        # path: "{{ download.dest }}"
+        state: absent
+
+

roles/winidea/tasks/main_win.yml

@@ -7,7 +7,7 @@
   block:
     - name: Install WinIDEA
       win_package:
-        path: "https://www.isystem.com/downloads/winIDEA/setup/winIDEA(x64)9_21_110_138559.exe"
+        path: "https://www.isystem.com/downloads/winIDEA/setup/winIDEA_x64_9_21_253_178621.exe"
         arguments: /q
 
     - name: Download QEMU

roles/winroom/tasks/GNS3.yml

@@ -1,27 +1,4 @@
-- name: Set GNS3 version
+- name: GNS3 na Windows ne deluje
-  set_fact:
+  debug:
-    target_version: "3.0.0a2"
+    msg: "GNS3 na Windows zaenkrat ne vklapljamo"
 
-- name: Check GNS3 install status
-  win_stat:
-    path: C:\Program Files\GNS3\gns3.exe
-  register: file
-  
-- when: not file.stat.exists
-  block:
-    # win_package fails to download for some reason
-    - name: Download GNS3
-      win_get_url:
-        url: https://github.com/GNS3/gns3-gui/releases/download/v{{ target_version }}/GNS3-{{ target_version }}-all-in-one.exe
-        dest: 'C:\'
-      register: download
-    
-    - name: Install GNS3
-      win_package:
-        path: "{{ download.dest }}"
-        arguments: /S /AllUsers
-
-    - name: Remove temporary files
-      win_file:
-        path: "{{ download.dest }}"
-        state: absent