diff --git a/program/hal/hal-ads1115/_chatReg.vi b/program/hal/hal-ads1115/_chatReg.vi index d8a9f01..15e9fff 100644 Binary files a/program/hal/hal-ads1115/_chatReg.vi and b/program/hal/hal-ads1115/_chatReg.vi differ diff --git a/program/hal/hal-ads1115/begin.vi b/program/hal/hal-ads1115/begin.vi index 1d52b0c..9c251a7 100644 Binary files a/program/hal/hal-ads1115/begin.vi and b/program/hal/hal-ads1115/begin.vi differ diff --git a/program/hal/hal-ads1115/example/[todo]get analog value.vi b/program/hal/hal-ads1115/example/[todo]get analog value.vi deleted file mode 100644 index c4b1de4..0000000 Binary files a/program/hal/hal-ads1115/example/[todo]get analog value.vi and /dev/null differ diff --git a/program/hal/hal-ads1115/example/get analog value.vi b/program/hal/hal-ads1115/example/get analog value.vi index 5e3d7ba..9113427 100644 Binary files a/program/hal/hal-ads1115/example/get analog value.vi and b/program/hal/hal-ads1115/example/get analog value.vi differ diff --git a/program/hal/hal-ads1115/isReady.vi b/program/hal/hal-ads1115/isReady.vi index 80af5e6..b524661 100644 Binary files a/program/hal/hal-ads1115/isReady.vi and b/program/hal/hal-ads1115/isReady.vi differ diff --git a/program/hal/hal-ads1115/readValue.vi b/program/hal/hal-ads1115/readValue.vi index ee0b54c..98e8fb7 100644 Binary files a/program/hal/hal-ads1115/readValue.vi and b/program/hal/hal-ads1115/readValue.vi differ diff --git a/program/hal/hal-ads1115/setCOMP_LAT.vi b/program/hal/hal-ads1115/setCOMP_LAT.vi index 84b9276..b58e838 100644 Binary files a/program/hal/hal-ads1115/setCOMP_LAT.vi and b/program/hal/hal-ads1115/setCOMP_LAT.vi differ diff --git a/program/hal/hal-ads1115/setCOMP_MODE.vi b/program/hal/hal-ads1115/setCOMP_MODE.vi index 54b9cfd..e821b41 100644 Binary files a/program/hal/hal-ads1115/setCOMP_MODE.vi and b/program/hal/hal-ads1115/setCOMP_MODE.vi differ diff --git a/program/hal/hal-ads1115/setCOMP_POL.vi b/program/hal/hal-ads1115/setCOMP_POL.vi index ed5fddf..94005a0 100644 Binary files a/program/hal/hal-ads1115/setCOMP_POL.vi and b/program/hal/hal-ads1115/setCOMP_POL.vi differ diff --git a/program/hal/hal-ads1115/setCOMP_QUE.vi b/program/hal/hal-ads1115/setCOMP_QUE.vi index fb79819..bf29099 100644 Binary files a/program/hal/hal-ads1115/setCOMP_QUE.vi and b/program/hal/hal-ads1115/setCOMP_QUE.vi differ diff --git a/program/hal/hal-ads1115/setConfig.vi b/program/hal/hal-ads1115/setConfig.vi index 893b9a0..93a2b26 100644 Binary files a/program/hal/hal-ads1115/setConfig.vi and b/program/hal/hal-ads1115/setConfig.vi differ diff --git a/program/hal/hal-ads1115/setDATA_RATE.vi b/program/hal/hal-ads1115/setDATA_RATE.vi index 7ccb84d..1a8c416 100644 Binary files a/program/hal/hal-ads1115/setDATA_RATE.vi and b/program/hal/hal-ads1115/setDATA_RATE.vi differ diff --git a/program/hal/hal-ads1115/setMODE.vi b/program/hal/hal-ads1115/setMODE.vi index 6747170..d383874 100644 Binary files a/program/hal/hal-ads1115/setMODE.vi and b/program/hal/hal-ads1115/setMODE.vi differ diff --git a/program/hal/hal-ads1115/setMUX.vi b/program/hal/hal-ads1115/setMUX.vi index dcc9271..afab803 100644 Binary files a/program/hal/hal-ads1115/setMUX.vi and b/program/hal/hal-ads1115/setMUX.vi differ diff --git a/program/hal/hal-ads1115/setOS.vi b/program/hal/hal-ads1115/setOS.vi index 274b56b..55ca8c0 100644 Binary files a/program/hal/hal-ads1115/setOS.vi and b/program/hal/hal-ads1115/setOS.vi differ diff --git a/program/hal/hal-ads1115/setPGA.vi b/program/hal/hal-ads1115/setPGA.vi index f6f42b6..334959f 100644 Binary files a/program/hal/hal-ads1115/setPGA.vi and b/program/hal/hal-ads1115/setPGA.vi differ diff --git a/program/midle/Line-Sensor.vi b/program/midle/Line-Sensor.vi index cb8919f..b7a5f53 100644 Binary files a/program/midle/Line-Sensor.vi and b/program/midle/Line-Sensor.vi differ diff --git a/program/runtime/Main.vi b/program/runtime/Main.vi deleted file mode 100644 index 51ae9f9..0000000 Binary files a/program/runtime/Main.vi and /dev/null differ diff --git a/program/runtime/documentation/myRIO Project Documentation.html b/program/runtime/documentation/myRIO Project Documentation.html deleted file mode 100644 index 5cc0231..0000000 --- a/program/runtime/documentation/myRIO Project Documentation.html +++ /dev/null @@ -1,541 +0,0 @@ - - - - -myRIO Project - - - - - - - -

myRIO Project

- -

You can use the myRIO Project template as a starting point for creating myRIO applications with the myRIO default FPGA personality. With the myRIO Project template, you can easily access myRIO I/O channels and onboard devices without making major modifications to the structure of the application.

- -

Table of Contents

-

System Requirements

-

Understanding the Components of This Template

-

Running This Template

-

Modifying This Template

-

Related Information

- -
- - -

System Requirements

-

Development System

- - - -

Hardware

- - - - -

Understanding the Components of This Template

-

This template uses a Flat Sequence structure that executes frames from left to right.

- -

The Flat Sequence structure in this template executes the following frames from left to right:

-
    -
  1. Initialize—Initializes the myRIO, variables, and user interface elements, such as controls and indicators. Initializing code depends on your application needs.
  2. -
  3. Acquire and process data—Acquires data from the myRIO and processes the data for presentation. The While Loop repeats code until you click Stop or an error occurs.
  4. -
  5. Close—Closes user interface elements and variables, and resets the myRIO output values to zero before the application exits. Closing code is optional.
  6. -
- - -

Running This Template

-
    -
  1. In the Project Explorer window, navigate to your myRIO target and open the Main VI.
  2. -
  3. Click Run. This application acquires acceleration data from the onboard accelerometer and displays changes to acceleration values in a waveform chart.
  4. -
  5. Rotate or shake the myRIO and observe the changes of the X, Y, and Z acceleration values.
  6. -
  7. Click Stop to stop the application.
  8. -
- - -

Modifying This Template

- -

The following table summarizes the design decisions you must make when modifying this template.

- - - - - - - - - - - - - - - - - - - - - - - - - - -
Design DecisionDesign ExampleDetailed Information
How do you want to control the order of execution in your application?You want data to flow as desired without using the Flat Sequence structure.Controlling the Order of Execution
What data does your application need to initialize?You want your application to open a file for logging.Adding Initialization Code
Which myRIO I/O channels does your application need to access?You want your application to control the DIO channels on the myRIO.Modifying the Data Acquisition and Processing Code
What executions does your application need to complete before exiting?You want your application to close references to make memory resources available.Adding Closing Code
How does your application handle errors?You want your application to report errors at the end of the execution flow.Modifying Error Handling
- -

Controlling the Order of Execution

-

This template uses the Flat Sequence structure to control data flow. The data leaves each frame as the frame finishes executing. This template uses the Flat Sequence structure to demonstrate the purpose of the code in each frame.

-

Note  Do not overuse the Flat Sequence structure for controlling the execution order because the Flat Sequence structure prohibits parallel operations.

-

When you modify this template, you can remove the Flat Sequence structure and establish data dependency between nodes. For example, wiring the error in and error out clusters through nodes controls the data to flow from one node to another.

- - -

Adding Initialization Code

-

This template initializes the error in cluster to specific values. You can add code to initialize your user interface and the myRIO. For example, you may want to initialize the data to specific values or to open a file for logging.

- -

Modifying the Data Acquisition and Processing Code

-

This template uses the Accelerometer Express VI to read the acceleration values from the onboard accelerometer and uses a waveform chart to display the acceleration values.

-

You can add code to acquire data from the myRIO and process the data based on your application needs. The myRIO Toolkit provides Express VIs and Low Level VIs for you to access I/O channels and the onboard devices.

- -

Adding Closing Code

-

This template uses the Reset VI to reset the onboard accelerometer. You must use the Reset VI after the completion of all operations with the myRIO I/O channels. Otherwise, the Reset VI might return unexpected results.

-

You can add code that executes after the data acquisition and processing completes but before the application exits. Closing code commonly accomplishes the following tasks:

- - -

Modifying Error Handling

-

By default, if an error occurs in the Accelerometer Express VI, this template stops. If you do not want the error to stop your application, you can remove the OR function and wire the Stop control directly to the conditional terminal of the While Loop. The error in and error out clusters pass error information from the beginning of the VI to the end and report the error at the end of the execution flow.

- - - -

Related Information

-

Refer to the LabVIEW Help, available by selecting Help»LabVIEW Help from LabVIEW, for information about LabVIEW concepts or objects used in this sample project. You also can use the Context Help window to learn basic information about LabVIEW objects as you move the cursor over each object. To display the Context Help window in LabVIEW, select Help»Show Context Help.

-

Refer to the myRIO sample projects, available from the Create Project dialog box, for examples of adapting this template to more complex applications.

- -
-

Legal Information

- -

Copyright

-

© 2013–2015 National Instruments. All rights reserved.

- -

Under the copyright laws, this publication may not be reproduced or transmitted in any form, electronic or mechanical, including photocopying, recording, storing in an information retrieval system, or translating, in whole or in part, without the prior written consent of National Instruments Corporation.

- -

National Instruments respects the intellectual property of others, and we ask our users to do the same. NI software is protected by copyright and other intellectual property laws. Where NI software may be used to reproduce software or other materials belonging to others, you may use NI software only to reproduce materials that you may reproduce in accordance with the terms of any applicable license or other legal restriction.

- -

End-User License Agreements and Third-Party Legal Notices

-

You can find end-user license agreements (EULAs) and third-party legal notices in the following locations after installation:

- -

U.S. Government Restricted Rights

-

If you are an agency, department, or other entity of the United States Government ("Government"), the use, duplication, reproduction, release, modification, disclosure or transfer of the technical data included in this manual is governed by the Restricted Rights provisions under Federal Acquisition Regulation 52.227-14 for civilian agencies and Defense Federal Acquisition Regulation Supplement Section 252.227-7014 and 252.227-7015 for military agencies.

- -

IVI Foundation Copyright Notice

- -

Content from the IVI specifications reproduced with permission from the IVI Foundation.

- -

The IVI Foundation and its member companies make no warranty of any kind with regard to this material, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose. The IVI Foundation and its member companies shall not be liable for errors contained herein or for incidental or consequential damages in connection with the furnishing, performance, or use of this material.

- - - -

Trademarks

- - -

Refer to the NI Trademarks and Logo Guidelines at ni.com/trademarks for information on National Instruments trademarks. Other product and company names mentioned herein are trademarks or trade names of their respective companies.

- - - -

Patents

-

For patents covering the National Instruments products/technology, refer to the appropriate location: Help»Patents in your software, the patents.txt file on your media, or the National Instruments Patent Notice at ni.com/patents.

- - - - \ No newline at end of file diff --git a/program/runtime/documentation/myRIO_Project_Diagram.gif b/program/runtime/documentation/myRIO_Project_Diagram.gif deleted file mode 100644 index 9e25779..0000000 Binary files a/program/runtime/documentation/myRIO_Project_Diagram.gif and /dev/null differ diff --git a/program/runtime/runtime.aliases b/program/runtime/runtime.aliases index 3bc69ba..89f5fc6 100644 --- a/program/runtime/runtime.aliases +++ b/program/runtime/runtime.aliases @@ -1,6 +1,6 @@ -[Mobile-Robot-K4-002] -Mobile-Robot-K4-002 = "172.22.11.2" +[Mobile-Robot-K4-001] +Mobile-Robot-K4-001 = "172.22.11.2" [My Computer] -My Computer = "192.168.225.117" +My Computer = "192.168.1.8" diff --git a/program/runtime/runtime.lvlps b/program/runtime/runtime.lvlps index e161285..6a16c9a 100644 --- a/program/runtime/runtime.lvlps +++ b/program/runtime/runtime.lvlps @@ -1,3 +1,3 @@ [ProjectWindow_Data] -ProjectExplorer.ClassicPosition[String] = "37,4,863,331" +ProjectExplorer.ClassicPosition[String] = "37,4,863,449" diff --git a/program/runtime/runtime.lvproj b/program/runtime/runtime.lvproj index 4153104..da316bd 100644 --- a/program/runtime/runtime.lvproj +++ b/program/runtime/runtime.lvproj @@ -1,5 +1,5 @@  - + false @@ -29,8 +29,8 @@ - - Mobile-Robot-K4-002 + + Mobile-Robot-K4-001 172.22.11.2 OS,Linux;CPU,ARM;DeviceCode,762F;TARGET_TYPE,RT;FPGAPersonality,myRIO_FP_Default; 762F @@ -113,19 +113,14 @@ AddOutputFilter chunkFilter - - - - - + - @@ -146,9 +141,7 @@ AddOutputFilter chunkFilter - - @@ -159,37 +152,28 @@ AddOutputFilter chunkFilter - - - - - - - - - @@ -197,25 +181,23 @@ AddOutputFilter chunkFilter - - - - true - + + true +