From 086f814e7ba85d8a652b9420b4af72c41f557a1a Mon Sep 17 00:00:00 2001 From: Jeff Wang Date: Tue, 26 Apr 2022 21:13:09 -0400 Subject: [PATCH 1/5] run CI checks on pull requests also --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index be20ff8..a63bd33 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,4 +1,4 @@ -on: [push] +on: [push, pull_request] jobs: stc_rpncalc_ci_job: From 5bc3b881a1ecad00b4019028ebbf66633372d92c Mon Sep 17 00:00:00 2001 From: Jeff Wang Date: Tue, 26 Apr 2022 21:18:47 -0400 Subject: [PATCH 2/5] update catch2 version/link (there's probably a better way to do this) --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 123f28c..a69f690 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ wget # install more up-to-date catch2 -RUN wget http://mirrors.kernel.org/ubuntu/pool/universe/c/catch2/catch2_2.13.0-1_all.deb -RUN echo "1d501c7f817cfcd46dd1b79edc10896d catch2_2.13.0-1_all.deb" | md5sum --check -- -RUN dpkg -i catch2_2.13.0-1_all.deb +RUN wget http://mirrors.kernel.org/ubuntu/pool/universe/c/catch2/catch2_2.13.7-1_amd64.deb +RUN echo "3ca43a3b3347ec2e220e0cc6e9c38859 catch2_2.13.7-1_amd64.deb" | md5sum --check -- +RUN dpkg -i catch2_2.13.7-1_amd64.deb From c6901dc44260930693473d970d7d784b9f2249a9 Mon Sep 17 00:00:00 2001 From: toml12953 Date: Thu, 21 Apr 2022 05:35:02 -0400 Subject: [PATCH 3/5] A call to mult_decn is not needed and prevents PI from being loaded into the X register. fixes #3 --- src/decn/decn.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/decn/decn.c b/src/decn/decn.c index 6e9391f..28a2752 100644 --- a/src/decn/decn.c +++ b/src/decn/decn.c @@ -1589,9 +1589,7 @@ void to_radian_decn(void) { } void pi_decn(void) { - set_dec80_zero(&BDecn); copy_decn(&AccDecn, &DECN_PI); - mult_decn(); } static void set_str_error(void){ From 9770525dba8b9f15a5e41bf281627b1843c2631a Mon Sep 17 00:00:00 2001 From: toml12953 Date: Thu, 21 Apr 2022 05:43:29 -0400 Subject: [PATCH 4/5] =?UTF-8?q?Pressing=20PI=20(Shift=20=C3=B7)=20should?= =?UTF-8?q?=20only=20lift=20the=20stack=20if=20the=20previous=20operation?= =?UTF-8?q?=20would=20allow=20it.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixes #4 --- src/calc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/calc.c b/src/calc.c index ea3ee7a..ac963bd 100644 --- a/src/calc.c +++ b/src/calc.c @@ -128,7 +128,9 @@ void process_cmd(char cmd){ ////////// case '/':{ if (IsShiftedUp){ - StackPtr--; + if (NoLift != 1){ + StackPtr--; + } pi_decn(); copy_decn(&stack(STACK_X), &AccDecn); } else { From 33cd2626748cfd2e0fb1c808a2e6cc7a43c0cf4e Mon Sep 17 00:00:00 2001 From: Jeff Wang Date: Tue, 26 Apr 2022 21:47:46 -0400 Subject: [PATCH 5/5] bump version to 1.14 for pi fixes --- src/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.c b/src/main.c index 6db3b82..ddb182c 100644 --- a/src/main.c +++ b/src/main.c @@ -140,7 +140,7 @@ static void latch_on(void) __xdata char EntryBuf[MAX_CHARS_PER_LINE + 1]; __xdata uint8_t ExpBuf[2]; -__code const char VER_STR[32+1] = "STC RPN Calculator v1.13"; +__code const char VER_STR[32+1] = "STC RPN Calculator v1.14"; enum {