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

bugfix for shift-clear

Browse Source
This commit is contained in:
Jeff Wang 2019-10-02 23:38:26 -04:00
parent 21be4081b2
commit c3ec112f97
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main.c
View File

@ -141,6 +141,14 @@ static uint8_t Exp_i = 0;
static int8_t I_Key; static int8_t I_Key;
static inline void finish_process_entry (void){ static inline void finish_process_entry (void){
//reset state as initial ENTERING_DONE state
EnteringExp = ENTERING_DONE;
Entry_i = 0;
Exp_i = 0;
ExpBuf[0] = 0;
ExpBuf[1] = 0;
}
//finish entry //finish entry
int8_t exponent; //exponent is only 2 digits int8_t exponent; //exponent is only 2 digits
exponent = 10*ExpBuf[1] + ExpBuf[0]; exponent = 10*ExpBuf[1] + ExpBuf[0];
@ -148,14 +156,11 @@ static inline void finish_process_entry (void){
exponent = -exponent; exponent = -exponent;
} }
EntryBuf[Entry_i] = '\0'; EntryBuf[Entry_i] = '\0';
//process cmd
push_decn(EntryBuf, exponent); push_decn(EntryBuf, exponent);
process_cmd(KEY_MAP[I_Key]); process_cmd(KEY_MAP[I_Key]);
//reset state as initial ENTERING_DONE state //reset to done
EnteringExp = ENTERING_DONE; entering_done();
Entry_i = 0;
Exp_i = 0;
ExpBuf[0] = 0;
ExpBuf[1] = 0;
} }
#ifdef DESKTOP #ifdef DESKTOP
@ -359,10 +364,9 @@ int main()
case 'c': { case 'c': {
if (IsShifted || EnteringExp == ENTERING_DONE){ if (IsShifted || EnteringExp == ENTERING_DONE){
//clear //clear
clear_x(); IsShifted = 0;
NoLift = 1; NoLift = 1;
EnteringExp = ENTERING_SIGNIF; entering_done();
EntryBuf[Entry_i] = '0';
//do not increment entry_i from 0, until first non-0 entry //do not increment entry_i from 0, until first non-0 entry
} else if ( EnteringExp >= ENTERING_EXP){ } else if ( EnteringExp >= ENTERING_EXP){
//go back to digit entry //go back to digit entry
@ -432,7 +436,7 @@ int main()
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();
#endif #endif
if ( EnteringExp == ENTERING_DONE){ if ( EnteringExp == ENTERING_DONE && !NoLift){
disp_exponent = decn_to_str(get_x()); disp_exponent = decn_to_str(get_x());
if (disp_exponent == 0){ if (disp_exponent == 0){
LCD_OutString(Buf, MAX_CHARS_PER_LINE); LCD_OutString(Buf, MAX_CHARS_PER_LINE);