V2.0

antora/antora-playbook-en.yml

@@ -13,8 +13,8 @@ urls:
   latest_version_segment_strategy: redirect:to
 content:
   sources:
-  - url: ./../
-    branches: [v*]
+  - url: https://github.com/LabVIEWCommunityTraining/cti-documentation
+    branches: [v*.*]
     start_paths: cti-doc_en/content, cti-doc_en/home
 asciidoc:
   attributes:

antora/antora-playbook-es.yml

@@ -13,8 +13,8 @@ urls:
   latest_version_segment_strategy: redirect:to
 content:
   sources:
-  - url: ./../
-    branches: [v*]
+  - url: https://github.com/LabVIEWCommunityTraining/cti-documentation
+    branches: [v*.*]
     start_paths: cti-doc_es/content, cti-doc_es/home
 asciidoc:
   attributes:

antora/antora-playbook-fr.yml

@@ -13,8 +13,8 @@ urls:
   latest_version_segment_strategy: redirect:to
 content:
   sources:
-  - url: ./../
-    branches: [v*]
+  - url: https://github.com/LabVIEWCommunityTraining/cti-documentation
+    branches: [v*.*]
     start_paths: cti-doc_fr/content, cti-doc_fr/home
 asciidoc:
   attributes:

antora/antora-playbook-zh.yml

@@ -13,8 +13,8 @@ urls:
   latest_version_segment_strategy: redirect:to
 content:
   sources:
-  - url: ./../
-    branches: [v*]
+  - url: https://github.com/LabVIEWCommunityTraining/cti-documentation
+    branches: [v*.*]
     start_paths: cti-doc_zh/content, cti-doc_zh/home
 asciidoc:
   attributes:

cti-doc_en/content/antora.yml

@@ -1,6 +1,6 @@
 name: cti-doc
 title: LabVIEW training
-version: v1.0
+version: v2.0
 nav:
   - modules/ROOT/nav.adoc
 asciidoc:

cti-doc_en/content/modules/ROOT/pages/course-manual.adoc

@@ -1,6 +1,8 @@
 = Course Manual
 :page-toclevels: 1
 
+CAUTION: {wip}
+
 == Setting up the System
 
 
@@ -185,6 +187,7 @@ Here we can see that no errors were apparent and Identity has a value.
 image::cm_028.00_IDN_ReturnData_Displayed.png[]
 
 But more importantly the LED on the hardware has turned on.
+
 image::cm_029.00_LED_Turns_ON.png[]
 
 == Lesson 2 – For Loops
@@ -254,6 +257,7 @@ execute.)
 (10 times on and 10 times off.)
 
 image::cm_034.00_RightClick-Create-Constant_TerminalN_ForLoop.png[]
+
 image::cm_035.00_ForLoopWired-20N.png[]
 
 In order for the program to `blink` successfully it will need to know
@@ -266,21 +270,19 @@ Register.` Wire the True Constant to the Shift Registers and the DO
 
 
 image::cm_036.00_RightClick-AddShiftRegister-ForLoop.png[]
-image::cm_037.00_ForLoopWiredIncludingShiftRegister.png[]
 
-* For a blinking LED you will need to invert the boolean value after
-every loop. To do this Right-click anywhere to bring up the functions
-palette. Hover over `Boolean` then select the `Not` Boolean. Wire this
-into the shift registers.
+image::cm_037.00_ForLoopWiredIncludingShiftRegister.png[]
 
 * Double click the green wire connecting the True Constant to the SubVI and delete it. Move the True Constant outside the For Loop. Wire the Constant through the For Loop and into the Shift Registers.
 
 image::cm_038.00_DoubleClick-GreenWire-Delete-DragTrueConstant.png[]
+
 image::cm_039.00_DragTrueConstantOutsideForLoop-WireToShiftRegister.png[]
 
 
 •	Remember to wire it back into the SubVI.
-040.00_ForLoopWired-TrueFromShiftRegisterToWriteDO.png[]
+
+image::cm_040.00_ForLoopWired-TrueFromShiftRegisterToWriteDO.png[]
 
 NOTE: If you were to run the program at this point the LED would light up, but would not `blink.`
 
@@ -298,7 +300,7 @@ function. Select and place inside the Loop.
 
 * Create a constant by Right-clicking on the left side of the `Wait`
 function. The `Wait` function executes in milliseconds, therefore to
-slow down the Loop by 5 seconds, write 500.
+have the LED ON for 500ms and Off for 500ms, write 500.
 
 image::cm_042.00_RightClick-FunctionsPalette-Timing-Wait(ms).png[]
 image::cm_043.00_ForLoopWired-Not.png[]
@@ -367,7 +369,8 @@ Loop and wire it up to the Conditional Terminal in the bottom right
 corner. If the Button on the Front Panel is pressed when the program is
 running then the Loop will end and the `blinking` LED will stop.
 
-image::cm_047.00_WhileLoopWired-BooleanSwitchWiredToStopTerminal.png
+image::cm_047.00_WhileLoopWired-BooleanSwitchWiredToStopTerminal.png[]
+
 
 === Exercise – Use DI to stop the loop
 
@@ -913,9 +916,10 @@ appropriate case to handle that event.
 
 image::cm_114.00_EventStructure.png[]
 
-. The event selector label specifies which events cause the displayed
-case to execute.
+
 . The Timeout terminals specifies the number of milliseconds to wait for
 an event before timing out.
+. The event selector label specifies which events cause the displayed
+case to execute.
 . The Event Data Node identifies the data LabVIEW returns when an event
 occurs

cti-doc_en/content/modules/ROOT/pages/index.adoc

@@ -1,15 +1,31 @@
 = Set-up Instructions
 
+CAUTION: {wip}
+
 == Install Virtualbox
 
-Go to https://www.virtualbox.org/wiki/Downloads[Virtualbox.org] and download the latest version.
+Go to https://www.virtualbox.org/wiki/Downloads[Virtualbox.org] and download version 7.0.X
 
 image::in_001.00_DownoadVirtualBox.png[]
 
-And install.
+Click on the Download Button, that will take you to the Downloads page
+
+image::in_001.01_DownoadVirtualBox-DownloadsPage.png[]
+
+there, scroll down to click on "Previous Releases"
+
+image::in_001.02_DownoadVirtualBox-ClickOnPreviousReleases.png[]
+
+Select the 7.0.X release
+
+image::in_001.03_DownoadVirtualBox-SelectVersion7.0.png[]
+
+and install.
 
 == Import VM
-Download https://downloads.gcentral.org/vm/20231021_OpenSUSE_CTIBase.ova[OVA file]
+Visit  https://gcentral.org/cti/[Gcentral/cti] and download the OVA file for the CTI virtual machine
+
+image::in_001.04_GCentral-CTI.png[]
 
 Now File>>Import Appliance into Virtualbox  
 
@@ -29,39 +45,85 @@ image::in_006.00_Start.png[]
 
 When imported open the new VM
 
-NOTE: Tip, the right ctrl button will free your mouse if the VM steals it.
+You may need to click on the "Show" button to get to your Virtual Machine
 
-Login as root, this solves a lot of issues with LabVIEW and Linux. Password is the same as the normal login. (labviewtraining)
+image::in_008_Show.png[]
 
-image::in_007.00_TopRight.png[]
+NOTE: Tip, the right ctrl button will free your mouse if the VM steals it.
 
-image::in_008.00_LogOut.png[]
+We no longer log in as a ROOT. The amazing team behind CTI has figured out how to avoid the need to have a ROOT Login. We will be using instead the CTI STUDENT log in with password = labviewtraining
 
 image::in_009.00_LogIn.png[]
 
-Click here and select Other… enter root and password (labviewtraining)
-
-image::in_010.00_LogInAsRoot.00.png[]
-
-And you should see the following.
+You will see the following Desktop
 
 image::in_011.00_Desktop.png[]
 
 == Setting Up Your Keyboard
 
-To change to a different keyboard, open up the start-up menu and select settings>>keyboard.
+To change to a different keyboard, open up the start-up menu:
+
+image::in_012.00_ClickOnMenu.png[]
+
+Type Keyboard and click on "Keyboard and Mouse"
 
-image::in_012.00_Keyboard.png[]
+image::in_012.01_TypeKeyboard.png[]
 
+Click on "Keyboard Layout"
 Select the keyboard that suits from the extensive list!
 
 image::in_013.00_KeyboardLanguage.png[]
 
 == Load and Activate LabVIEW
 
-image::in_014.00_LabVIEW.png[]
+We strongly recommend that you open Firefox before you activate LabVIEW.
+Open up the start-up menu and click on Other>>Post a question on the NI Forums
+This will open the NI Forums.
+
+image::in_014.00_OpenNIwebsite.png[]
+
+If you don't have an account, please create one and log in. If you already have an account, please log in.
+The first time you open Firefox it may take a little longer to refresh.
+
+image::in_014.01_CreateNIaccountOrLogIn.png[]
+
+You also need to have LabVIEW Community Edition Listed as one of your products. To verify this, go to "My Products". This may take a couple of minutes. 
+
+image::in_014.02_MyProducts.png[]
+
+You should have LabVIEW Community Edition, Linux listed as one of your products
+
+image::in_014.04_LabVIEWCommunityEditionLinux.png[]
+
+
+.Don't see LabVIEW Community Edition Listed
+[%collapsible]
+====
+
+If you don't see, it, you will need to initiate the LabVIEW download process to gain that entitlement.
+
+To download, go to Products>>LabVIEW
+
+image::in_014.05_ProductsLabVIEW.png[]
+
+Click on the Download button
 
-Activate LabVIEW Community Edition License – you’ll need an active account on NI.com.
+image::in_014.06_ClickDownload.png[]
+
+Select the Community Edition for Linux and click Download
+
+image::in_014.07_SelectLinuxCommunityEdition.png[]
+
+You can cancel the download process because LabVIEW is already installed on your VM. You just needed to initiate the download process to get the entitlement.
+
+====
+
+Now, you can minimize Firefox for now and let's open LabVIEW to activate it. 
+Double-click on the LabVIEW shortcut on the VM desktop
+
+image::in_014.08_ClickOnLabVIEWdesktopShortcut.png[]
+
+Activate LabVIEW Community Edition License. You will need to log in again to your NI Account on on NI.com.
 
 image::in_015.00_ActivateLabVIEWCommunityEdition.png[]
 
@@ -71,23 +133,19 @@ image::in_016.00_NIuserAccount.png[]
 
 Tap in your user account details and the LabVIEW license will activate.
 
-If you want to remove a license, the .lc file can be found in /root/natinst/.config/LabVIEW-2022/
-
-image::in_017.00_LabVIEW_lc_file.png[]
-
 LabVIEW will now load as normal
 
 == Install Course Materials
 
 image::in_018.00_AccessCommunityTrainingResources.png[]
 
-We’ve modified the Getting Started Window, this link will take you to the CTI Github repo.
+Open the start-up menu and click on Other>>Visit LabVIEW Community Training on GitHub
 
 image::in_019.00_GitHubCTImaterial.png[]
 
 Select the course you wish to give.
 
-image::in_020.00_DownloadZIP.png
+image::in_020.00_DownloadZIP.png[]
 
 Download as a zip file
 
@@ -97,7 +155,7 @@ Click on the file symbol
 
 image::in_022.00_Extract.png[]
 
-and extract to /root/Desktop
+and extract to Desktop
 
 image::in_023.00_ExtractDestination.png[]
 
@@ -110,7 +168,7 @@ image::in_024.00_ExtractedMaterials.png[]
 
 Open up ../4) LabVIEW Instrument Drivers in a window
 
-Using the File System icon on the desktop navigate to /usr/local/natinst/LabVIEW-2022-64/instr.lib
+Clicking on the Computer icon on the desktop and then on the File System, navigate to /usr/local/natinst/LabVIEW-2024-64/instr.lib
 
 Drag HandsOnPi2040 directory to ../instr.lib
 
@@ -125,9 +183,47 @@ image::in_026.00_HandsOnInstrumentPalette.png[]
 
 
 The file CTIPicoVISAEmulator.exe needs to be set to be executable
+Open the  GettingStartedLabVIEW1-English-main folder and navigate to 3) LabVIEW Instrument Emulator/builds/HandsOn
+and right-click on CTIPicoVISAEmulator folder and select "Open in Terminal"
+
+image::in_026.99_OpenInTerminal.png[]
+
+Then type ls kbd:[Enter]
+
+Then type ./CTIPicoVISAEmulator.exe kbd:[Enter]
+
+If you get a Permission denied, then type
+
+chmod u+x CTIPicoVISAEmulator.exe kbd:[Enter]
+
+Now you should be able to type ./CTIPicoVISAEmulator.exe kbd:[Enter]
 
 image::in_027.00_MarkEXE.png[]
 
+.Click here if you are getting other errors
+[%collapsible]
+====
+If you get other errors, then you need to build the Emulator executable for your VM.
+
+Navigate to Desktop/GettingStartedLabVIEW1-English-main/3) LabVIEW Instrument Emulator/Project and double-click on HandsOn.lvproj ot open it in LabVIEW
+
+Double-click Build Specifications
+
+Right-click on CTIPicoVISAEmulator and click on Build
+
+image::in_027.01_BuildSpecifications.png[]
+
+Once is done, click on the Explore button 
+
+image::in_027.02_Explore.png[]
+
+and you should be able to execute the exe
+
+image::in_027.03_EmulatorExecuting.png[]
+
+====
+
+
 == Setting Pico Firmware
 
 

cti-doc_en/home/antora.yml

@@ -1,3 +1,4 @@
 name: ROOT
 title: Welcome
-version: ~
+version: v2.0
+

cti-doc_en/home/modules/ROOT/pages/index.adoc

@@ -2,3 +2,5 @@
 :navtitle: Home
 :description: Home of the CTI documentation.
 :page-role: home
+
+CAUTION: This version of the documentation is under construction

cti-doc_es/content/antora.yml

@@ -1,6 +1,6 @@
 name: cti-doc
 title: Entrenamiento LabVIEW
-version: v1.0
+version: v2.0
 nav:
   - modules/ROOT/nav.adoc
 asciidoc:

cti-doc_es/home/antora.yml

@@ -1,3 +1,4 @@
 name: ROOT
 title: Welcome
-version: ~
+version: v2.0
+

cti-doc_fr/content/antora.yml

@@ -1,6 +1,7 @@
 name: cti-doc
 title: Formation LabVIEW
-version: v1.0
+version: v2.0
+
 nav:
   - modules/ROOT/nav.adoc
 asciidoc: