Merge pull request #4 from bxparks/develop

merge 0.3 into master

Author: bxparks

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 
 - Unreleased
+- 0.3 (2023-08-13)
+    - Move `CLRG` from F1 position to F3. Move `CLX` to F1. If the F1
+      is accidentally hit twice when selecting the `CLR` menu group, then
+      invoking `CLX` is a lot less destructive than invoking `CLRG`.
+    - Move `IP,FP,...` menu strips before the `ABS,SIGN,...` menu strip. The
+      `IP,FP` functions seem more frequently used than the `ABS,SIGN` functions.
 - 0.2.1 (2023-08-13)
     - Update README.md. Test minor version number with new release.
     - No code change.

README.md

@@ -2,7 +2,7 @@
 
 RPN calculator app for the TI-83 Plus and TI-84 Plus inspired by the HP-42S.
 
-**Version**: 0.2.1 (2023-08-13)
+**Version**: 0.3 (2023-08-13)
 
 **Changelog**: [CHANGELOG.md](CHANGELOG.md)
 

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**: 0.2.1 (2023-08-13)
+**Version**: 0.3 (2023-08-13)
 
 **Project Home**: https://github.com/bxparks/rpn83p
 
@@ -626,16 +626,16 @@ buttons just under the LCD screen. Use the `UP`, `DOWN`, `ON` (back), and `MATH`
     - `GCD`: greatest common divisor of `X` and `Y`
     - `LCM`: lowest common multiple of `X` and `Y`
     - `PRIM`: determine if `X` is a prime, returning 1 if prime, 0 otherwise
-    - `ABS`: absolute value of `X`
-    - `SIGN`: return -1, 0, 1 depending on whether `X` is less than, equal, or
-      greater than 0, respectively
-    - `MIN`: minimum of `X` and `Y`
-    - `MAX`: maximum of `X` and `Y`
     - `IP`: integer part of `X`, truncating towards 0, preserving sign
     - `FP`: fractional part of `X`, preserving sign
     - `FLR`: the floor of `X`, the largest integer <= `X`
     - `CEIL`: the ceiling of `X`, the smallest integer >= `X`
     - `NEAR`: the nearest integer to `X`
+    - `ABS`: absolute value of `X`
+    - `SIGN`: return -1, 0, 1 depending on whether `X` is less than, equal, or
+      greater than 0, respectively
+    - `MIN`: minimum of `X` and `Y`
+    - `MAX`: maximum of `X` and `Y`
 - `ROOT` > `PROB`
     - ![PROB MenuStrip 1](docs/rpn83p-screenshot-menu-root-prob-1.png)
     - `COMB`: combination `C(n,r)` = `C(Y, X)`

docs/rpn83p-screenshot-menu-root-clr-1.png

@@ -136,7 +136,7 @@ mClearId equ 12
     .db mRootId ; parentId
     .db mClearNameId ; nameId
     .db 1 ; numStrips
-    .db mClearRegsId ; stripBeginId
+    .db mClearXId ; stripBeginId
     .dw mGroupHandler ; handler (predefined)
 mBlank013:
 mBlank013Id equ 13
@@ -296,87 +296,87 @@ mPrimeId equ 31
     .db 0 ; stripBeginId
     .dw mPrimeHandler ; handler (to be implemented)
 ; MenuGroup NUM: children: strip 1
-mAbs:
-mAbsId equ 32
-    .db mAbsId ; id
-    .db mNumId ; parentId
-    .db mAbsNameId ; nameId
-    .db 0 ; numStrips
-    .db 0 ; stripBeginId
-    .dw mAbsHandler ; handler (to be implemented)
-mSign:
-mSignId equ 33
-    .db mSignId ; id
-    .db mNumId ; parentId
-    .db mSignNameId ; nameId
-    .db 0 ; numStrips
-    .db 0 ; stripBeginId
-    .dw mSignHandler ; handler (to be implemented)
-mMod:
-mModId equ 34
-    .db mModId ; id
-    .db mNumId ; parentId
-    .db mModNameId ; nameId
-    .db 0 ; numStrips
-    .db 0 ; stripBeginId
-    .dw mModHandler ; handler (to be implemented)
-mMin:
-mMinId equ 35
-    .db mMinId ; id
-    .db mNumId ; parentId
-    .db mMinNameId ; nameId
-    .db 0 ; numStrips
-    .db 0 ; stripBeginId
-    .dw mMinHandler ; handler (to be implemented)
-mMax:
-mMaxId equ 36
-    .db mMaxId ; id
-    .db mNumId ; parentId
-    .db mMaxNameId ; nameId
-    .db 0 ; numStrips
-    .db 0 ; stripBeginId
-    .dw mMaxHandler ; handler (to be implemented)
-; MenuGroup NUM: children: strip 2
 mIntPart:
-mIntPartId equ 37
+mIntPartId equ 32
     .db mIntPartId ; id
     .db mNumId ; parentId
     .db mIntPartNameId ; nameId
     .db 0 ; numStrips
     .db 0 ; stripBeginId
     .dw mIntPartHandler ; handler (to be implemented)
 mFracPart:
-mFracPartId equ 38
+mFracPartId equ 33
     .db mFracPartId ; id
     .db mNumId ; parentId
     .db mFracPartNameId ; nameId
     .db 0 ; numStrips
     .db 0 ; stripBeginId
     .dw mFracPartHandler ; handler (to be implemented)
 mFloor:
-mFloorId equ 39
+mFloorId equ 34
     .db mFloorId ; id
     .db mNumId ; parentId
     .db mFloorNameId ; nameId
     .db 0 ; numStrips
     .db 0 ; stripBeginId
     .dw mFloorHandler ; handler (to be implemented)
 mCeil:
-mCeilId equ 40
+mCeilId equ 35
     .db mCeilId ; id
     .db mNumId ; parentId
     .db mCeilNameId ; nameId
     .db 0 ; numStrips
     .db 0 ; stripBeginId
     .dw mCeilHandler ; handler (to be implemented)
 mNear:
-mNearId equ 41
+mNearId equ 36
     .db mNearId ; id
     .db mNumId ; parentId
     .db mNearNameId ; nameId
     .db 0 ; numStrips
     .db 0 ; stripBeginId
     .dw mNearHandler ; handler (to be implemented)
+; MenuGroup NUM: children: strip 2
+mAbs:
+mAbsId equ 37
+    .db mAbsId ; id
+    .db mNumId ; parentId
+    .db mAbsNameId ; nameId
+    .db 0 ; numStrips
+    .db 0 ; stripBeginId
+    .dw mAbsHandler ; handler (to be implemented)
+mSign:
+mSignId equ 38
+    .db mSignId ; id
+    .db mNumId ; parentId
+    .db mSignNameId ; nameId
+    .db 0 ; numStrips
+    .db 0 ; stripBeginId
+    .dw mSignHandler ; handler (to be implemented)
+mMod:
+mModId equ 39
+    .db mModId ; id
+    .db mNumId ; parentId
+    .db mModNameId ; nameId
+    .db 0 ; numStrips
+    .db 0 ; stripBeginId
+    .dw mModHandler ; handler (to be implemented)
+mMin:
+mMinId equ 40
+    .db mMinId ; id
+    .db mNumId ; parentId
+    .db mMinNameId ; nameId
+    .db 0 ; numStrips
+    .db 0 ; stripBeginId
+    .dw mMinHandler ; handler (to be implemented)
+mMax:
+mMaxId equ 41
+    .db mMaxId ; id
+    .db mNumId ; parentId
+    .db mMaxNameId ; nameId
+    .db 0 ; numStrips
+    .db 0 ; stripBeginId
+    .dw mMaxHandler ; handler (to be implemented)
 ; MenuGroup PROB: children
 ; MenuGroup PROB: children: strip 0
 mComb:
@@ -1001,46 +1001,46 @@ mBlank116Id equ 116
     .dw mNullHandler ; handler (predefined)
 ; MenuGroup CLR: children
 ; MenuGroup CLR: children: strip 0
+mClearX:
+mClearXId equ 117
+    .db mClearXId ; id
+    .db mClearId ; parentId
+    .db mClearXNameId ; nameId
+    .db 0 ; numStrips
+    .db 0 ; stripBeginId
+    .dw mClearXHandler ; handler (to be implemented)
+mClearStack:
+mClearStackId equ 118
+    .db mClearStackId ; id
+    .db mClearId ; parentId
+    .db mClearStackNameId ; nameId
+    .db 0 ; numStrips
+    .db 0 ; stripBeginId
+    .dw mClearStackHandler ; handler (to be implemented)
 mClearRegs:
-mClearRegsId equ 117
+mClearRegsId equ 119
     .db mClearRegsId ; id
     .db mClearId ; parentId
     .db mClearRegsNameId ; nameId
     .db 0 ; numStrips
     .db 0 ; stripBeginId
     .dw mClearRegsHandler ; handler (to be implemented)
-mBlank118:
-mBlank118Id equ 118
-    .db mBlank118Id ; id
+mBlank120:
+mBlank120Id equ 120
+    .db mBlank120Id ; id
     .db mClearId ; parentId
     .db mNullNameId ; nameId
     .db 0 ; numStrips
     .db 0 ; stripBeginId
     .dw mNullHandler ; handler (predefined)
-mBlank119:
-mBlank119Id equ 119
-    .db mBlank119Id ; id
+mBlank121:
+mBlank121Id equ 121
+    .db mBlank121Id ; id
     .db mClearId ; parentId
     .db mNullNameId ; nameId
     .db 0 ; numStrips
     .db 0 ; stripBeginId
     .dw mNullHandler ; handler (predefined)
-mClearStack:
-mClearStackId equ 120
-    .db mClearStackId ; id
-    .db mClearId ; parentId
-    .db mClearStackNameId ; nameId
-    .db 0 ; numStrips
-    .db 0 ; stripBeginId
-    .dw mClearStackHandler ; handler (to be implemented)
-mClearX:
-mClearXId equ 121
-    .db mClearXId ; id
-    .db mClearId ; parentId
-    .db mClearXNameId ; nameId
-    .db 0 ; numStrips
-    .db 0 ; stripBeginId
-    .dw mClearXHandler ; handler (to be implemented)
 
 ; Table of 2-byte pointers to names in the pool of strings below.
 mMenuNameTable:
@@ -1092,26 +1092,26 @@ mLcmNameId equ 22
     .dw mLcmName
 mPrimeNameId equ 23
     .dw mPrimeName
-mAbsNameId equ 24
-    .dw mAbsName
-mSignNameId equ 25
-    .dw mSignName
-mModNameId equ 26
-    .dw mModName
-mMinNameId equ 27
-    .dw mMinName
-mMaxNameId equ 28
-    .dw mMaxName
-mIntPartNameId equ 29
+mIntPartNameId equ 24
     .dw mIntPartName
-mFracPartNameId equ 30
+mFracPartNameId equ 25
     .dw mFracPartName
-mFloorNameId equ 31
+mFloorNameId equ 26
     .dw mFloorName
-mCeilNameId equ 32
+mCeilNameId equ 27
     .dw mCeilName
-mNearNameId equ 33
+mNearNameId equ 28
     .dw mNearName
+mAbsNameId equ 29
+    .dw mAbsName
+mSignNameId equ 30
+    .dw mSignName
+mModNameId equ 31
+    .dw mModName
+mMinNameId equ 32
+    .dw mMinName
+mMaxNameId equ 33
+    .dw mMaxName
 mCombNameId equ 34
     .dw mCombName
 mPermNameId equ 35
@@ -1228,12 +1228,12 @@ mStackRotDownNameId equ 90
     .dw mStackRotDownName
 mStackExchangeXYNameId equ 91
     .dw mStackExchangeXYName
-mClearRegsNameId equ 92
-    .dw mClearRegsName
+mClearXNameId equ 92
+    .dw mClearXName
 mClearStackNameId equ 93
     .dw mClearStackName
-mClearXNameId equ 94
-    .dw mClearXName
+mClearRegsNameId equ 94
+    .dw mClearRegsName
 
 ; Table of names as NUL terminated C strings.
 mNullName:
@@ -1284,16 +1284,6 @@ mLcmName:
     .db "LCM", 0
 mPrimeName:
     .db "PRIM", 0
-mAbsName:
-    .db "ABS", 0
-mSignName:
-    .db "SIGN", 0
-mModName:
-    .db "MOD", 0
-mMinName:
-    .db "MIN", 0
-mMaxName:
-    .db "MAX", 0
 mIntPartName:
     .db "IP", 0
 mFracPartName:
@@ -1304,6 +1294,16 @@ mCeilName:
     .db "CEIL", 0
 mNearName:
     .db "NEAR", 0
+mAbsName:
+    .db "ABS", 0
+mSignName:
+    .db "SIGN", 0
+mModName:
+    .db "MOD", 0
+mMinName:
+    .db "MIN", 0
+mMaxName:
+    .db "MAX", 0
 mCombName:
     .db "COMB", 0
 mPermName:
@@ -1420,9 +1420,9 @@ mStackRotDownName:
     .db 'R', SdownArrow, 0
 mStackExchangeXYName:
     .db 'X', Sleft, Sconvert, 'Y', 0
-mClearRegsName:
-    .db "CLRG", 0
-mClearStackName:
-    .db "CLST", 0
 mClearXName:
     .db "CLX", 0
+mClearStackName:
+    .db "CLST", 0
+mClearRegsName:
+    .db "CLRG", 0