Skip to content

Commit

Permalink
Merge pull request #12 from tgolla/TouchscreenV2
Browse files Browse the repository at this point in the history
Touchscreen v2 merge into Master
  • Loading branch information
tgolla authored Jan 8, 2024
2 parents 121b92c + 6309150 commit ff2ef20
Show file tree
Hide file tree
Showing 5 changed files with 5,190 additions and 10 deletions.
14 changes: 7 additions & 7 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,29 +41,29 @@
],
"intelliSenseMode": "gcc-x64",
"includePath": [
"C:\\Users\\tgoll\\AppData\\Local\\Arduino15\\packages\\arduino\\hardware\\avr\\1.8.5\\cores\\arduino",
"C:\\Users\\tgoll\\AppData\\Local\\Arduino15\\packages\\arduino\\hardware\\avr\\1.8.5\\variants\\mega",
"C:\\Users\\tgoll\\AppData\\Local\\Arduino15\\packages\\arduino\\hardware\\avr\\1.8.6\\cores\\arduino",
"C:\\Users\\tgoll\\AppData\\Local\\Arduino15\\packages\\arduino\\hardware\\avr\\1.8.6\\variants\\mega",
"D:\\Users\\tgoll\\OneDrive - Cimarron Ravine, L.L.C\\Documents\\Arduino\\libraries\\Adafruit_Motor_Shield_V2_Library",
"C:\\Users\\tgoll\\AppData\\Local\\Arduino15\\packages\\arduino\\hardware\\avr\\1.8.5\\libraries\\Wire\\src",
"D:\\Users\\tgoll\\OneDrive - Cimarron Ravine, L.L.C\\Documents\\Arduino\\libraries\\Adafruit_BusIO",
"C:\\Users\\tgoll\\AppData\\Local\\Arduino15\\packages\\arduino\\hardware\\avr\\1.8.6\\libraries\\Wire\\src",
"D:\\Users\\tgoll\\OneDrive - Cimarron Ravine, L.L.C\\Documents\\Arduino\\libraries\\GCodeParser\\src",
"D:\\Users\\tgoll\\OneDrive - Cimarron Ravine, L.L.C\\Documents\\Arduino\\libraries\\EEPROMTyped\\src",
"C:\\Users\\tgoll\\AppData\\Local\\Arduino15\\packages\\arduino\\hardware\\avr\\1.8.5\\libraries\\EEPROM\\src",
"C:\\Users\\tgoll\\AppData\\Local\\Arduino15\\packages\\arduino\\hardware\\avr\\1.8.5\\libraries\\SPI\\src",
"C:\\Users\\tgoll\\AppData\\Local\\Arduino15\\packages\\arduino\\hardware\\avr\\1.8.6\\libraries\\EEPROM\\src",
"C:\\Users\\tgoll\\AppData\\Local\\Arduino15\\packages\\arduino\\hardware\\avr\\1.8.6\\libraries\\SPI\\src",
"D:\\Users\\tgoll\\OneDrive - Cimarron Ravine, L.L.C\\Documents\\Arduino\\libraries\\Adafruit_GFX_Library",
"D:\\Users\\tgoll\\OneDrive - Cimarron Ravine, L.L.C\\Documents\\Arduino\\libraries\\Adafruit_ILI9341",
"D:\\Users\\tgoll\\OneDrive - Cimarron Ravine, L.L.C\\Documents\\Arduino\\libraries\\SdFat_-_Adafruit_Fork\\src",
"D:\\Users\\tgoll\\OneDrive - Cimarron Ravine, L.L.C\\Documents\\Arduino\\libraries\\Adafruit_FT6206_Library",
"D:\\Users\\tgoll\\OneDrive - Cimarron Ravine, L.L.C\\Documents\\Arduino\\libraries\\Adafruit_ImageReader_Library",
"D:\\Users\\tgoll\\OneDrive - Cimarron Ravine, L.L.C\\Documents\\Arduino\\libraries\\Adafruit_SPIFlash\\src",
"D:\\Users\\tgoll\\OneDrive - Cimarron Ravine, L.L.C\\Documents\\Arduino\\libraries\\Adafruit_TiCoServo",
"D:\\Users\\tgoll\\OneDrive - Cimarron Ravine, L.L.C\\Documents\\Arduino\\libraries\\Adafruit_BusIO",
"D:\\Users\\tgoll\\OneDrive - Cimarron Ravine, L.L.C\\Documents\\Arduino\\libraries\\Adafruit_EPD\\src",
"c:\\users\\tgoll\\appdata\\local\\arduino15\\packages\\arduino\\tools\\avr-gcc\\7.3.0-atmel3.6.1-arduino7\\lib\\gcc\\avr\\7.3.0\\include",
"c:\\users\\tgoll\\appdata\\local\\arduino15\\packages\\arduino\\tools\\avr-gcc\\7.3.0-atmel3.6.1-arduino7\\lib\\gcc\\avr\\7.3.0\\include-fixed",
"c:\\users\\tgoll\\appdata\\local\\arduino15\\packages\\arduino\\tools\\avr-gcc\\7.3.0-atmel3.6.1-arduino7\\avr\\include"
],
"forcedInclude": [
"C:\\Users\\tgoll\\AppData\\Local\\Arduino15\\packages\\arduino\\hardware\\avr\\1.8.5\\cores\\arduino\\Arduino.h"
"C:\\Users\\tgoll\\AppData\\Local\\Arduino15\\packages\\arduino\\hardware\\avr\\1.8.6\\cores\\arduino\\Arduino.h"
],
"cStandard": "c11",
"cppStandard": "c++11",
Expand Down
7 changes: 5 additions & 2 deletions Documentation/Configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,18 @@ You will need to set the ```DEFAULT_PEN_DOWN_POSITION``` directive. This is the
11. Determine the ```DEFAULT_PEN_DOWN_POSITION``` setting by placing a pen in the holder, mounting different objects and using M300 commands to adjust the pen such that it sets on the object with some tension in the pen spring arm.
12. Once you complete the pen calibrations reload the SphereBot software on to your Arduino.


## SAVED_EEPROM_BASE_MEMORY_LOCATION
The base memory location in EEPROM where configurayion settings are saved. You should only alter this if you suspect a faulty EEPROM byte. The default setting is 0.

## ADAFRUIT_TFT_TOUCH_SHIELD
With the release of v2.0 you now have the option of adding an Adafruit 2.8" TFT Touch Shield for Arduino w/Capacitive Touch. The shield adds a 320x240 capacitive touchscreen and SD card reader allowing your SphereBot to either accept g-gode files in the original manner through a USB connection with a PC or to directlt select files from an SD card.
With the release of v2.0 you now have the option of adding an Adafruit 2.8" TFT Touch Shield for Arduino w/Capacitive Touch. The shield adds a 320x240 capacitive touchscreen and SD card reader allowing your SphereBot to either accept g-gode files in the original manner through a USB connection with a PC or to directly select files from an SD card.

The ```ADAFRUIT_TFT_TOUCH_SHIELD``` directive sets a boolean true/false value. When set to false the code compiles for the original configuration of an Arduino Uno and Adafruit motor shield. When set to true the code compiles to use the TFT touch shield with the orginal configuration.

Note: A Mega 2560 is required due to the memory requirements of version 2.0 compiled with the ```ADAFRUIT_TFT_TOUCH_SHIELD``` directive set to true. Because the TFT touch shield screen uses digital pins 9 & 10 you will not be able to use one of the two 3-pin servo headers provided on the motor shield. Instead you will need to solder a 3-pin right-angle male header to the motor shield breakout area connecting pin 1 to ground, pin 2 to +5v and pin 3 to digital pin 6. On the TFT touch shield you will also need to cut the traces between 11-13 and solder bridge the ICSP pins for the board to work with the Mega 2560 board. REf: https://learn.adafruit.com/adafruit-2-8-tft-touch-shield-v2/connecting#using-with-a-mega-slash-leonardo

Note: As of at least version 1.9.5 the ```M999``` directive must be set to false if you are compiling the orginal version of the code for an Arduino Uno. Failing to do so will cause the global variables to utilize at least 92% of dynamic memory causing the code to be unstable.

## TFT_CS
The ```TFT_CS``` directive sets the Adafruit 2.8" TFT Touch Shield for Arduino w/Capacitive Touch chip select pin number. The default setting is 10.

Expand Down Expand Up @@ -204,6 +205,8 @@ The ```DEFAULT_Z_ADJUST_PRESET``` directive sets the Z Adjust preset. In serial
## M999
The ```M999``` directive sets a boolean true/false value with the default setting of true. The directive determines if the M999 display Mxxx command values command is included in the compile. This directive was add as a safety measure for development as the code is memory intensive with respect to both sketch (program storage) and global variables (dynamic memory) especially on the Arduino Uno.

Note: As of at least version 1.9.5 the ```M999``` directive must be set to false if you are compiling the orginal version of the code for an Arduino Uno. Failing to do so will cause the global variables to utilize at least 92% of dynamic memory causing the code to be unstable.

## MIN_PEN_AXIS_STEP
The ```MIN_PEN_AXIS_STEP```directive sets the pens minimun X axis movement from center. The default setting is -480. The X axis gets clamped to these values to prevent inadvertent damage. Most drawings are 800 (-400 and 400) by 3200.

Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@ This code release works with the original hardware configuration (Arduino & moto

Also addressed is a MAJOR bug fix in the arc drawing function. Previous code used the current x,y location stored in the stepper motor control code which was rounded to it's integer value while g-code values are represented with 6 decimal places (doubles). At times this would cause the start angle of the arc to be greater than ending angle, which resulted in the drawing of a full circle and not a partial arc.

The version 1.9.5 prerelease is missing the follow features.
The version 1.9.51 prerelease is missing the follow features.

- Version 2.0 release setup notes/documentation.
- A completed comprehensive mechanical assembly document.
- InkScape documentation stepping through creating gcode with the gcodetools along with using some of new the advanced Mxxx commands.

Please click the "Watch" button so you get notification on issues, discussions and pull request in GitHub. If you find a bug, please open an issue. If you have a question or comment please start a discussion. If you like what you see click the "Star" button. And please return in the future to see our progress.

### Forking (Please Don't)

Please do not fork this code just to have a copy unless you plan on making meaningful contributions which could be merged back in as GitHub forks are overused, abused, and misused. Forks are not meant to be used to keep a copy of the code in your personal repository. More information on the proper use of forks can be found at…
Expand Down
Loading

0 comments on commit ff2ef20

Please sign in to comment.