Merge pull request #29 from bxparks/v11fixes

bxparks · web-flow · commit 89896e67dc5a · 2025-11-14T07:55:10.000-08:00
merge v1.1.1 into master
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 
 - Unreleased
+- 1.1.1 (2025-11-14)
+    - **Bug Fix**: Fix regression of `Y^X`, `XROOTY`, and `2^X` functions when
+      `CRES` is active *and* `X` is Real (not Complex).
+    - **Bug Fix**: Fix regression of `STO {op} nn` when storing Complex numbers
+      or record objects.
 - 1.1.0 (2025-10-07)
     - DATE (**Major UI Change**)
         - Support additional method of entry of Duration objects:
diff --git a/README.md b/README.md
@@ -124,7 +124,7 @@ Missing features (partial list):
 - vectors and matrices
 - keystroke programming
 
-**Version**: 1.1.0 (2025-10-07) \
+**Version**: 1.1.1 (2025-11-14) \
 **Project Home**: https://github.com/bxparks/rpn83p \
 **User Guide**: [USER_GUIDE.md](docs/USER_GUIDE.md) \
 **Changelog**: [CHANGELOG.md](CHANGELOG.md)
diff --git a/docs/DEVELOPER.md b/docs/DEVELOPER.md
@@ -3,7 +3,7 @@
 Notes for the developers of the RPN83P app, likely myself in 6 months when I
 cannot remember how the code works.
 
-**Version**: 1.1.0 (2025-10-07) \
+**Version**: 1.1.1 (2025-11-14) \
 **Project Home**: https://github.com/bxparks/rpn83p
 
 ## Table of Contents
@@ -53,6 +53,7 @@ table in `rpn83p.asm`, and all of them start with the prefix `_Debug`:
 - `_DebugPString`
 - `_DebugClear`
 - `_DebugOP1`
+- `_DebugCP1`
 - `_DebugEEPos`
 - `_DebugUnsignedA`
 - `_DebugSignedA`
diff --git a/docs/DEVELOPER_TVM.md b/docs/DEVELOPER_TVM.md
@@ -3,7 +3,7 @@
 Equations, algorithms, and other tricks used to calculate the Time Value of
 Money (TVM) variables in the RPN83P calculator app.
 
-**Version**: 1.1.0 (2025-10-07)\
+**Version**: 1.1.1 (2025-11-14)\
 **Project Home**: https://github.com/bxparks/rpn83p
 
 ## Table of Contents
diff --git a/docs/USER_GUIDE.md b/docs/USER_GUIDE.md
@@ -2,7 +2,7 @@
 
 RPN calculator app for the TI-83 Plus and TI-84 Plus inspired by the HP-42S.
 
-**Version**: 1.1.0 (2025-10-07)\
+**Version**: 1.1.1 (2025-11-14)\
 **Project Home**: https://github.com/bxparks/rpn83p
 
 ## Introduction
diff --git a/docs/USER_GUIDE_BASE.md b/docs/USER_GUIDE_BASE.md
@@ -5,7 +5,7 @@ allow numbers to be converted between 4 different bases (DEC, HEX, OCT, and
 BIN), and they support various arithmetic and bitwise operations similar to the
 HP-16C.
 
-**Version**: 1.1.0 (2025-10-07)\
+**Version**: 1.1.1 (2025-11-14)\
 **Project Home**: https://github.com/bxparks/rpn83p \
 **Parent Document**: [USER_GUIDE.md](USER_GUIDE.md)
 
diff --git a/docs/USER_GUIDE_BASIC.md b/docs/USER_GUIDE_BASIC.md
@@ -15,7 +15,7 @@ emulator for the HP-42S (available for Android, iOS, Windows, MacOS, and Linux)
 and then download the [HP-42S Owner's
 Manual](https://literature.hpcalc.org/items/929).
 
-**Version**: 1.1.0 (2025-10-07)\
+**Version**: 1.1.1 (2025-11-14)\
 **Project Home**: https://github.com/bxparks/rpn83p \
 **Parent Document**: [USER_GUIDE.md](USER_GUIDE.md)
 
diff --git a/docs/USER_GUIDE_CATALOG.md b/docs/USER_GUIDE_CATALOG.md
@@ -3,7 +3,7 @@
 This chapter contains a catalog of all functions implemented by the RPN83P app,
 accessed directly through buttons or through the menu system.
 
-**Version**: 1.1.0 (2025-10-07)\
+**Version**: 1.1.1 (2025-11-14)\
 **Project Home**: https://github.com/bxparks/rpn83p \
 **Parent Document**: [USER_GUIDE.md](USER_GUIDE.md)
 
diff --git a/docs/USER_GUIDE_CLR.md b/docs/USER_GUIDE_CLR.md
@@ -2,7 +2,7 @@
 
 This document describes the menu functions under the `CLR` menu in RPN83P.
 
-**Version**: 1.1.0 (2025-10-07)\
+**Version**: 1.1.1 (2025-11-14)\
 **Project Home**: https://github.com/bxparks/rpn83p \
 **Parent Document**: [USER_GUIDE.md](USER_GUIDE.md)
 
diff --git a/docs/USER_GUIDE_COMPLEX.md b/docs/USER_GUIDE_COMPLEX.md
@@ -9,7 +9,7 @@ independent of each other. For example, a complex number can be entered in
 rectangular form, even if the current display mode is polar form. Internally,
 complex numbers are *always* stored in rectangular format.
 
-**Version**: 1.1.0 (2025-10-07)\
+**Version**: 1.1.1 (2025-11-14)\
 **Project Home**: https://github.com/bxparks/rpn83p \
 **Parent Document**: [USER_GUIDE.md](USER_GUIDE.md)
 
diff --git a/docs/USER_GUIDE_CONV.md b/docs/USER_GUIDE_CONV.md
@@ -2,7 +2,7 @@
 
 This document describes the menu functions under the `CONV` menu in RPN83P.
 
-**Version**: 1.1.0 (2025-10-07)\
+**Version**: 1.1.1 (2025-11-14)\
 **Project Home**: https://github.com/bxparks/rpn83p \
 **Parent Document**: [USER_GUIDE.md](USER_GUIDE.md)
 
diff --git a/docs/USER_GUIDE_DATE.md b/docs/USER_GUIDE_DATE.md
@@ -2,7 +2,7 @@
 
 This document describes the `DATE` features of the RPN83P application.
 
-**Version**: 1.1.0 (2025-10-07)\
+**Version**: 1.1.1 (2025-11-14)\
 **Project Home**: https://github.com/bxparks/rpn83p \
 **Parent Document**: [USER_GUIDE.md](USER_GUIDE.md)
 
diff --git a/docs/USER_GUIDE_FUTURE.md b/docs/USER_GUIDE_FUTURE.md
@@ -14,7 +14,7 @@ because it is faster and easier to use compared to a web app, especially for
 small features that can be described in a few sentences. Usually only the larger
 and more complicated features will get their own GitHub tickets.
 
-**Version**: 1.1.0 (2025-10-07) \
+**Version**: 1.1.1 (2025-11-14) \
 **Project Home**: https://github.com/bxparks/rpn83p \
 **Parent Document**: [USER_GUIDE.md](USER_GUIDE.md)
 
diff --git a/docs/USER_GUIDE_INSTALLATION.md b/docs/USER_GUIDE_INSTALLATION.md
@@ -2,7 +2,7 @@
 
 This document describes how to install and run the RPN83P application.
 
-**Version**: 1.1.0 (2025-10-07)\
+**Version**: 1.1.1 (2025-11-14)\
 **Project Home**: https://github.com/bxparks/rpn83p \
 **Parent Document**: [USER_GUIDE.md](USER_GUIDE.md)
 
diff --git a/docs/USER_GUIDE_MATH.md b/docs/USER_GUIDE_MATH.md
@@ -2,7 +2,7 @@
 
 This document describes the menu functions under the `MATH` menu in RPN83P.
 
-**Version**: 1.1.0 (2025-10-07)\
+**Version**: 1.1.1 (2025-11-14)\
 **Project Home**: https://github.com/bxparks/rpn83p \
 **Parent Document**: [USER_GUIDE.md](USER_GUIDE.md)
 
diff --git a/docs/USER_GUIDE_MODE.md b/docs/USER_GUIDE_MODE.md
@@ -2,7 +2,7 @@
 
 This document describes the menu functions under the `MODE` menu in RPN83P.
 
-**Version**: 1.1.0 (2025-10-07)\
+**Version**: 1.1.1 (2025-11-14)\
 **Project Home**: https://github.com/bxparks/rpn83p \
 **Parent Document**: [USER_GUIDE.md](USER_GUIDE.md)
 
diff --git a/docs/USER_GUIDE_NUM.md b/docs/USER_GUIDE_NUM.md
@@ -2,7 +2,7 @@
 
 This document describes the menu functions under the `NUM` menu in RPN83P.
 
-**Version**: 1.1.0 (2025-10-07)\
+**Version**: 1.1.1 (2025-11-14)\
 **Project Home**: https://github.com/bxparks/rpn83p \
 **Parent Document**: [USER_GUIDE.md](USER_GUIDE.md)
 
diff --git a/docs/USER_GUIDE_PROB.md b/docs/USER_GUIDE_PROB.md
@@ -2,7 +2,7 @@
 
 This document describes the menu functions under the `PROB` menu in RPN83P.
 
-**Version**: 1.1.0 (2025-10-07)\
+**Version**: 1.1.1 (2025-11-14)\
 **Project Home**: https://github.com/bxparks/rpn83p \
 **Parent Document**: [USER_GUIDE.md](USER_GUIDE.md)
 
diff --git a/docs/USER_GUIDE_STAT.md b/docs/USER_GUIDE_STAT.md
@@ -3,7 +3,7 @@
 This document describes the `STAT` functions of the RPN83P application which
 supports all statistical and curve fitting functionality of the HP-42S.
 
-**Version**: 1.1.0 (2025-10-07)\
+**Version**: 1.1.1 (2025-11-14)\
 **Project Home**: https://github.com/bxparks/rpn83p \
 **Parent Document**: [USER_GUIDE.md](USER_GUIDE.md)
 
diff --git a/docs/USER_GUIDE_STK.md b/docs/USER_GUIDE_STK.md
@@ -2,7 +2,7 @@
 
 This document describes the menu functions under the `STK` menu in RPN83P.
 
-**Version**: 1.1.0 (2025-10-07)\
+**Version**: 1.1.1 (2025-11-14)\
 **Project Home**: https://github.com/bxparks/rpn83p \
 **Parent Document**: [USER_GUIDE.md](USER_GUIDE.md)
 
diff --git a/docs/USER_GUIDE_STORAGE.md b/docs/USER_GUIDE_STORAGE.md
@@ -3,7 +3,7 @@
 This document describes the numerical storage registers and the single-letter
 storage variables implemented by RPN83P.
 
-**Version**: 1.1.0 (2025-10-07)\
+**Version**: 1.1.1 (2025-11-14)\
 **Project Home**: https://github.com/bxparks/rpn83p \
 **Parent Document**: [USER_GUIDE.md](USER_GUIDE.md)
 
diff --git a/docs/USER_GUIDE_TIOS.md b/docs/USER_GUIDE_TIOS.md
@@ -3,7 +3,7 @@
 This document describes the interactions between RPN83P and the underlying
 TI-OS of the calculator.
 
-**Version**: 1.1.0 (2025-10-07)\
+**Version**: 1.1.1 (2025-11-14)\
 **Project Home**: https://github.com/bxparks/rpn83p \
 **Parent Document**: [USER_GUIDE.md](USER_GUIDE.md)
 
diff --git a/docs/USER_GUIDE_TROUBLESHOOTING.md b/docs/USER_GUIDE_TROUBLESHOOTING.md
@@ -2,7 +2,7 @@
 
 This document describes some troubleshooting techniques for the RPN83P app.
 
-**Version**: 1.1.0 (2025-10-07)\
+**Version**: 1.1.1 (2025-11-14)\
 **Project Home**: https://github.com/bxparks/rpn83p \
 **Parent Document**: [USER_GUIDE.md](USER_GUIDE.md)
 
diff --git a/docs/USER_GUIDE_TVM.md b/docs/USER_GUIDE_TVM.md
@@ -3,7 +3,7 @@
 This document describes the `TVM` functions of the RPN83P application which
 solves the Time Value of Money equation.
 
-**Version**: 1.1.0 (2025-10-07)\
+**Version**: 1.1.1 (2025-11-14)\
 **Project Home**: https://github.com/bxparks/rpn83p \
 **Parent Document**: [USER_GUIDE.md](USER_GUIDE.md)
 
diff --git a/docs/USER_GUIDE_UNIT.md b/docs/USER_GUIDE_UNIT.md
@@ -2,7 +2,7 @@
 
 This document describes the menu functions under the `UNIT` menu in RPN83P.
 
-**Version**: 1.1.0 (2025-10-07)\
+**Version**: 1.1.1 (2025-11-14)\
 **Project Home**: https://github.com/bxparks/rpn83p \
 **Parent Document**: [USER_GUIDE.md](USER_GUIDE.md)
 
@@ -420,7 +420,7 @@ The columns in the table mean the following:
 | **`ENER`**        |           |       |       |             |
 | `eV`              | `eV`      |       | TI    | electron volt, 1.602176634e-19 J (exact) by defn |
 | `erg`             | `erg`     |       | TI    | 1e-7 J        |
-| `joule`           | `J`       |       | TI    | **base unit**, kg\*m/s^2 |
+| `joule`           | `J`       |       | TI    | **base unit**, kg\*m^2/s^2 |
 | `kilojoule`       | `kJ`      |       | TI    | 1000 J        |
 | `ft·lbf`          | `ftlb`    |       | TI    | 1.3558179483314 J (14 digits) |
 | `watt·h`          | `Wh`      |       |       | 3600 J        |
diff --git a/docs/USER_GUIDE_WHY.md b/docs/USER_GUIDE_WHY.md
@@ -2,7 +2,7 @@
 
 This document explains the motivations for creating RPN83P.
 
-**Version**: 1.1.0 (2025-10-07)\
+**Version**: 1.1.1 (2025-11-14)\
 **Project Home**: https://github.com/bxparks/rpn83p \
 **Parent Document**: [USER_GUIDE.md](USER_GUIDE.md)
 
diff --git a/src/branchtab.asm b/src/branchtab.asm
@@ -25,6 +25,20 @@
 
 branchTableBase equ $4000
 
+;-----------------------------------------------------------------------------
+; Branch table entries for routines on Flash Page 0.
+;-----------------------------------------------------------------------------
+
+; display.asm
+_printOP1Label:
+_printOP1 equ _printOP1Label-branchTableBase
+    .dw printOP1
+    .db 0
+_vEraseEOLLabel:
+_vEraseEOL equ _vEraseEOLLabel-branchTableBase
+    .dw vEraseEOL
+    .db 0
+
 ;-----------------------------------------------------------------------------
 ; Branch table entries for routines on Flash Page 1.
 ;-----------------------------------------------------------------------------
@@ -660,6 +674,10 @@ _DebugOP1Label:
 _DebugOP1 equ _DebugOP1Label-branchTableBase
     .dw DebugOP1
     .db 1
+_DebugCP1Label:
+_DebugCP1 equ _DebugCP1Label-branchTableBase
+    .dw DebugCP1
+    .db 1
 _DebugUnsignedALabel:
 _DebugUnsignedA equ _DebugUnsignedALabel-branchTableBase
     .dw DebugUnsignedA
diff --git a/src/const1.asm b/src/const1.asm
@@ -20,7 +20,7 @@ op2Set0PageOne:
 ; Description: Set OP1 to 0.0. Faster version of bcall(_OP1Set0).
 ; Destroys: all, HL
 op4Set0PageOne:
-    ld hl, const0
+    ld hl, const0PageOne
     jp move9ToOp4PageOne
 
 ;-----------------------------------------------------------------------------
diff --git a/src/debug1.asm b/src/debug1.asm
@@ -172,6 +172,40 @@ DebugOP1:
 
 ;------------------------------------------------------------------------------
 
+; Description: Print out CP1 at debug line.
+; Input: CP1=OP1/OP2
+; Output:
+; Destroys: OP3
+DebugCP1:
+    push af
+    push bc
+    push de
+    push hl
+    ld hl, (curRow)
+    push hl
+    ld hl, (penCol)
+    push hl
+
+    ld hl, debugCurCol*$100+debugCurRow ; $(curCol)(curRow)
+    ld (curRow), hl
+    ld hl, debugPenRow*$100 ; $(penRow)(penCol)
+    ld (penCol), hl
+
+    bcall(_printOP1)
+    bcall(_vEraseEOL)
+
+    pop hl
+    ld (penCol), hl
+    pop hl
+    ld (curRow), hl
+    pop hl
+    pop de
+    pop bc
+    pop af
+    ret
+
+;------------------------------------------------------------------------------
+
 ; Description: Print the unsigned A on the debug line.
 ; Input: A
 ; Output: A printed on debug line
diff --git a/src/handlers.asm b/src/handlers.asm
@@ -1098,10 +1098,12 @@ handleKeySto:
     ret nz ; do nothing if cancelled
     ; close inputBuf only if STO is actually requested
     call closeInputAndRecallNone
+    ; Check for 'STO IND' which is unsupported right now.
+    ld a, (argModifier)
     cp argModifierIndirect
     ret nc ; TODO: implement this
     bcall(_RclStackX) ; OP1/OP2=X
-    ; Set up Sto parameters
+    ; Set up StoOpGeneric parameters
     ld a, (argValue) ; A=indexOrLetter
     ld c, a ; C=index or letter
     ld a, (argModifier)
@@ -1129,6 +1131,7 @@ handleKeyRcl:
     ret nz ; do nothing if cancelled
     ; close inputBuf only if RCL is actually requested
     call closeInputAndRecallNone
+    ld a, (argModifier)
     cp argModifierIndirect
     ret nc ; TODO: implement this
     ld a, (argValue) ; A=varLetter
diff --git a/src/help1.asm b/src/help1.asm
@@ -35,8 +35,8 @@ helpPageCount equ (helpPagesEnd-helpPages)/2
 
 msgHelpPage1:
     .db escapeLargeFont, "RPN83P", Lenter
-    ;.db escapeSmallFont, "v1.1.0", Shyphen, "dev (2025", Shyphen, "10", Shyphen, "07)", Senter
-    .db escapeSmallFont, "v1.1.0 (2025", Shyphen, "10", Shyphen, "07)", Senter
+    ; .db escapeSmallFont, "v1.1.1", Shyphen, "dev (2025", Shyphen, "11", Shyphen, "13)", Senter
+    .db escapeSmallFont, "v1.1.1 (2025", Shyphen, "11", Shyphen, "14)", Senter
     .db "(c) 2023", Shyphen, "2025 Brian T. Park", Senter
     .db Senter
     .db "An RPN calculator for the", Senter
diff --git a/src/memory1.asm b/src/memory1.asm
