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

bugfix for backspacing from exp entry all the back to significand entry

Browse Source 
check for '.' needs to be after entry_i--
This commit is contained in:
Jeff Wang 2019-10-02 22:47:32 -04:00
parent 5a3dc2337d
commit 9fc462ca94
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.c
View File

@ -128,8 +128,8 @@ __xdata uint8_t ExpBuf[2];
__xdata const char VER_STR[32+1] = "STC RPN Calculator v1.03"; __xdata const char VER_STR[32+1] = "STC RPN Calculator v1.03";
#ifdef DESKTOP #ifdef DESKTOP
static void print_entry_bufs(void){ static void print_entry_bufs(int entering_exp){
printf("EntryBuf:~%s~\n", EntryBuf); printf("EntryBuf:~%s~ (%d)\n", EntryBuf, entering_exp);
printf("ExpBuf:%c%c\n", '0'+ExpBuf[1], '0'+ExpBuf[0]); printf("ExpBuf:%c%c\n", '0'+ExpBuf[1], '0'+ExpBuf[0]);
} }
#endif #endif
@ -145,7 +145,6 @@ int main()
{ {
enum { enum {
ENTERING_DONE, ENTERING_DONE,
ENTERING_SIGNIF_NOLIFT,
ENTERING_SIGNIF, ENTERING_SIGNIF,
ENTERING_FRAC, ENTERING_FRAC,
ENTERING_EXP, ENTERING_EXP,
@ -358,10 +357,10 @@ int main()
ExpBuf[1] = 0; ExpBuf[1] = 0;
} else if (entry_i > 0){ } else if (entry_i > 0){
//backspace //backspace
if (EntryBuf[entry_i] == '.'){
entering_exp--;
}
entry_i--; entry_i--;
if (EntryBuf[entry_i] == '.'){
entering_exp = ENTERING_SIGNIF;
}
} }
} break; } break;
////////// //////////
@ -430,7 +429,7 @@ int main()
#ifdef DESKTOP #ifdef DESKTOP
print_lcd(); print_lcd();
printf("entry_i=%d,exp_i=%d\n", entry_i, exp_i); printf("entry_i=%d,exp_i=%d\n", entry_i, exp_i);
print_entry_bufs(); print_entry_bufs(entering_exp);
#endif #endif
if (entering_exp == ENTERING_DONE){ if (entering_exp == ENTERING_DONE){
disp_exponent = decn_to_str(get_x()); disp_exponent = decn_to_str(get_x());
@ -483,7 +482,7 @@ int main()
#ifdef DESKTOP #ifdef DESKTOP
print_lcd(); print_lcd();
printf("entry_i=%d,exp_i=%d\n", entry_i, exp_i); printf("entry_i=%d,exp_i=%d\n", entry_i, exp_i);
print_entry_bufs(); print_entry_bufs(entering_exp);
LcdAvailable.release(); LcdAvailable.release();
#endif #endif
//turn backlight back on //turn backlight back on