gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-18 13:42:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug where negative sign infront of parenthesis as first character was parsed incorrectly

Browse Source
This commit is contained in:
Ajax 2018-04-28 21:38:54 -04:00
parent 9c6e43b20d
commit 1feb8316d9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
keyboards/dz60/keymaps/60_calc/keymap.c
View File

@ -148,12 +148,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
}; };
static char backspaceText[BUFFER_SIZE + 1]; // Pretty dumb waste of memory because only backspace characters, used with send_string to backspace and remove input static char backspaceText[BUFFER_SIZE + 1]; // Pretty dumb waste of memory because only backspace characters, used with send_string to backspace and remove input
static char text[BUFFER_SIZE + 1]; // Used to store input and then output when ready to print static char text[BUFFER_SIZE + 1] = {[0] = '0'}; // Used to store input and then output when ready to print
static unsigned char inputLocation = 0; // Current index in text input static unsigned char inputLocation = 1; // Current index in text input
/*-----
Known Problem: A negative sign before an open parenthesis as the first character in the input such as "-(4+3)" will not be parsed correctly, a very hacky solution would be to force the first character of the input to be a 0
-----*/
double calc(char input[]) // Finds value of input char array, relatively small and fast I think double calc(char input[]) // Finds value of input char array, relatively small and fast I think
{ {
char inputToken[BUFFER_SIZE + 1]; // Input buffer, used when a single token (generally a number) takes up more char inputToken[BUFFER_SIZE + 1]; // Input buffer, used when a single token (generally a number) takes up more
@ -213,7 +210,7 @@ double calc(char input[]) // Finds value of input char array, relatively small a
tokens[tokenCount].raw.op.priority = PRIO_DIV; tokens[tokenCount].raw.op.priority = PRIO_DIV;
break; break;
case CHAR_EXP: case CHAR_EXP:
tokens[tokenCount].raw.op.priority = PRIO_EXP tokens[tokenCount].raw.op.priority = PRIO_EXP;
tokens[tokenCount].raw.op.ltr = false; tokens[tokenCount].raw.op.ltr = false;
break; break;
case CHAR_SIN: case CHAR_SIN:
@ -501,7 +498,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record)
characterPressed = '.'; characterPressed = '.';
break; break;
case KC_BSPC: case KC_BSPC:
if(inputLocation > 0) if(inputLocation > 1)
{ {
inputLocation--; inputLocation--;
} }
@ -514,7 +511,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record)
forceReturnTrue = true; forceReturnTrue = true;
break; break;
case CALC: case CALC:
for(int i = 0; i < inputLocation; i++) for(int i = 0; i < inputLocation - 1; i++)
{ {
backspaceText[i] = (char)8; backspaceText[i] = (char)8;
} }
@ -526,6 +523,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record)
text[i] = '\0'; text[i] = '\0';
backspaceText[i] = '\0'; backspaceText[i] = '\0';
} }
text[0] = '0'; // Fixes error with
inputLocation = 1; // Restart at one to ensure the first character is a 0
break; break;
case ENDCALC: case ENDCALC:
layer_state = 0; layer_state = 0;
@ -584,3 +583,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record)
return true; return true;
} }
} }