From 425a6df824b17635d5750563610b640d58e71ef9 Mon Sep 17 00:00:00 2001 From: clough42 Date: Sat, 30 Nov 2019 15:52:51 -0700 Subject: [PATCH] Incorporate #29 from carneeki: added two BSP threads, made 11.5 actually 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. --- els-f280049c/28004x_generic_ram_lnk.cmd | 6 +++--- els-f280049c/Tables.cpp | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/els-f280049c/28004x_generic_ram_lnk.cmd b/els-f280049c/28004x_generic_ram_lnk.cmd index dd0f425..5fd166d 100644 --- a/els-f280049c/28004x_generic_ram_lnk.cmd +++ b/els-f280049c/28004x_generic_ram_lnk.cmd @@ -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 diff --git a/els-f280049c/Tables.cpp b/els-f280049c/Tables.cpp index 8e85cfa..310e265 100644 --- a/els-f280049c/Tables.cpp +++ b/els-f280049c/Tables.cpp @@ -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) }, @@ -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) }, };