7u83/stc_rpncalc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7 from jjj11x/jdw/pi_fixup

Browse Source 
Jdw/pi fixup
This commit is contained in:
jjj11x 2022-04-26 22:45:38 -04:00 committed by GitHub
commit a8ada6b7d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/main.yml vendored
View File

@ -1,4 +1,4 @@
on: [push] on: [push, pull_request]
jobs: jobs:
stc_rpncalc_ci_job: stc_rpncalc_ci_job:

6
Dockerfile
View File

@ -16,6 +16,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
wget wget
# install more up-to-date catch2 # 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 wget http://mirrors.kernel.org/ubuntu/pool/universe/c/catch2/catch2_2.13.7-1_amd64.deb
RUN echo "1d501c7f817cfcd46dd1b79edc10896d catch2_2.13.0-1_all.deb" | md5sum --check -- RUN echo "3ca43a3b3347ec2e220e0cc6e9c38859 catch2_2.13.7-1_amd64.deb" | md5sum --check --
RUN dpkg -i catch2_2.13.0-1_all.deb RUN dpkg -i catch2_2.13.7-1_amd64.deb

4
src/calc.c
View File

@ -128,7 +128,9 @@ void process_cmd(char cmd){
////////// //////////
case '/':{ case '/':{
if (IsShiftedUp){ if (IsShiftedUp){
StackPtr--; if (NoLift != 1){
StackPtr--;
}
pi_decn(); pi_decn();
copy_decn(&stack(STACK_X), &AccDecn); copy_decn(&stack(STACK_X), &AccDecn);
} else { } else {

2
src/decn/decn.c
View File

@ -1589,9 +1589,7 @@ void to_radian_decn(void) {
} }
void pi_decn(void) { void pi_decn(void) {
set_dec80_zero(&BDecn);
copy_decn(&AccDecn, &DECN_PI); copy_decn(&AccDecn, &DECN_PI);
mult_decn();
} }
static void set_str_error(void){ static void set_str_error(void){

2
src/main.c
View File

@ -140,7 +140,7 @@ static void latch_on(void)
__xdata char EntryBuf[MAX_CHARS_PER_LINE + 1]; __xdata char EntryBuf[MAX_CHARS_PER_LINE + 1];
__xdata uint8_t ExpBuf[2]; __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 { enum {