Commit 3ba77c7e authored by Over_score's avatar Over_score

Merge branch...

Merge branch '400-minor-issue-in-alpha-input-mode-f-sqrt-shall-enter-a-checkmark-u-2713' into 'master'

In alpha input mode, [f]+[sqrt] enter a checkmark now

Closes #400

See merge request !491
parents 39aaf79a 67cc9b3b
No preview for this file type
......@@ -28,7 +28,7 @@ const calcKey_t kbd_std[37] = {
{23, -MNU_TRI, ITM_DMS, ITM_pi, ITM_NULL, CHR_C, ITM_NULL, CHR_GAMMA, ITM_ST_C },
{24, ITM_LN, KEY_dotD, ITM_LOG10, ITM_NULL, CHR_D, ITM_NULL, CHR_DELTA, ITM_ST_D }, // if f or g are changed: adapt the function btnClicked section if(calcMode == CM_NIM) in keyboard.c. Case D for decimal base
{25, ITM_EX, ITM_toHMS, ITM_10x, ITM_NULL, CHR_E, ITM_NULL, CHR_EPSILON, ITM_NULL },
{26, ITM_SQUAREROOTX, ITM_AIM, -MNU_ALPHAFN, CHR_SQUARE_ROOT, CHR_F, CHR_SQUARE_ROOT, CHR_PHI, CHR_alpha },
{26, ITM_SQUAREROOTX, ITM_AIM, -MNU_ALPHAFN, CHR_CHECK_MARK, CHR_F, CHR_CHECK_MARK, CHR_PHI, CHR_alpha },
{31, ITM_STO, ITM_ASSIGN, ITM_SAVE, ITM_NULL, CHR_G, ITM_ASSIGN, CHR_GAMMA, ITM_NULL },
{32, ITM_RCL, ITM_VIEW, -MNU_CNST, ITM_NULL, CHR_H, ITM_NULL, CHR_CHI, ITM_HEX },
......
......@@ -349,7 +349,7 @@ void fnBatteryVoltage(uint16_t unusedParamButMandatory) {
#endif
#ifdef DMCP_BUILD
int32ToReal39(read_power_voltage(), &value);
int32ToReal(read_power_voltage(), &value);
#endif
realDivide(&value, const_1000, &value, &ctxtReal39);
......
......@@ -1561,7 +1561,7 @@ const item_t indexOfItems[] = {
/* 1435 */ { itemToBeCoded, NOPARAM, "", STD_CONTOUR_INTEGRAL, CAT_NONE, SLS_UNCHANGED},
/* 1436 */ { itemToBeCoded, NOPARAM, "", STD_SURFACE_INTEGRAL, CAT_NONE, SLS_UNCHANGED},
/* 1437 */ { itemToBeCoded, NOPARAM, "", STD_RATIO, CAT_NONE, SLS_UNCHANGED},
/* 1438 */ { itemToBeCoded, NOPARAM, "1438", "1438", CAT_FREE, SLS_UNCHANGED},
/* 1438 */ { addItemToBuffer, CHR_CHECK_MARK, "", STD_CHECK_MARK, CAT_NONE, SLS_UNCHANGED},
/* 1439 */ { itemToBeCoded, NOPARAM, "", STD_ASYMPOTICALLY_EQUAL, CAT_NONE, SLS_UNCHANGED},
/* 1440 */ { addItemToBuffer, CHR_ALMOST_EQUAL, "", STD_ALMOST_EQUAL, CAT_NONE, SLS_UNCHANGED},
/* 1441 */ { addItemToBuffer, CHR_COLON_EQUALS, "", STD_COLON_EQUALS, CAT_NONE, SLS_UNCHANGED},
......
......@@ -1470,7 +1470,7 @@
#define CHR_CONTOUR_INTEGRAL 1435
#define CHR_SURFACE_INTEGRAL 1436
#define CHR_RATIO 1437
#define CHR_TILDE_b 1438
#define CHR_CHECK_MARK 1438
#define CHR_ASYMPOTICALLY_EQUAL 1439
#define CHR_ALMOST_EQUAL 1440
#define CHR_COLON_EQUALS 1441
......
......@@ -1990,7 +1990,7 @@ void printRealToConsole(const real_t *value) {
}
while(value->lsu[i] == 0) i--;
printf("%u", value->lsu[i--]);
printf("%" FMT16U, value->lsu[i--]);
exponent = value->exponent;
last = 0;
......@@ -2000,11 +2000,11 @@ void printRealToConsole(const real_t *value) {
}
for(; i>=last; i--) {
printf(" %03u", value->lsu[i]);
printf(" %03" FMT16U, value->lsu[i]);
}
if(exponent != 0) {
printf(" e %d", exponent);
printf(" e %" FMT32S, exponent);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment