Skip to content

Commit

Permalink
Incorporate #29 from carneeki: added two BSP threads, made 11.5 actua…
Browse files Browse the repository at this point in the history
…lly 11.5 (#32)

* added two BSP threads, made 11.5 actually 11.5

* Merge branch 'master' of
https://github.com/carneeki/electronic-leadscrew into carneeki-master

Fix ram link file to allow for larger thread tables.

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
  • Loading branch information
clough42 committed Nov 30, 2019
1 parent 540bce6 commit 425a6df
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
6 changes: 3 additions & 3 deletions els-f280049c/28004x_generic_ram_lnk.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ SECTIONS
.reset : > RESET, PAGE = 0, TYPE = DSECT /* not used, */

.stack : > RAMM1, PAGE = 1
.ebss : > RAMLS5, PAGE = 1
.econst : > RAMLS5, PAGE = 1
.esysmem : > RAMLS5, PAGE = 1
.ebss : > RAMLS5|RAMLS6, PAGE = 1
.econst : > RAMLS5|RAMLS6, PAGE = 1
.esysmem : > RAMLS5|RAMLS6, PAGE = 1

ramgs0 : > RAMGS0, PAGE = 1
ramgs1 : > RAMGS1, PAGE = 1
Expand Down
6 changes: 5 additions & 1 deletion els-f280049c/Tables.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,17 @@ const FEED_THREAD inch_thread_table[] =
{ .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(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) },
Expand Down Expand Up @@ -157,6 +159,8 @@ const FEED_THREAD metric_thread_table[] =
{ .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) },
};


Expand Down

0 comments on commit 425a6df

Please sign in to comment.