Skip to content

Commit

Permalink
Add optional config for more thread specs, default thread/feed on start
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnsonm
johnsonm committed Apr 13, 2023
1 parent 509486b commit 0dda30a
Show file tree
Hide file tree
Showing 2 changed files with 167 additions and 58 deletions.
30 changes: 30 additions & 0 deletions els-f280049c/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,36 @@



//================================================================================
// DEFAULTS
//
// Choose initial startup values to values close to what you typically use,
// to reduce scrolling through values you seldom need, and choose the sets
// of values you wish to include. The extended sets of threads give you more
// values, but also make you click "up" and "down" more to get to the thread
// you want. See the definitions in Table.cpp
//================================================================================
//#define EXTENDED_INCH_THREADS
//#define EXTENDED_METRIC_THREADS

#ifdef EXTENDED_INCH_THREADS
#define INITIAL_INCH_THREAD_INDEX 23 // 24TPI
#else
#define INITIAL_INCH_THREAD_INDEX 12 // 24TPI
#endif
#ifdef EXTENDED_METRIC_THREADS
#define INITIAL_METRIC_THREAD_INDEX 10 // 0.5mm
#else
#define INITIAL_METRIC_THREAD_INDEX 6 // 0.5mm
#endif


#define INITIAL_INCH_FEED_INDEX 4
#define INITIAL_METRIC_FEED_INDEX 4





//================================================================================
// CALCULATIONS
Expand Down
195 changes: 137 additions & 58 deletions els-f280049c/Tables.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,45 +31,76 @@
// INCH THREAD DEFINITIONS
//
// Each row in the table defines a standard imperial thread, with the display data,
// LED indicator states and gear ratio fraction to use.
// LED indicator states and gear ratio fraction to use. The units for TPI_FRACTION
// are threads per 100 inches.
//
#if defined(LEADSCREW_TPI)
#define TPI_NUMERATOR(tpi) ((Uint64)LEADSCREW_TPI*STEPPER_RESOLUTION*STEPPER_MICROSTEPS*10)
#define TPI_NUMERATOR(tpi) ((Uint64)LEADSCREW_TPI*STEPPER_RESOLUTION*STEPPER_MICROSTEPS*100)
#define TPI_DENOMINATOR(tpi) ((Uint64)tpi*ENCODER_RESOLUTION)
#endif
#if defined(LEADSCREW_HMM)
#define TPI_NUMERATOR(tpi) ((Uint64)254*100*STEPPER_RESOLUTION*STEPPER_MICROSTEPS)
#define TPI_NUMERATOR(tpi) ((Uint64)254*1000*STEPPER_RESOLUTION*STEPPER_MICROSTEPS)
#define TPI_DENOMINATOR(tpi) ((Uint64)tpi*ENCODER_RESOLUTION*LEADSCREW_HMM)
#endif
#define TPI_FRACTION(tpi) .numerator = TPI_NUMERATOR(tpi), .denominator = TPI_DENOMINATOR(tpi)

const FEED_THREAD inch_thread_table[] =
{
{ .display = {BLANK, BLANK, BLANK, EIGHT}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(80) },
{ .display = {BLANK, BLANK, BLANK, NINE}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(90) },
{ .display = {BLANK, BLANK, ONE, ZERO}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(100) },
{ .display = {BLANK, BLANK, ONE, ONE}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(110) },
{ .display = {BLANK, ONE, ONE|POINT,FIVE}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(115) },
{ .display = {BLANK, BLANK, ONE, TWO}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(120) },
{ .display = {BLANK, BLANK, ONE, THREE}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(130) },
{ .display = {BLANK, BLANK, ONE, FOUR}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(140) },
{ .display = {BLANK, BLANK, ONE, SIX}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(160) },
{ .display = {BLANK, BLANK, ONE, EIGHT}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(180) },
{ .display = {BLANK, BLANK, ONE, NINE}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(190) },
{ .display = {BLANK, BLANK, TWO, ZERO}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(200) },
{ .display = {BLANK, BLANK, TWO, FOUR}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(240) },
{ .display = {BLANK, BLANK, TWO, SIX}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(260) },
{ .display = {BLANK, BLANK, TWO, SEVEN}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(270) },
{ .display = {BLANK, BLANK, TWO, EIGHT}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(280) },
{ .display = {BLANK, BLANK, THREE, TWO}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(320) },
{ .display = {BLANK, BLANK, THREE, SIX}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(360) },
{ .display = {BLANK, BLANK, FOUR, ZERO}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(400) },
{ .display = {BLANK, BLANK, FOUR, FOUR}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(440) },
{ .display = {BLANK, BLANK, FOUR, EIGHT}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(480) },
{ .display = {BLANK, BLANK, FIVE, SIX}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(560) },
{ .display = {BLANK, BLANK, SIX, FOUR}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(640) },
{ .display = {BLANK, BLANK, SEVEN, TWO}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(720) },
{ .display = {BLANK, BLANK, EIGHT, ZERO}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(800) },
#ifdef EXTENDED_INCH_THREADS
{ .display = {BLANK, FOUR, BLANK, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(400) },
{ .display = {BLANK, FOUR|POINT, FIVE, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(450) },
{ .display = {BLANK, FIVE, BLANK, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(500) },
{ .display = {BLANK, FIVE|POINT, FIVE, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(550) },
{ .display = {BLANK, FIVE|POINT, SEVEN, FIVE}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(575) },
{ .display = {BLANK, SIX, BLANK, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(600) },
{ .display = {BLANK, SIX|POINT, FIVE, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(650) },
{ .display = {BLANK, SEVEN, BLANK, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(700) },
#endif
{ .display = {BLANK, EIGHT, BLANK, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(800) },
{ .display = {BLANK, NINE, BLANK, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(900) },
#ifdef EXTENDED_INCH_THREADS
{ .display = {BLANK, NINE|POINT, FIVE, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(950) },
#endif
{ .display = {BLANK, ONE, ZERO, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(1000) },
{ .display = {BLANK, ONE, ONE, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(1100) },
{ .display = {BLANK, ONE, ONE|POINT, FIVE}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(1150) },
{ .display = {BLANK, ONE, TWO, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(1200) },
{ .display = {BLANK, ONE, THREE, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(1300) },
{ .display = {BLANK, ONE, FOUR, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(1400) },
{ .display = {BLANK, ONE, SIX, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(1600) },
{ .display = {BLANK, ONE, EIGHT, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(1800) },
{ .display = {BLANK, ONE, NINE, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(1900) },
{ .display = {BLANK, TWO, ZERO, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(2000) },
#ifdef EXTENDED_INCH_THREADS
{ .display = {BLANK, TWO, TWO, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(2200) },
{ .display = {BLANK, TWO, THREE, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(2300) },
#endif
{ .display = {BLANK, TWO, FOUR, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(2400) },
{ .display = {BLANK, TWO, SIX, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(2600) },
{ .display = {BLANK, TWO, SEVEN, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(2700) },
{ .display = {BLANK, TWO, EIGHT, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(2800) },
{ .display = {BLANK, THREE, TWO, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(3200) },
{ .display = {BLANK, THREE, SIX, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(3600) },
#ifdef EXTENDED_INCH_THREADS
{ .display = {BLANK, THREE, EIGHT, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(3800) },
#endif
{ .display = {BLANK, FOUR, ZERO, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(4000) },
{ .display = {BLANK, FOUR, FOUR, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(4400) },
#ifdef EXTENDED_INCH_THREADS
{ .display = {BLANK, FOUR, SIX, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(4600) },
#endif
{ .display = {BLANK, FOUR, EIGHT, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(4800) },
{ .display = {BLANK, FIVE, SIX, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(5600) },
{ .display = {BLANK, SIX, FOUR, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(6400) },
{ .display = {BLANK, SEVEN, TWO, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(7200) },
{ .display = {BLANK, EIGHT, ZERO, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(8000) },
#ifdef EXTENDED_INCH_THREADS
{ .display = {BLANK, EIGHT, EIGHT, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(8800) },
{ .display = {BLANK, NINE, TWO, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(9200) },
{ .display = {BLANK, NINE, SIX, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(9600) },
{ .display = {ONE, ZERO, FOUR, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(10400) },
{ .display = {ONE, ONE, TWO, BLANK}, .leds = LED_THREAD | LED_TPI, TPI_FRACTION(11200) },
#endif
};


Expand Down Expand Up @@ -126,41 +157,89 @@ const FEED_THREAD inch_feed_table[] =
// LED indicator states and gear ratio fraction to use.
//
#if defined(LEADSCREW_TPI)
#define HMM_NUMERATOR(hmm) ((Uint64)hmm*10*LEADSCREW_TPI*STEPPER_RESOLUTION*STEPPER_MICROSTEPS)
#define HMM_NUMERATOR(hmm) ((Uint64)hmm*LEADSCREW_TPI*STEPPER_RESOLUTION*STEPPER_MICROSTEPS)
#define HMM_DENOMINATOR(hmm) ((Uint64)ENCODER_RESOLUTION*254*100)
#endif
#if defined(LEADSCREW_HMM)
#define HMM_NUMERATOR(hmm) ((Uint64)hmm*STEPPER_RESOLUTION*STEPPER_MICROSTEPS)
#define HMM_DENOMINATOR(hmm) ((Uint64)ENCODER_RESOLUTION*LEADSCREW_HMM)
#define HMM_DENOMINATOR(hmm) ((Uint64)ENCODER_RESOLUTION*LEADSCREW_HMM*10)
#endif
#define HMM_FRACTION(hmm) .numerator = HMM_NUMERATOR(hmm), .denominator = HMM_DENOMINATOR(hmm)

const FEED_THREAD metric_thread_table[] =
{
{ .display = {BLANK, POINT, TWO, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(20) },
{ .display = {BLANK, POINT, TWO, FIVE}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(25) },
{ .display = {BLANK, POINT, THREE, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(30) },
{ .display = {BLANK, POINT, THREE, FIVE}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(35) },
{ .display = {BLANK, POINT, FOUR, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(40) },
{ .display = {BLANK, POINT, FOUR, FIVE}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(45) },
{ .display = {BLANK, POINT, FIVE, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(50) },
{ .display = {BLANK, POINT, SIX, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(60) },
{ .display = {BLANK, POINT, SEVEN, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(70) },
{ .display = {BLANK, POINT, SEVEN, FIVE}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(75) },
{ .display = {BLANK, POINT, EIGHT, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(80) },
{ .display = {BLANK, ONE, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(100) },
{ .display = {BLANK, ONE | POINT, TWO, FIVE}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(125) },
{ .display = {BLANK, ONE | POINT, FIVE, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(150) },
{ .display = {BLANK, ONE | POINT, SEVEN, FIVE}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(175) },
{ .display = {BLANK, TWO, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(200) },
{ .display = {BLANK, TWO | POINT, FIVE, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(250) },
{ .display = {BLANK, THREE, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(300) },
{ .display = {BLANK, THREE | POINT, FIVE, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(350) },
{ .display = {BLANK, FOUR, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(400) },
{ .display = {BLANK, FOUR | POINT, FIVE, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(450) },
{ .display = {BLANK, FIVE, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(500) },
{ .display = {BLANK, FIVE | POINT, FIVE, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(550) },
{ .display = {BLANK, SIX, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(600) },
#ifdef EXTENDED_METRIC_THREADS
{ .display = {ZERO | POINT, ONE, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(100) },
{ .display = {ZERO | POINT, ONE, TWO, FIVE}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(125) },
{ .display = {ZERO | POINT, ONE, FIVE, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(150) },
#endif
{ .display = {ZERO | POINT, TWO, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(200) },
#ifdef EXTENDED_METRIC_THREADS
{ .display = {ZERO | POINT, TWO, TWO, FIVE}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(225) },
#endif
{ .display = {ZERO | POINT, TWO, FIVE, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(250) },
{ .display = {ZERO | POINT, THREE, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(300) },
{ .display = {ZERO | POINT, THREE, FIVE, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(350) },
{ .display = {ZERO | POINT, FOUR, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(400) },
{ .display = {ZERO | POINT, FOUR, FIVE, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(450) },
{ .display = {ZERO | POINT, FIVE, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(500) },
#ifdef EXTENDED_METRIC_THREADS
{ .display = {ZERO | POINT, FIVE, FIVE, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(550) },
#endif
{ .display = {ZERO | POINT, SIX, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(600) },
#ifdef EXTENDED_METRIC_THREADS
{ .display = {ZERO | POINT, SIX, FIVE, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(650) },
#endif
{ .display = {ZERO | POINT, SEVEN, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(700) },
{ .display = {ZERO | POINT, SEVEN, FIVE, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(750) },
{ .display = {ZERO | POINT, EIGHT, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(800) },
#ifdef EXTENDED_METRIC_THREADS
{ .display = {ZERO | POINT, EIGHT, SEVEN, FIVE}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(875) },
{ .display = {ZERO | POINT, NINE, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(900) },
#endif
{ .display = {ONE, BLANK, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(1000) },
#ifdef EXTENDED_METRIC_THREADS
{ .display = {ONE | POINT, ONE, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(1100) },
{ .display = {ONE | POINT, TWO, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(1200) },
#endif
{ .display = {ONE | POINT, TWO, FIVE, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(1250) },
#ifdef EXTENDED_METRIC_THREADS
{ .display = {ONE | POINT, THREE, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(1300) },
{ .display = {ONE | POINT, FOUR, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(1400) },
#endif
{ .display = {ONE | POINT, FIVE, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(1500) },
#ifdef EXTENDED_METRIC_THREADS
{ .display = {ONE | POINT, SIX, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(1600) },
#endif
{ .display = {ONE | POINT, SEVEN, FIVE, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(1750) },
#ifdef EXTENDED_METRIC_THREADS
{ .display = {ONE | POINT, EIGHT, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(1800) },
#endif
{ .display = {TWO, BLANK, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(2000) },
#ifdef EXTENDED_METRIC_THREADS
{ .display = {TWO | POINT, TWO, FIVE, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(2250) },
#endif
{ .display = {TWO | POINT, FIVE, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(2500) },
#ifdef EXTENDED_METRIC_THREADS
{ .display = {TWO | POINT, SEVEN, FIVE, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(2750) },
#endif
{ .display = {THREE, BLANK, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(3000) },
#ifdef EXTENDED_METRIC_THREADS
{ .display = {THREE | POINT, TWO, FIVE, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(3250) },
#endif
{ .display = {THREE | POINT, FIVE, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(3500) },
{ .display = {FOUR, BLANK, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(4000) },
{ .display = {FOUR | POINT, FIVE, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(4500) },
{ .display = {FIVE, BLANK, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(5000) },
{ .display = {FIVE | POINT, FIVE, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(5500) },
#ifdef EXTENDED_METRIC_THREADS
{ .display = {FIVE | POINT, SEVEN, FIVE, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(5750) },
#endif
{ .display = {SIX, BLANK, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(6000) },
#ifdef EXTENDED_METRIC_THREADS
{ .display = {SIX | POINT, FIVE, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(6500) },
{ .display = {SEVEN, BLANK, BLANK, BLANK}, .leds = LED_THREAD | LED_MM, HMM_FRACTION(7000) },
#endif
};


Expand Down Expand Up @@ -241,10 +320,10 @@ const FEED_THREAD *FeedTable :: previous(void)
}

FeedTableFactory::FeedTableFactory(void):
inchThreads(inch_thread_table, sizeof(inch_thread_table)/sizeof(inch_thread_table[0]), 12),
inchFeeds(inch_feed_table, sizeof(inch_feed_table)/sizeof(inch_feed_table[0]), 4),
metricThreads(metric_thread_table, sizeof(metric_thread_table)/sizeof(metric_thread_table[0]), 6),
metricFeeds(metric_feed_table, sizeof(metric_feed_table)/sizeof(metric_feed_table[0]), 4)
inchThreads(inch_thread_table, sizeof(inch_thread_table)/sizeof(inch_thread_table[0]), INITIAL_INCH_THREAD_INDEX),
inchFeeds(inch_feed_table, sizeof(inch_feed_table)/sizeof(inch_feed_table[0]), INITIAL_INCH_FEED_INDEX),
metricThreads(metric_thread_table, sizeof(metric_thread_table)/sizeof(metric_thread_table[0]), INITIAL_METRIC_THREAD_INDEX),
metricFeeds(metric_feed_table, sizeof(metric_feed_table)/sizeof(metric_feed_table[0]), INITIAL_METRIC_FEED_INDEX)
{
}

Expand Down

0 comments on commit 0dda30a

Please sign in to comment.