Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Nextion touchscreen and limit switch support, ported to CCS 10 and C2kW 3.02 #82

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Nextion touchscreen and limit switch support, ported to CCS 10 and C2kW 3.02 #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5c655a9
Nextion touchscreen and limit switch support, ported to CCS 10 and C2…
kentavv Aug 27, 2020
7e20417
Merge branch 'master' into feature-nextion
kentavv Oct 11, 2020
398eef4
Ported to CCS10.1 and C2000Ware3.03
kentavv Oct 13, 2020
f7cb106
Need placeholder for linked cware2000 files
kentavv Oct 13, 2020
6f5162b
Add debug symbols to Debug, and remove from Release
kentavv Oct 13, 2020
ec272b6
Merge remote-tracking branch 'origin/feature-ccs10' into feature-nextion
kentavv Oct 13, 2020
5284aa5
Merged in Nextion updates
kentavv Oct 13, 2020
52195bf
Fixing merge
kentavv Oct 13, 2020
701ebb1
Updates needed for the change in LPSCLK
kentavv Oct 13, 2020
3b2c868
Add files via upload
kentavv Oct 18, 2020
6988b59
Update README.md
kentavv Oct 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*.exe
*.out
*.app
/.metadata/
/.metadata/

.jxbrowser-data
RemoteSystemsTempFiles
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This is the firmware for an experimental lathe electronic leadscrew controller.
gears or gearbox on a metalworking lathe with a stepper motor controlled electronically based on an encoder on the
lathe spindle. The electronic controller allows setting different virtual gear ratios for feeds and threading.

![Silkscreened Control Panel](https://raw.githubusercontent.com/clough42/electronic-leadscrew/master/docs/images/CPKit.jpg)
![Silkscreened Control Panel](https://raw.githubusercontent.com/kentavv/electronic-leadscrew/feature-nextion/docs/images/Touchscreen.png)

## Latest Version

Expand Down
Binary file added docs/images/Touchscreen.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
268 changes: 172 additions & 96 deletions els-f280049c/.cproject
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 28 additions & 0 deletions els-f280049c/.launches/els-f280049c.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="com.ti.ccstudio.debug.launchType.device.debugging">
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.TMS320F280049C.ccxml.Texas Instruments XDS110 USB Debug Probe/C28xx_CPU1" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10; &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10; &lt;curValue&gt;1&lt;/curValue&gt;&#10; &lt;/property&gt;&#10;&#10; &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10; &lt;curValue&gt;1&lt;/curValue&gt;&#10; &lt;/property&gt;&#10;&#10; &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10; &lt;curValue&gt;0&lt;/curValue&gt;&#10; &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
<setAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_HIDE_CONFIG_ELEMENT_TYPES">
<setEntry value="BOARD"/>
<setEntry value="BYPASSED_CPU"/>
<setEntry value="BYPASSED_ROUTER"/>
<setEntry value="CONNECTION"/>
<setEntry value="DEVICE"/>
<setEntry value="NON_DEBUG_CPU"/>
<setEntry value="NO_DRIVER"/>
<setEntry value="ROUTER"/>
<setEntry value="SUBPATH"/>
<setEntry value="SYSTEM"/>
</setAttribute>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.TMS320F280049C.ccxml.Texas Instruments XDS110 USB Debug Probe/C28xx_CPU1" value="${build_artifact:els-f280049c}"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.TMS320F280049C.ccxml.Texas Instruments XDS110 USB Debug Probe/C28xx_CPU1" value="els-f280049c"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_TARGET_CONFIG" value="${target_config_active_default:els-f280049c}"/>
<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.TMS320F280049C.ccxml.Texas Instruments XDS110 USB Debug Probe/C28xx_CPU1" value="C:\Users\kent\workspace_v10\electronic-leadscrew\els-f280049c\Release\els-f280049c.out"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/els-f280049c"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/>
</listAttribute>
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="com.ti.ccstudio.debug.sourceLocator"/>
<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;sourceLookupDirector&gt;&#13;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;default/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;cpuSpecificContainer cpuName=&amp;quot;Texas Instruments XDS110 USB Debug Probe/C28xx_CPU1&amp;quot;&amp;gt;&amp;#13;&amp;#10;&amp;lt;childContainerEntry childMemento=&amp;quot;&amp;amp;lt;?xml version=&amp;amp;quot;1.0&amp;amp;quot; encoding=&amp;amp;quot;UTF-8&amp;amp;quot; standalone=&amp;amp;quot;no&amp;amp;quot;?&amp;amp;gt;&amp;amp;#13;&amp;amp;#10;&amp;amp;lt;project name=&amp;amp;quot;els-f280049c&amp;amp;quot; referencedProjects=&amp;amp;quot;true&amp;amp;quot;/&amp;amp;gt;&amp;amp;#13;&amp;amp;#10;&amp;quot; childType=&amp;quot;org.eclipse.debug.core.containerType.project&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&amp;lt;childContainerEntry childMemento=&amp;quot;&amp;amp;lt;?xml version=&amp;amp;quot;1.0&amp;amp;quot; encoding=&amp;amp;quot;UTF-8&amp;amp;quot; standalone=&amp;amp;quot;no&amp;amp;quot;?&amp;amp;gt;&amp;amp;#13;&amp;amp;#10;&amp;amp;lt;default/&amp;amp;gt;&amp;amp;#13;&amp;amp;#10;&amp;quot; childType=&amp;quot;org.eclipse.debug.core.containerType.default&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&amp;lt;childContainerEntry childMemento=&amp;quot;&amp;amp;lt;?xml version=&amp;amp;quot;1.0&amp;amp;quot; encoding=&amp;amp;quot;UTF-8&amp;amp;quot; standalone=&amp;amp;quot;no&amp;amp;quot;?&amp;amp;gt;&amp;amp;#13;&amp;amp;#10;&amp;amp;lt;productsSource/&amp;amp;gt;&amp;amp;#13;&amp;amp;#10;&amp;quot; childType=&amp;quot;com.ti.ccstudio.debug.containerType.products.source&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&amp;lt;childContainerEntry childMemento=&amp;quot;&amp;amp;lt;?xml version=&amp;amp;quot;1.0&amp;amp;quot; encoding=&amp;amp;quot;UTF-8&amp;amp;quot; standalone=&amp;amp;quot;no&amp;amp;quot;?&amp;amp;gt;&amp;amp;#13;&amp;amp;#10;&amp;amp;lt;deviceLibrarySource/&amp;amp;gt;&amp;amp;#13;&amp;amp;#10;&amp;quot; childType=&amp;quot;com.ti.ccstudio.debug.containerType.device.library.source&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&amp;lt;childContainerEntry childMemento=&amp;quot;&amp;amp;lt;?xml version=&amp;amp;quot;1.0&amp;amp;quot; encoding=&amp;amp;quot;UTF-8&amp;amp;quot; standalone=&amp;amp;quot;no&amp;amp;quot;?&amp;amp;gt;&amp;amp;#13;&amp;amp;#10;&amp;amp;lt;librarySource/&amp;amp;gt;&amp;amp;#13;&amp;amp;#10;&amp;quot; childType=&amp;quot;com.ti.ccstudio.debug.containerType.library.source&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&amp;lt;/cpuSpecificContainer&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;com.ti.ccstudio.debug.containerType.cpu.specific&quot;/&gt;&#13;&#10;&lt;/sourceContainers&gt;&#13;&#10;&lt;/sourceLookupDirector&gt;&#13;&#10;"/>
</launchConfiguration>
68 changes: 68 additions & 0 deletions els-f280049c/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,72 @@
<nature>org.eclipse.cdt.core.ccnature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
</natures>
<linkedResources>
<link>
<name>driverlib.lib</name>
<type>1</type>
<locationURI>$%7BC2000WARE_DLIB_ROOT%7D/ccs/Release/driverlib.lib</locationURI>
</link>
<link>
<name>device/f28004x_codestartbranch.asm</name>
<type>1</type>
<locationURI>PARENT-3-C2000WARE_DLIB_ROOT/device_support/f28004x/common/source/f28004x_codestartbranch.asm</locationURI>
</link>
<link>
<name>device/f28004x_cputimers.c</name>
<type>1</type>
<locationURI>PARENT-3-C2000WARE_DLIB_ROOT/device_support/f28004x/common/source/f28004x_cputimers.c</locationURI>
</link>
<link>
<name>device/f28004x_defaultisr.c</name>
<type>1</type>
<locationURI>PARENT-3-C2000WARE_DLIB_ROOT/device_support/f28004x/common/source/f28004x_defaultisr.c</locationURI>
</link>
<link>
<name>device/f28004x_globalvariabledefs.c</name>
<type>1</type>
<locationURI>PARENT-3-C2000WARE_DLIB_ROOT/device_support/f28004x/headers/source/f28004x_globalvariabledefs.c</locationURI>
</link>
<link>
<name>device/f28004x_gpio.c</name>
<type>1</type>
<locationURI>PARENT-3-C2000WARE_DLIB_ROOT/device_support/f28004x/common/source/f28004x_gpio.c</locationURI>
</link>
<link>
<name>device/f28004x_headers_nonbios.cmd</name>
<type>1</type>
<locationURI>PARENT-3-C2000WARE_DLIB_ROOT/device_support/f28004x/headers/cmd/f28004x_headers_nonbios.cmd</locationURI>
</link>
<link>
<name>device/f28004x_piectrl.c</name>
<type>1</type>
<locationURI>PARENT-3-C2000WARE_DLIB_ROOT/device_support/f28004x/common/source/f28004x_piectrl.c</locationURI>
</link>
<link>
<name>device/f28004x_pievect.c</name>
<type>1</type>
<locationURI>PARENT-3-C2000WARE_DLIB_ROOT/device_support/f28004x/common/source/f28004x_pievect.c</locationURI>
</link>
<link>
<name>device/f28004x_spi.c</name>
<type>1</type>
<locationURI>PARENT-3-C2000WARE_DLIB_ROOT/device_support/f28004x/common/source/f28004x_spi.c</locationURI>
</link>
<link>
<name>device/f28004x_sysctrl.c</name>
<type>1</type>
<locationURI>PARENT-3-C2000WARE_DLIB_ROOT/device_support/f28004x/common/source/f28004x_sysctrl.c</locationURI>
</link>
<link>
<name>device/f28004x_usdelay.asm</name>
<type>1</type>
<locationURI>PARENT-3-C2000WARE_DLIB_ROOT/device_support/f28004x/common/source/f28004x_usdelay.asm</locationURI>
</link>
</linkedResources>
<variableList>
<variable>
<name>C2000WARE_DLIB_ROOT</name>
<value>$%7BCOM_TI_C2000WARE_SOFTWARE_PACKAGE_INSTALL_DIR%7D/driverlib/f28004x/driverlib</value>
</variable>
</variableList>
</projectDescription>
4 changes: 4 additions & 0 deletions els-f280049c/.settings/com.ti.ccstudio.project.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ccsVersionValidationPolicy=warning
compilerVersionValidationPolicy=flexible
eclipse.preferences.version=1
productVersionsValidationPolicy=flexible