Commit 964942dd authored by Over_score's avatar Over_score

Change 81

parent a3264d0a
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -585,7 +585,8 @@
#define MAX_DENMAX 9999 // Biggest denominator in fraction display mode
#define SCREEN_REFRESH_PERIOD 500 // in milliseconds
#define RAM_SIZE 1024 // 16384 blocks = 65536 bytes MUST be a multiple of 4 and MUST be <= 262140 (not 262144)
#define RAM_SIZE 16384 // 16384 blocks = 65536 bytes MUST be a multiple of 4 and MUST be <= 262140 (not 262144)
//#define RAM_SIZE 3072 // 16384 blocks = 65536 bytes MUST be a multiple of 4 and MUST be <= 262140 (not 262144)
#define CONFIG_SIZE TO_BLOCKS(sizeof(dtConfigDescriptor_t))
......
......@@ -311,11 +311,11 @@
#define ITM_WtoHPM 281
#define ITM_HPUKtoW 282
#define ITM_WtoHPUK 283
#define ITM_IHGtoPA 284
#define ITM_IHGtoPAb 285
#define ITM_PAtoIHG 286
#define ITM_PAtoIHGb 287
#define ITM_INtoM 288
#define ITM_INCHHGtoPA 284
#define ITM_INCHHGtoPAb 285
#define ITM_PAtoINCHHG 286
#define ITM_PAtoINCHHGb 287
#define ITM_INCHtoM 288
#define ITM_MtoINCH 289
#define ITM_WHtoJ 290
#define ITM_JtoWH 291
......@@ -361,8 +361,8 @@
#define ITM_NMItoM 331
#define ITM_MtoPC 332
#define ITM_PCtoM 333
#define ITM_MtoPOINTb 334
#define ITM_MtoPOINT 335
#define ITM_MtoPOINT 334
#define ITM_MtoPOINTb 335
#define ITM_MtoPOINTc 336
#define ITM_POINTtoM 337
#define ITM_POINTtoMb 338
......@@ -1448,13 +1448,13 @@
#define MNU_PROG 1394
#define MNU_TAMLABEL 1395
#define MNU_DYNAMIC 1396
#define ITM_1397 1397
#define ITM_1398 1398
#define ITM_1399 1399
#define ITM_1400 1400
#define ITM_1401 1401
#define ITM_1402 1402
#define ITM_1403 1403
#define MNU_1397 1397
#define MNU_1398 1398
#define MNU_1399 1399
#define MNU_1400 1400
#define MNU_1401 1401
#define MNU_1402 1402
#define MNU_1403 1403
#define ITM_1COMPL 1404
......@@ -1699,7 +1699,7 @@
#define ITM_XCIRC 1643
#define ITM_XtoDATE 1644
#define ITM_XtoALPHA 1645
#define ITM_01636 1646
#define ITM_01646 1646
#define ITM_YEAR 1647
#define ITM_YCIRC 1648
#define ITM_YMD 1649
......
......@@ -555,13 +555,19 @@ void decodeOneStep(uint8_t *step) {
item16 = ((uint16_t)(item8 & 0x7F) << 8) | *(uint8_t *)(step++);
switch(item16) {
case ITM_LBLQ: // 1493
case ITM_FQX: // 1475
case ITM_FDQX: // 1476
case ITM_INDEX: // 1486
case ITM_LBLQ: // 1503
case ITM_MVAR: // 1524
case ITM_PGMINT: // 1546
case ITM_PGMSLV: // 1547
case ITM_SOLVE: // 1608
case ITM_VARMNU: // 1630
case ITM_PIn: // 1671
case ITM_SIGMAn: // 1672
case ITM_INTEGRAL: // 1700
decodeOp(step, indexOfItems[item8].itemCatalogName, PARAM_LABEL);
decodeOp(step, indexOfItems[item16].itemCatalogName, PARAM_LABEL);
break;
case ITM_CNST: // 207
......@@ -598,7 +604,7 @@ void decodeOneStep(uint8_t *step) {
case ITM_SHUFFLE: // 1694
case ITM_PRINTERCHAR: // 1709
case ITM_PRINTERDLAY: // 1710
case ITM_PRINTERMODE: // 1711
case ITM_PRINTERMODE: // 1712
case ITM_PRINTERTAB: // 1717
decodeOp(step, indexOfItems[item16].itemCatalogName, PARAM_NUMBER_8);
break;
......@@ -620,7 +626,6 @@ void decodeOneStep(uint8_t *step) {
case ITM_STOCFG: // 1611
case ITM_STOS: // 1615
case ITM_Tex: // 1625
case ITM_VIEW: // 1632
case ITM_Yex: // 1650
case ITM_Zex: // 1651
case ITM_ALPHALENG: // 1652
......@@ -791,11 +796,11 @@ void decodeOneStep(uint8_t *step) {
case ITM_WtoHPM: // 281
case ITM_HPUKtoW: // 282
case ITM_WtoHPUK: // 283
case ITM_IHGtoPA: // 284
case ITM_IHGtoPAb: // 285
case ITM_PAtoIHG: // 286
case ITM_PAtoIHGb: // 287
case ITM_INtoM: // 288
case ITM_INCHHGtoPA: // 284
case ITM_INCHHGtoPAb: // 285
case ITM_PAtoINCHHG: // 286
case ITM_PAtoINCHHGb: // 287
case ITM_INCHtoM: // 288
case ITM_MtoINCH: // 289
case ITM_WHtoJ: // 290
case ITM_JtoWH: // 291
......@@ -1005,6 +1010,7 @@ void decodeOneStep(uint8_t *step) {
case ITM_BNS: // 1417
case ITM_CLCVAR: // 1420
case ITM_CLFALL: // 1421
case ITM_TGLFRT: // 1422
case ITM_CLLCD: // 1423
case ITM_CLMENU: // 1424
case ITM_CLREGS: // 1427
......@@ -1014,6 +1020,7 @@ void decodeOneStep(uint8_t *step) {
case ITM_CORR: // 1433
case ITM_COV: // 1434
case ITM_BESTFQ: // 1435
case ITM_CROSS_PROD: // 1436
case ITM_CXtoRE: // 1437
case ITM_DATE: // 1438
case ITM_DATEto: // 1439
......@@ -1036,14 +1043,12 @@ void decodeOneStep(uint8_t *step) {
case ITM_END: // 1458
case ITM_ENDP: // 1459
case ITM_ENORM: // 1461
case ITM_EQ_DEL: // 1463
case ITM_EQ_EDI: // 1464
case ITM_EQ_NEW: // 1465
case ITM_ERF: // 1466
case ITM_ERFC: // 1467
case ITM_EXITALL: // 1469
case ITM_EXPT: // 1470
case ITM_FIB: // 1472
case ITM_FLASH: // 1474
case ITM_GD: // 1478
case ITM_GDM1: // 1479
case ITM_GRAD: // 1480
......@@ -1054,7 +1059,11 @@ void decodeOneStep(uint8_t *step) {
case ITM_IXYZ: // 1487
case ITM_IGAMMAP: // 1488
case ITM_IGAMMAQ: // 1489
case ITM_IPLUS: // 1490
case ITM_IMINUS: // 1491
case ITM_JYX: // 1492
case ITM_JPLUS: // 1493
case ITM_JMINUS: // 1494
case ITM_JUL_GREG: // 1495
case ITM_JtoD: // 1496
case ITM_sinc: // 1500
......@@ -1064,9 +1073,6 @@ void decodeOneStep(uint8_t *step) {
case ITM_LmALPHA: // 1506
case ITM_LNBETA: // 1507
case ITM_LNGAMMA: // 1508
case ITM_LOADR: // 1511
case ITM_LOADSS: // 1512
case ITM_LOADSIGMA: // 1513
case ITM_LocRQ: // 1515
case ITM_LR: // 1516
case ITM_MANT: // 1517
......@@ -1075,10 +1081,14 @@ void decodeOneStep(uint8_t *step) {
case ITM_MONTH: // 1521
case ITM_MSG: // 1522
case ITM_MULPI: // 1523
case ITM_M_DELR: // 1525
case ITM_M_DIM: // 1526
case ITM_M_DIMQ: // 1527
case ITM_MDY: // 1528
case ITM_M_GET: // 1531
case ITM_M_LU: // 1535
case ITM_M_NEW: // 1536
case ITM_M_PUT: // 1538
case ITM_M_RR: // 1539
case ITM_sincpi: // 1540
case ITM_NOP: // 1542
case ITM_OFF: // 1543
......@@ -1087,10 +1097,8 @@ void decodeOneStep(uint8_t *step) {
case ITM_PLOT: // 1549
case ITM_Pn: // 1550
case ITM_POINT: // 1551
case ITM_LOADV: // 1552
case ITM_POPLR: // 1553
case ITM_PRCL: // 1554
case ITM_PSTO: // 1555
case ITM_RAD: // 1557
case ITM_RADto: // 1558
case ITM_RAN: // 1559
......
......@@ -312,59 +312,61 @@ void fnPem(uint16_t unusedButMandatoryParameter) {
void insertStepInProgram(int16_t func) {
switch(func) {
case ITM_GTO: // 2
case ITM_GTOP: // 1472
case ITM_GTOP: // 1482
#ifndef DMCP_BUILD
stringToUtf8(indexOfItems[func].itemCatalogName, (uint8_t *)tmpString);
printf("insertStepInProgram: %s\n", tmpString);
#endif // DMCP_BUILD
break;
case ITM_CLP: // 1415
case ITM_CLP: // 1425
fnClP(NOPARAM);
break;
case ITM_CLPALL: // 1416
case ITM_CLPALL: // 1426
fnClPAll(NOT_CONFIRMED);
break;
case ITM_BST: // 1724
case ITM_BST: // 1734
fnBst(NOPARAM);
break;
case ITM_SST: // 1726
case ITM_SST: // 1736
fnSst(NOPARAM);
break;
// Not programmable
case ITM_ASSIGN: // 1401
case ITM_CLALL: // 1409
case ITM_CLREGS: // 1417
case ITM_EQ_DEL: // 1453
case ITM_EQ_EDI: // 1454
case ITM_EQ_NEW: // 1455
case ITM_LOAD: // 1499
case ITM_LOADP: // 1500
case ITM_LOADR: // 1501
case ITM_LOADSS: // 1502
case ITM_LOADSIGMA: // 1503
case ITM_LOADV: // 1542
case ITM_M_DELR: // 1515
case ITM_M_EDI: // 1519
case ITM_M_EDIN: // 1520
case ITM_M_GOTO: // 1522
case ITM_M_GROW: // 1523
case ITM_M_INSR: // 1524
case ITM_M_OLD: // 1527
case ITM_M_WRAP: // 1531
case ITM_PSTO: // 1545
case ITM_RBR: // 1550
case ITM_RESET: // 1558
case ITM_SAVE: // 1576
case ITM_STATUS: // 1600
case ITM_TIMER: // 1612
case ITM_FBR: // 1712
case ITM_UNDO: // 1713
case ITM_SYSTEM: // 1733
case ITM_ASSIGN: // 1411
case ITM_CLALL: // 1419
case ITM_CLREGS: // 1427
case ITM_EQ_DEL: // 1463
case ITM_EQ_EDI: // 1464
case ITM_EQ_NEW: // 1465
case ITM_LOAD: // 1509
case ITM_LOADP: // 1510
case ITM_LOADR: // 1511
case ITM_LOADSS: // 1512
case ITM_LOADSIGMA: // 1513
case ITM_M_DELR: // 1525
case ITM_M_EDI: // 1529
case ITM_M_EDIN: // 1530
case ITM_M_GOTO: // 1532
case ITM_M_GROW: // 1533
case ITM_M_INSR: // 1534
case ITM_M_OLD: // 1537
case ITM_M_WRAP: // 1541
case ITM_LOADV: // 1552
case ITM_PSTO: // 1555
case ITM_RBR: // 1560
case ITM_RESET: // 1568
case ITM_SAVE: // 1586
case ITM_STATUS: // 1610
case ITM_TIMER: // 1622
case ITM_VERS: // 1631
case ITM_WHO: // 1634
case ITM_FBR: // 1722
case ITM_UNDO: // 1723
case ITM_SYSTEM: // 1743
break;
default: {
......
......@@ -334,7 +334,13 @@ uint8_t *findNextStep(uint8_t *step) {
item16 = ((uint16_t)(item8 & 0x7F) << 8) | *(step++);
switch(item16) {
case ITM_LBLQ: // 1493
case ITM_FQX: // 1475
case ITM_FDQX: // 1476
case ITM_INDEX: // 1486
case ITM_LBLQ: // 1503
case ITM_MVAR: // 1524
case ITM_PGMINT: // 1546
case ITM_PGMSLV: // 1547
case ITM_SOLVE: // 1608
case ITM_VARMNU: // 1630
case ITM_PIn: // 1671
......@@ -376,7 +382,7 @@ uint8_t *findNextStep(uint8_t *step) {
case ITM_SHUFFLE: // 1694
case ITM_PRINTERCHAR: // 1709
case ITM_PRINTERDLAY: // 1710
case ITM_PRINTERMODE: // 1711
case ITM_PRINTERMODE: // 1712
case ITM_PRINTERTAB: // 1717
return countOpBytes(step, PARAM_NUMBER_8);
......@@ -395,7 +401,6 @@ uint8_t *findNextStep(uint8_t *step) {
case ITM_STOCFG: // 1611
case ITM_STOS: // 1615
case ITM_Tex: // 1625
case ITM_VIEW: // 1632
case ITM_Yex: // 1650
case ITM_Zex: // 1651
case ITM_ALPHALENG: // 1652
......@@ -564,11 +569,11 @@ uint8_t *findNextStep(uint8_t *step) {
case ITM_WtoHPM: // 281
case ITM_HPUKtoW: // 282
case ITM_WtoHPUK: // 283
case ITM_IHGtoPA: // 284
case ITM_IHGtoPAb: // 285
case ITM_PAtoIHG: // 286
case ITM_PAtoIHGb: // 287
case ITM_INtoM: // 288
case ITM_INCHHGtoPA: // 284
case ITM_INCHHGtoPAb: // 285
case ITM_PAtoINCHHG: // 286
case ITM_PAtoINCHHGb: // 287
case ITM_INCHtoM: // 288
case ITM_MtoINCH: // 289
case ITM_WHtoJ: // 290
case ITM_JtoWH: // 291
......@@ -778,6 +783,7 @@ uint8_t *findNextStep(uint8_t *step) {
case ITM_BNS: // 1417
case ITM_CLCVAR: // 1420
case ITM_CLFALL: // 1421
case ITM_TGLFRT: // 1422
case ITM_CLLCD: // 1423
case ITM_CLMENU: // 1424
case ITM_CLREGS: // 1427
......@@ -787,6 +793,7 @@ uint8_t *findNextStep(uint8_t *step) {
case ITM_CORR: // 1433
case ITM_COV: // 1434
case ITM_BESTFQ: // 1435
case ITM_CROSS_PROD: // 1436
case ITM_CXtoRE: // 1437
case ITM_DATE: // 1438
case ITM_DATEto: // 1439
......@@ -809,14 +816,12 @@ uint8_t *findNextStep(uint8_t *step) {
case ITM_END: // 1458
case ITM_ENDP: // 1459
case ITM_ENORM: // 1461
case ITM_EQ_DEL: // 1463
case ITM_EQ_EDI: // 1464
case ITM_EQ_NEW: // 1465
case ITM_ERF: // 1466
case ITM_ERFC: // 1467
case ITM_EXITALL: // 1469
case ITM_EXPT: // 1470
case ITM_FIB: // 1472
case ITM_FLASH: // 1474
case ITM_GD: // 1478
case ITM_GDM1: // 1479
case ITM_GRAD: // 1480
......@@ -827,7 +832,11 @@ uint8_t *findNextStep(uint8_t *step) {
case ITM_IXYZ: // 1487
case ITM_IGAMMAP: // 1488
case ITM_IGAMMAQ: // 1489
case ITM_IPLUS: // 1490
case ITM_IMINUS: // 1491
case ITM_JYX: // 1492
case ITM_JPLUS: // 1493
case ITM_JMINUS: // 1494
case ITM_JUL_GREG: // 1495
case ITM_JtoD: // 1496
case ITM_sinc: // 1500
......@@ -837,9 +846,6 @@ uint8_t *findNextStep(uint8_t *step) {
case ITM_LmALPHA: // 1506
case ITM_LNBETA: // 1507
case ITM_LNGAMMA: // 1508
case ITM_LOADR: // 1511
case ITM_LOADSS: // 1512
case ITM_LOADSIGMA: // 1513
case ITM_LocRQ: // 1515
case ITM_LR: // 1516
case ITM_MANT: // 1517
......@@ -848,10 +854,14 @@ uint8_t *findNextStep(uint8_t *step) {
case ITM_MONTH: // 1521
case ITM_MSG: // 1522
case ITM_MULPI: // 1523
case ITM_M_DELR: // 1525
case ITM_M_DIM: // 1526
case ITM_M_DIMQ: // 1527
case ITM_MDY: // 1528
case ITM_M_GET: // 1531
case ITM_M_LU: // 1535
case ITM_M_NEW: // 1536
case ITM_M_PUT: // 1538
case ITM_M_RR: // 1539
case ITM_sincpi: // 1540
case ITM_NOP: // 1542
case ITM_OFF: // 1543
......@@ -860,10 +870,8 @@ uint8_t *findNextStep(uint8_t *step) {
case ITM_PLOT: // 1549
case ITM_Pn: // 1550
case ITM_POINT: // 1551
case ITM_LOADV: // 1552
case ITM_POPLR: // 1553
case ITM_PRCL: // 1554
case ITM_PSTO: // 1555
case ITM_RAD: // 1557
case ITM_RADto: // 1558
case ITM_RAN: // 1559
......
......@@ -249,8 +249,8 @@ const int16_t menu_ConvE[] = { ITM_CALtoJ, ITM_JtoCAL,
const int16_t menu_ConvP[] = { ITM_HPEtoW, ITM_WtoHPE, ITM_HPUKtoW, ITM_WtoHPUK, ITM_HPMtoW, ITM_WtoHPM };
const int16_t menu_ConvFP[] = { ITM_LBFtoN, ITM_NtoLBF, ITM_PAtoBAR, ITM_BARtoPA, ITM_PSItoPA, ITM_PAtoPSI,
10000+ITM_IHGtoPAb, 10000+ITM_PAtoIHGb, 10000+ITM_TORtoPAb, 10000+ITM_PAtoTORb, 10000+ITM_ATMtoPA, 10000+ITM_PAtoATM,
20000+ITM_IHGtoPA, 20000+ITM_PAtoIHG, 20000+ITM_TORtoPA, 20000+ITM_PAtoTOR, 20000+ITM_ATMtoPAb, 20000+ITM_PAtoATMb,
10000+ITM_INCHHGtoPAb, 10000+ITM_PAtoINCHHGb, 10000+ITM_TORtoPAb, 10000+ITM_PAtoTORb, 10000+ITM_ATMtoPA, 10000+ITM_PAtoATM,
20000+ITM_INCHHGtoPA, 20000+ITM_PAtoINCHHG, 20000+ITM_TORtoPA, 20000+ITM_PAtoTOR, 20000+ITM_ATMtoPAb, 20000+ITM_PAtoATMb,
ITM_NULL, ITM_NULL, 10000+ITM_MMHGtoPAb, 10000+ITM_PAtoMMHGb, ITM_NULL, ITM_NULL,
ITM_NULL, ITM_NULL, 20000+ITM_MMHGtoPA, 20000+ITM_PAtoMMHG, ITM_NULL, ITM_NULL };
......@@ -263,12 +263,12 @@ const int16_t menu_ConvM[] = { ITM_LBStoKG, ITM_KGtoLBS,
const int16_t menu_ConvX[] = { ITM_AUtoM, ITM_MtoAU, ITM_LYtoM, ITM_MtoLY, ITM_PCtoM, ITM_MtoPC,
ITM_MItoM, ITM_MtoMI, ITM_NMItoM, ITM_MtoNMI, ITM_FTtoM, ITM_MtoFT,
ITM_INtoM, ITM_MtoINCH, ITM_NULL, ITM_NULL, ITM_YDtoM, ITM_MtoYD,
ITM_INCHtoM, ITM_MtoINCH, ITM_NULL, ITM_NULL, ITM_YDtoM, ITM_MtoYD,
ITM_LItoM, ITM_MtoLI, ITM_YINtoM, ITM_MtoYIN, 10000+ITM_ZHANGtoMb, 10000+ITM_MtoZHANGb,
ITM_NULL, ITM_NULL, ITM_NULL, ITM_NULL, 20000+ITM_ZHANGtoM, 20000+ITM_MtoZHANG,
ITM_CHItoM, ITM_MtoCHI, ITM_CUNtoM, ITM_MtoCUN, ITM_FENtoM, ITM_MtoFEN,
10000+ITM_FATHOMtoMb, 10000+ITM_MtoFATHOMb, 10000+ITM_POINTtoMb, 10000+ITM_MtoPOINT, 10000+ITM_FTUStoMc, 10000+ITM_MtoFTUSc,
30000+ITM_FATHOMtoM, 30000+ITM_MtoFATHOM, 30000+ITM_POINTtoM, 30000+ITM_MtoPOINTb, 30000+ITM_FTUStoMb, 30000+ITM_MtoFTUSb,
10000+ITM_FATHOMtoMb, 10000+ITM_MtoFATHOMb, 10000+ITM_POINTtoMb, 10000+ITM_MtoPOINTb, 10000+ITM_FTUStoMc, 10000+ITM_MtoFTUSc,
30000+ITM_FATHOMtoM, 30000+ITM_MtoFATHOM, 30000+ITM_POINTtoM, 30000+ITM_MtoPOINT, 30000+ITM_FTUStoMb, 30000+ITM_MtoFTUSb,
20000+ITM_FATHOMtoMc, 20000+ITM_MtoFATHOMc, 20000+ITM_POINTtoMc, 20000+ITM_MtoPOINTc, 20000+ITM_FTUStoM, 20000+ITM_MtoFTUS };
const int16_t menu_ConvA[] = { 10000+ITM_ACtoM2b, 10000+ITM_M2toACb, ITM_HECTAREtoM2, ITM_M2toHECTARE, 10000+ITM_ACUStoM2b, 10000+ITM_M2toACUSb,
......
......@@ -224,6 +224,10 @@ size_t wp43sMemInBlocks;
}
#endif // __APPLE__
#ifdef __MINGW64__
system("chcp 65001"); // Configure for UTF-8 output on the Windows console
#endif // __MINGW64__
wp43sMemInBlocks = 0;
gmpMemInBytes = 0;
mp_set_memory_functions(allocGmp, reallocGmp, freeGmp);
......
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