d9c8072037
Edit PROPORTIONAL_FONT_RATIO comment
8 years ago
46b32e4548
Cleanup LCD interface, add lcd_reset_status
8 years ago
ca99d67ede
Fix UBL "Info screen" menu items
8 years ago
2c7a39bc0e
Fix LCD print aborted message
8 years ago
0f1e8c195d
Draw on LCD after value has changed
8 years ago
51587c4b43
Rename Feedrate to Velocity to match prior naming
8 years ago
9677f3f2f5
Patch up LCD Bed Leveling menu
8 years ago
fc2eaab7f3
Show home option in level bed menu
8 years ago
c6a7adc293
Patch G29 A and Q arguments to bypass setup
8 years ago
4cece2d72e
Use NAN for G29 W omitted parameters
8 years ago
2d71569138
Fix spacing in JSON output
8 years ago
b2d3c8aedd
Have G28 do a refresh of the display
8 years ago
50ab9c2e04
General cleanup of spacing, comments
8 years ago
f1e33afda4
Return to Bed Leveling menu when done
8 years ago
78d8c598e1
Fix lcd_synchronize with message
8 years ago
eb39d6e3e2
Don't draw progress bar until it has 1%
8 years ago
194f8b2f55
Start at Z=0 in manual probing
8 years ago
6f89db11f0
Allow lcd_setstatusPGM to reset the alert level
8 years ago
3fe333143c
Case light as a toggle menu item
8 years ago
d013bddfa8
Merge pull request #6876 from thinkyhead/bf_extend_leveling_menu
...
Extend the ABL/MBL Bed Leveling menu
8 years ago
01e7e234c6
Add more options to the Bed Leveling menu
8 years ago
0cbe448edf
Split up Control > Motion submenu
8 years ago
a3645ec921
Reference op with variable name
8 years ago
71367fd518
Scrolling status message option
8 years ago
b0eae68f57
Prevent bed temperature being set too high
8 years ago
493f0b0c62
Fix some compiler warnings
8 years ago
f379a326cc
enable DEACTIVATE_SERVOS_AFTER_MOVE with switching nozzle
...
When using switching nozzle it should be possible to disable the servo after move. Do it only if you do not need the servo power to keep the position.
8 years ago
33279a1e02
Code style tweak to gcode.h
8 years ago
ac959b12ee
Updates to language_es.h based on latest updates. ( #6871 )
...
Spanish language updates
8 years ago
55c700d537
Tweak to gcode.h
8 years ago
868e7db4ae
value check was looking at the code
8 years ago
fb5e0ffe16
Unify M600 and M125 pause features ( #6407 )
...
* Unify M600 and M125 pause features
* Cleanup per thinkyhead's comments
* Rename filament_change_menu_response to advanced_pause_menu_response
* Include HAS_BED_PROBE in QUIET_PROBING
* Update gMax example file
* is_idle() is out of scope without the braces
* Convert FT-i3-2020 to Advance Pause names...
* Allow pause even if not printing
8 years ago
b3a97b5013
Patch up LCD level bed menus
8 years ago
78af2b1444
Fix PROBE_MANUALLY via G-code
8 years ago
082da23391
One fewer EOL in M503 output
8 years ago
b15e531464
Fix screen change on character display
8 years ago
44e657766e
Add incompatibility error to Sanity Check for MIXING_EXTRUDER and LIN_ADVANCE
8 years ago
735405b2a4
Merge pull request #6848 from thinkyhead/bf_scara_M665
...
Add M665 for SCARA
8 years ago
ffa901f373
Merge pull request #6839 from thinkyhead/bf_day_ending_in_y
...
UBL ultralcd.cpp patches
8 years ago
361cbba113
Use M665 to set SCARA angle offsets
8 years ago
5ed63a5724
Apply const in prepare_kinematic_move_to
8 years ago
5cbe0244c5
Fixes for spindle/laser and SCARA probe bounds
8 years ago
1f52c9f5df
Neater Megatronics 3 pins
8 years ago
af81cb4cbb
Patch for M503 output
8 years ago
1d167a6874
Some cleanup, fixes for ultralcd.cpp UBL code
...
- Free up 30 bytes of SRAM in UBL LCD code
- Fix BUILD_ABS_MESH temperature
- Fix UBL indentation in ultralcd.cpp
- UBL vars lowercase, "convert to positive" sensibly
8 years ago
f4028fe088
New GCode Parser - Implementation
8 years ago
002a06c507
New GCode Parser - Configuration
8 years ago
ad915b667e
One more mesh_index_to_npos update
...
Followup to #6827
8 years ago
2881f0a48d
Fix, extend G42 with P (probe) parameter
...
- Also fix handling of SCARA and misuse of `codenum`.
8 years ago
d252d1b6a2
Merge pull request #6831 from thinkyhead/bf_move_g7
...
Move G7 to G42
8 years ago
82ca6248e2
Move G7 to G42
...
See: #6777
8 years ago
26ffa558a3
Use redraw flag for both types of LCD
8 years ago
3ff7515527
Merge pull request #6817 from cbusillo/patch-1
...
missing enable for M605 for duplication mode
8 years ago
34cfbc90cd
Use new attribute macros in more places
8 years ago
85b967657e
Embed G26/G29 in ubl class, with enhancements
8 years ago
c99bd69889
Apply const float & more
8 years ago
ad5638f78c
Cleanup some fastio code
8 years ago
e271521c39
Single user_canceled function in G26
8 years ago
c2ea22da49
Clean up whitespace
8 years ago
ceb62fc7e1
Fixes #6828 : M428 bug
8 years ago
48f7652143
UBL G29 -P3.1 smart fill ( #6823 )
...
* UBL G29 -P3.1 mesh fill with distance-weighted least squares fit.
* Back to original -O0 on G29 for now.
8 years ago
850203fb3a
Merge pull request #6816 from thinkyhead/bf_lcd_live_editing
...
Constrain LCD status message rendering
8 years ago
3129260c44
Misc. Clean Up ( #6822 )
...
* Misc. Clean Up
Mostly UBL related clean up.
- But fixed a bug in the thermistortables.
- Made G26 more responsive to user aborts.
- Added sanity checks for older name for UBL_MESH_VALIDATION.
- Made G29 P4 able to edit invalidated mesh points
- Restore a reasonable Fade Height for UBL when creating new state information
- Get UBL's Topology Map to look a little bit better
- Make sure the user doesn't see a blank screen when doing Mesh Editing.
* Huh??? GitHub Desktop screwed up!
* get the planner object in scope
* Fix out of scope z_fade_height
* Travis timed out...
I need a change so I can force a new commit and sync.
8 years ago
3b4116e73b
missing enable for M605 for duplication mode
...
I believe gcode_M605 will not be called when using DUAL_NOZZLE_DUPLICATION_MODE without this change.
8 years ago
5e8892d6b5
Show Restore Failsafe item with EEPROM off
8 years ago
76af9ac7c5
tweaks
8 years ago
ba5910ab6c
Constrain LCD status message rendering
8 years ago
2c309a8f7c
Fix set_lcd_contrast
8 years ago
22dbb2117c
Merge pull request #6812 from thinkyhead/bf_day_ending_in_y
...
Cleanup code, organize & document fastio pin mappings
8 years ago
364f8fb613
Update Configuration.h files to better names ( #6814 )
...
Changed UBL_G26_MESH_EDITING to UBL_G26_MESH_VALIDATION
Added UBL_MESH_EDIT_MOVES_Z to prepare for that change (coming next)
8 years ago
d7fda2fe49
Formatting, const in G33
8 years ago
1519b0e7c1
Split up fastio.h, document pin mappings
8 years ago
49599caade
General cleanup to utf_mapper.h
8 years ago
02f15f6775
UBL-related cleanup, spacing, standards
...
Reference: #6804
8 years ago
52e20aeab3
Pins-related cleanup, formatting
8 years ago
ea906e4da7
Merge pull request #6810 from thinkyhead/bf_lcd_live_editing
...
Add "live editing" option to LCD menus
8 years ago
11fc9564c9
Add live editing option to LCD menu
8 years ago
8a0a5cfccc
Temp-related cosmetic changes
8 years ago
b29dbbd5e4
Use uint16_t for temps
8 years ago
ebcd1aaf88
Access hotend/bed temperatures as float
8 years ago
6ce2b1ff4a
G33 evolutionary changes
8 years ago
3c061a9f9a
UBL tabs, whitespace, spelling, etc.
8 years ago
75badae2f8
Disable PROBE_MANUALLY for UBL
...
Plus some other UBL tweaks.
8 years ago
94a4af1d7f
Merge pull request #6773 from thinkyhead/bf_lcd_patch_e5
...
Patch LCD code for 5th extruder
8 years ago
01f452c37c
Tweak Azteeg X3 PRO _pins.h so Viki2 will work for those without a case light.
...
- add comment explaining that the Panucatt Viki2 wiring diagram uses pin 44
8 years ago
e09b4ce4a5
Add checking
8 years ago
13599a73c7
Add `G7` gcode command to move between UBL mesh points
...
- can be augmented in the future to enable for other leveling systems
Quite simple, but did not want to modify `G1` as the additional checking would slow it down.
Tested & working.
8 years ago
43c24f0027
Fix recent regressions, &c.
...
- fix broken `M421` due to less-than-careful optimization
- add HOME_AFTER_DEACTIVATE define to advanced config so not everyone has to rehome after steppers are deactivated
- misc. cleanups (remove unused label, unused variables)
8 years ago
3843a5151a
Patch LCD code for 5th extruder, EEPROM reset
8 years ago
6c064bb7d6
Some probe_pt error-handling
8 years ago
3370329751
Fix broken EEPROM save/load
8 years ago
f0fe26c411
Ensure Arduino.h and configs are included for serial.cpp
8 years ago
ffb5353294
Merge pull request #6738 from thinkyhead/bf_config_crc_rebase
...
Implement CRC16, develop mesh allocation table
8 years ago
e806e6419a
Merge pull request #6768 from thinkyhead/rc_spindle_m3_m5
...
Spindle / Laser support
8 years ago
d6f49c6626
Merge pull request #6752 from jdelahayes/bugfix-1.1.x
...
Update french language
8 years ago
55a87da036
SPINDLE/LASER implementation
8 years ago
ffe0e2d19a
SPINDLE/LASER pins changes
8 years ago
99c4900a98
SPINDLE/LASER config changes
8 years ago
a3abfeac47
Mark strings needing translation
8 years ago
7f4e4b1212
UBL name/state methods
8 years ago
7852369987
Implement CRC16, develop mesh allocation table
...
- Add crc16 utility function
- Implement CRC16 for config store, remove old checksum, increment layout version
- Move UBL mesh store/load to MarlinSettings; increment UBL_VERSION
- Begin to lay out MAT structure, prototype functions, etc.
- Rename ubl.state.eeprom_storage_slot to .storage_slot
- Misc. optimization
- Cleanup/standardize/improve some messages
This is a work in progress!
8 years ago
00d358d92d
Fix a PROBE_MANUALLY bug in ultralcd.cpp
8 years ago
c2321b1cdd
Separate SWITCHING_NOZZLE and SWITCHING_EXTRUDER
8 years ago
238fb53617
Patch home_all_axes to ignore G28 XYZ parameters
8 years ago
6b6630e11b
Clean up trailing whitespace and tabs
8 years ago
d30e478f97
Fix incorrectly optimized find_closest_mesh_point_of_type() function ( #6761 )
8 years ago
5a9e52a3e0
Use COPY_XYZE macro to copy exactly 4 elements ( #6758 )
...
Fix undefined DELTA_PROBEABLE_RADIUS for UBL_DELTA
8 years ago
8606644343
M48 Fix for Delta Configuration Files & UBL G29 only homes when necessary ( #6757 )
...
* Fix M48 for Delta's There was a scope issue: DELTA_PROBEABLE_RADIUS wasn't getting defined.
* Check if the specified G29 command requires homing
8 years ago
0cd398c25d
UBL Menu Updates ( #6751 )
...
Things should be pretty stable for a while.
But it wouldn't surprise me if the Delta people have a need for a few special commands.
8 years ago
a5737cba7c
Update french language
8 years ago
0fef9a2983
Remove "ubl." prefix from calls within ubl method
8 years ago
14a4257c7b
UBL tabs, whitespace, spelling, etc.
8 years ago
56e2e331ed
UBL G29: replace 'O' with 'T'
...
Since we already used 'T' for `G29` Topology Report in the past, and since 'T' is available…
8 years ago
091f94a6bf
Fix up M421 and some comments
8 years ago
4ec4ecff1a
Reduce find_closest_mesh_point_of_type a little
8 years ago
f1a1c6873e
Patch lcd_implementation_status_screen compiler warning
8 years ago
2266c0780d
fixed spanish lang
...
It was missing MSG_FILAMENT_CHANGE_HEAT_2 and MSG_FILAMENT_CHANGE_HEATING_2
8 years ago
b213a45efb
UBL_DELTA post merge cleanup ( #6705 )
...
* UBL_DELTA post merge cleanup:
fix fade_height, lost during some previous merge
fix float cx,cy which are not const
move repeated z_cxcy calc line inside loop
style fixes and comment fixes/alignment
* Update ubl_motion.cpp
remove unnecessary parentheses
* Update Conditionals_post.h
Change name of define to more accurate meaning:
UBL_GRANULAR_SEGMENTATION_FOR_CARTESIAN
which is not and should not be the default for cartesians with UBL.
8 years ago
6f86c46fa6
Fix typo that caused scope issues for DELTA ( #6750 )
8 years ago
1fbcbc05f6
UBL no longer flout's the sacred GCode standard ( #6745 )
...
Also clean up ubl_motion.cpp debug info and fix declaration of cx & cy
8 years ago
c262ea92e0
Merge pull request #6733 from abusca/Euskera
...
Updated Basque translation
8 years ago
267f77b18b
More constraint on axis_unhomed_error
8 years ago
645096b87a
Updated Basque translation
...
Updated Basque translation with new strings.
8 years ago
40d95a4e23
Update the gMax files to display better with Proportional Fonts ( #6727 )
...
Update the gMax files to display better with Proportional Fonts
8 years ago
c06af63f87
G26's default behaviour ought to be the entire mesh ( #6726 )
...
Adding the capability to specify ahead of time how much of the validation pattern to print made it so by default G26 only did one circle and no connecting lines.
It is more natural for the unsophisticated user to just do the entire mesh (bed). We default the repetition count to GRID_MAX_POINTS+1 to insure we get every last one of them!
8 years ago
15040821e0
Setup FolgerTech-i3-2020 files better for the user ( #6724 )
...
UltiPanel was enabled, but technically, it is a REPRAP_DISCOUNT_SMART_CONTROLLER
Either configuration works on the machine. But we want it 'Right'.
Setup the Proportional Font spacing so columns line up nicer on PronterFace and Repetier Host.
8 years ago
67c9b1e332
Update M665 comment, fix M665 code_value code.
8 years ago
37399e3cb5
Fix prepare_move_to_destination_cartesian for UBL
8 years ago
a7fb55ea6d
Use GRID_MAX_POINTS. Some formatting
8 years ago
e51b5774db
Merge pull request #6699 from mtowara/patch-1
...
Bugfix PRINTER_EVENT_LEDS
8 years ago
056350d9bf
Merge pull request #6656 from FHeilmann/fix_fwretract_pos_z_move
...
Fix FWRetract with positive z-moves during retracted state
8 years ago
0e582bcfb7
Fix #6691 - redundant line in M665
8 years ago
68ae7c8d7a
Bugfix PRINTER_EVENT_LEDS
...
Extra closing curly bracket terminates while loop early if PRINTER_EVENT_LEDS defined
8 years ago
ba29da56e0
Add disclaimer for verboten parameters
8 years ago
0696dda470
Cleanups to UBL_DELTA
8 years ago
cbfca29522
M421 tweaks, just to use const
8 years ago
233f824dd6
Define GRID_MAX_POINTS
8 years ago
b17e2d3dcd
Apply const in Marlin_main.cpp
8 years ago
92fbea2906
Add some GCodes to the header of Marlin_main.cpp
8 years ago
94e90ca26c
Tweak M80/M81 descriptions
8 years ago
ee50dfaaf3
Adjust G26 arguments
8 years ago
b0ba5cae73
Fix a spelling boo
8 years ago
91841d75c9
UBL_DELTA ( #6695 )
...
UBL on Delta's.... Should be close! Should not affect any Cartesian printer.
8 years ago
445003dbb8
Merge pull request #6694 from bgort/g29p2b
...
UBL: Minor improvement to G29 P2
8 years ago
5a5dba6fc8
UBL: Minor improvement to G29 P2
...
- allow H code value to override probing height
- minor cleanups
8 years ago
ae676490c9
M421: Add 'adjust closest point' capability
...
- Split M421 into separate versions for bilinear and ubl
- Fix minor issue in G26
8 years ago
9a688d1456
Merge pull request #6682 from thinkyhead/bf_M80_s_arg
...
"M80 S" to report the state of the PSU pin
8 years ago
b63e82f309
M421 Mesh Point Offset and misc. UBL clean up ( #6685 )
...
* M421 Mesh Point Offset and misc. UBL clean up
Allow M421 to accept an offset as well as absolute value for a specified
mesh point.
And misc. UBL clean up to reduce redundent code.
* Better error checking for M421
* Fix M421 Y index bug
I just noticed.... We've had a Y index bug for who knows how long?
8 years ago
539e0c2f31
"M80 S" to report the state of the PSU pin
8 years ago
df42428281
Merge pull request #6665 from bgort/font
...
Add proportional font adjustment ratio
8 years ago
2604742191
Add proportional font adjustment ratio
...
- update example configs
8 years ago
b3407a371b
Merge pull request #6676 from bgort/g26zhop
...
G26: Add 0.5mm Z-bump between circles to minimize pattern scraping
8 years ago
c33d99c5b2
Merge pull request #6680 from bgort/g26repeat
...
G26: Add 'Repeat' Option
8 years ago
7325035aac
Merge pull request #6637 from Tannoo/UBL_Menu_System_1.1
...
UBL Menu System 1.1
8 years ago
f7a201b0d0
G26: Add 'Repeat' Option
...
- Allows for specifying number of points to print/validate, using 'R' code like with G29 P4 Rx
- Moved the code for Random to 'M' so we could be consistent with G29 P4
- G26 instructions indenting/cleanup
8 years ago
9c5957fc77
G26: Add 0.5mm Z-bump between circles to minimize pattern scraping
8 years ago
4da14b14f4
UBL Cleanup/Bugfix
...
- Fix bug in ubl_line_to_destination
- Improve/fix output of some ubl.h functions
8 years ago
66db6c3acc
UBL Menu System 1.1
...
/**
* UBL System submenu
*
* Prepare
* - Unified Bed Leveling
* - Activate UBL
* - Deactivate UBL
* - Mesh Storage
* Memory Slot:
* Load Bed Mesh
* Save Bed Mesh
* - Output Map
* Map Type:
* Output Bed Mesh Host / Output Bed Mesh CSV
* - UBL Tools
* - Build Mesh
* Build PLA Mesh
* Build ABS Mesh
* - Build Custom Mesh
* Hotend Temp:
* Bed Temp:
* Build Custom Mesh
* Info Screen
* - Build Cold Mesh
* - Fill-in Mesh
* Fill-in Mesh
* Smart Fill-in
* Manual Fill-in
* Info Screen
* Continue Bed Mesh
* Invalidate All
* Invalidate Closest
* - Validate Mesh
* PLA Mesh Validation
* ABS Mesh Validation
* - Custom Mesh Validation
* Hotend Temp:
* Bed Temp:
* Validate Mesh
* Info Screen
* - Edit Mesh
* Fine Tune All
* Fine Tune Closest
* - Adjust Mesh Height
* Height Amount:
* Adjust Mesh Height
* Info Screen
* - Mesh Leveling
* 3-Point Mesh Leveling
* - Grid Mesh Leveling
* Side points:
* Level Mesh
* Info Screen
* - Output UBL Info
*/
8 years ago
3b0127cf8e
Fix compiler complaint related to M100
8 years ago
11104f177b
Apply const in BABYSTEPPING
8 years ago
081bf1f879
Patch #else / #endif comments
8 years ago
a9487c9443
Reduce redundancy in BLTOUCH conditionals
8 years ago
8d961b51cc
Eliminate M100 compiler warnings?
8 years ago
efb9ce24d9
Merge pull request #6645 from tcm0116/bltouch_config
...
Automatically define Z_MIN_PROBE_ENDSTOP_INVERTING for BLTouch
8 years ago
e2f07917ab
Merge pull request #6644 from tcm0116/bltouch_menu
...
Move BLTouch LCD menu from Main to Main/Control
8 years ago
fe96376a73
Fix FWRetract with positive z-moves during retracted state
8 years ago
47cae2929f
Patch platformio.ini to fix build error in DevIoT
...
For compatibility with DevIoT, until that can be solved.
8 years ago
911a87e006
Disable SCARA feedrate scaling by default
8 years ago
71396f77d3
Cleanups following recent commits
8 years ago
dca48f0e63
Move platformio.ini back to Marlin folder - it works there
8 years ago
a6dafb058e
Small reduction in error code size
8 years ago
a1e04942a2
Cleanup to software PWM variables
8 years ago
a20d0794e6
Automatically define Z_MIN_PROBE_ENDSTOP_INVERTING for BLTouch
8 years ago
3279337f47
Move BLTouch LCD menu from Main to Main/Control
8 years ago
6cb0fa4128
Cleanup previous implementation of new quiet probing
...
Saves a few lines of code.
8 years ago
4b7f8ad9c6
Merge pull request #6610 from bgort/pio-improvements2
...
PlatformIO-related changes
8 years ago
56ca47ab9d
Patch configuration temp units
8 years ago
421dd62800
Adjust spacing of "spaces"
8 years ago
26dba44cd3
Patch redundant lcd settings
8 years ago
34b5041576
Spacing adjustment, ubl_G29
8 years ago
1c4ed8b106
Note 5 extruders in config comments
8 years ago
6e4a5cc8c6
Patch missing const in temp_abs
8 years ago
d35e2fda10
Merge pull request #6622 from bgort/silentprobing
...
Improve BLTOUCH_HEATERS_OFF functionality
8 years ago
6ed52fb765
Adjust spacing in LSF
8 years ago
110afff415
More misc UBL fixes and update gMax examples ( #6632 )
...
I think I forgot to Sync before I committed last time. Some UBL
changes did not stick.
Also, update the gMax configuaration.h file so other than unique numbers
and settings, it exactly matches the default configuration.h file.
8 years ago
d92fa40c62
misc. UBL fixes ( #6631 )
...
* Restore LSF functionality
Some of the typo's persisted... Hopefully this gets them all fixed.
* Restore user's expectations of how G28 should behave
* Allow Nozzle size control with ornery host programs
8 years ago
faa270071d
Improve BLTOUCH_HEATERS_OFF functionality
...
- rename to PROBING_HEATERS_OFF
- move heater pausing functionality into thermalManager
- add variables, pause(), ispaused(), other functions
- add fan pausing functionality -> PROBING_FANS_OFF
- add probing_pause() wrapper
- move pausing into do_homing_move() and do_probe_move() to minimize quiet time and so other probe types can benefit
- example configs
8 years ago
d66e9efac5
G29 P1 stops reporting Invalid location with this patch
8 years ago
ce507deb9f
Support temperature units in M503
8 years ago
a59066bca9
Various improvements - mostly UBL-related ( #6607 )
...
UBL Clean up.
8 years ago
0446dd3ad8
PlatformIO-related changes
...
- move platformio.ini out of source directory to be more consistent with 'normal' PlatformIO usage
- facilitates IDE integration
- add related .gitignores
8 years ago
77769e284f
Edit configuration comments
8 years ago
6876e79d42
Tweak command index increment
8 years ago
7fcb5c1424
Minor fix in K8200 readme
8 years ago
267f3a03d9
Fixed USE_CONTROLLER_FAN #define usage
8 years ago
ae7c602031
fix error in M105 output -- use SERIAL_PROTOCOL for ints instead of SERIAL_PROTOCOL_F ( #6584 )
...
also removed wayward 'address of' ampersand in setTargetHotend and setTargetBed parameters
8 years ago
3cd9af2409
bugfix-1.1.x ReadMe, Version, helper scripts
8 years ago
15268770f5
Fix broken fwretract recovery extruder feedrate
...
When both lowering and recovery are performed using the same "prepare_move_to_destination()" the extruder recovery feedrate ends up being ignored and, instead, is only capped by either the maximum e-speed or the time it takes to perform the z-lowering.
Performing the two moves separately from each other ensures a correct recovery feedrate.
8 years ago
58210c3a19
Merge pull request #6568 from thinkyhead/rc_bilinear_extension
...
Add EXTRAPOLATE_BEYOND_GRID option to bilinear leveling
8 years ago
da08e11acd
Add EXTRAPOLATE_BEYOND_GRID option to bilinear leveling
8 years ago
Scott Lahteine