Merge pull request #7 from jjj11x/jdw/pi_fixup

Jdw/pi fixup
jjj11x · Apr 27, 2022 · a8ada6b · a8ada6b
2 parents 25db383 + 33cd262
commit a8ada6b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git 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:

diff --git 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
diff --git 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 {

diff --git 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){

diff --git 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 {