FX 02.42.0000

This commit is contained in:
CalcLoverHK 2024-01-25 02:57:43 +08:00
parent 033eac1ad4
commit 755d7172bb
8 changed files with 25 additions and 20 deletions

View File

@ -5,7 +5,7 @@
[BINDATA] : "FXADDINror.bin"
[DISPNAME] : "CBASIC"
[APPNAME] : "@CBASIC"
[VERSION] : "02.41.1000"
[VERSION] : "02.42.0000"
[APL_ICON] : "MainIcon.bmp"
[MODULE_NUM] : 0
[MOD1_TITLE] : "CBASIC"

View File

@ -1,6 +1,6 @@
[DLSimProject]
Name=CBASIC
Version=02.41.1000
Version=02.42.0000
Model=:fx-9860G.dlm
SourcePath=.
MemoryPath=INIT

View File

@ -3625,7 +3625,7 @@ int fileObjectAlign4k( unsigned int n ){ return n; } // align +4byte
int fileObjectAlign4l( unsigned int n ){ return n; } // align +4byte
int fileObjectAlign4m( unsigned int n ){ return n; } // align +4byte
int fileObjectAlign4n( unsigned int n ){ return n; } // align +4byte
int fileObjectAlign4o( unsigned int n ){ return n; } // align +4byte
//int fileObjectAlign4o( unsigned int n ){ return n; } // align +4byte
//int fileObjectAlign4p( unsigned int n ){ return n; } // align +4byte
//int fileObjectAlign4q( unsigned int n ){ return n; } // align +4byte
//int fileObjectAlign4r( unsigned int n ){ return n; } // align +4byte

View File

@ -29,8 +29,8 @@ int selectMatrix=0;
int StackPtr;
const char VerMSG[]="C.Basic v2.41\xE6\x41";
#define VERSION 241
const char VerMSG[]="C.Basic v2.42\xE6\x41";
#define VERSION 242
//---------------------------------------------------------------------------------------------
void GetMemFreeStr10( char *buffer );
@ -50,7 +50,7 @@ void VerDispSub( int flag ) {
locate( 3, 3 ); Print( (unsigned char*)"(Casio Basic" );
locate( 3, 4 ); Print( (unsigned char*)" compatible+)" );
locate( 3, 5 ); Print( (unsigned char*)" by sentaro21" );
locate( 3, 6 ); Print( (unsigned char*)" (c)2019" );
locate( 3, 6 ); Print( (unsigned char*)" (c)2020" );
// if ( ( UseHiddenRAM ) && ( IsHiddenRAM ) ) {
// freearea = HiddenRAM_MatTopPtr - HiddenRAM_ProgNextPtr ;

View File

@ -120,19 +120,18 @@ double Integral_Kronrod( char *SRC, int execptr, double A, double B, double tol
D *= G; // G*D->D
E *= G; // G*E->E
if ( tol>=1 ) {
E = Round(E,Sci,(int)tol);
if ( E==Round(D,Sci,(int)tol) ) { // If RndFix(D,Sci C+1)=RndFix(E,Sci C+1)Then
if ( Round(E,Sci,(int)tol)==Round(D,Sci,(int)tol) ) { // If RndFix(D,Sci C+1)=RndFix(E,Sci C+1)Then
break; // Break
} // IfEnd
} else {
if ( fabs(D-E)<=tol ) { // If Abs(D-E)<tol Then
E = Round(E,Fix,-log10(tol));
D = Round(E,Fix,-log10(tol));
break;
}
}
} // Next
if ( j>4 ) { // If N%>3 Then "**ACCURACY NOT MET**"
CB_Error(NotAccuracyERR); return (D+E)/2;
CB_Error(NotAccuracyERR);
} // IfEnd
exit:
regX.real=xreg;
@ -159,12 +158,12 @@ void IntgralOprand( char *SRC, double *start, double *end, double *tol ){ // Int
if ( SRC[ExecPtr] == ',' ) {
ExecPtr++;
*tol=CB_EvalDbl( SRC ); // tol
} else *tol=10;
} else *tol=6;
if ( SRC[ExecPtr] == ')' ) ExecPtr++;
if ( errflag ) {
ExecPtr=exptr;
regX=Dbl2Cplx(*start);
regX=Dbl2Cplx(((*start)+(*end))/2);
ErrorPtr= 0;
ErrorNo = 0; // error cancel
goto restart;
@ -189,6 +188,11 @@ double CB_Integral( char *SRC ){ // Integral( FX, start, end, tol )
}
double CB_Differ( char *SRC ){ // Differ( FX, tol )
int exptr=ExecPtr;
int errflag=0;
double data;
restart:
CB_EvalDbl( SRC ); // dummy read
return 0;
}

View File

@ -852,6 +852,7 @@ void CB_DrawMat( char *SRC ) { // DrawMat Mat A[x,y],px,py,width, height[,zoomwi
}
ML_bmp_zoom( (unsigned char*)MatAry[reg2].Adrs, xx, yy, width, height, zoomwidth,zoomheight, color) ;
// DeleteMatrix( reg2 );
dspflag=0;
}
//-----------------------------------------------------------------------------------------MLtest
@ -1136,8 +1137,8 @@ int MLObjectAlign4o( unsigned int n ){ return n; } // align +4byte
int MLObjectAlign4p( unsigned int n ){ return n; } // align +4byte
int MLObjectAlign4q( unsigned int n ){ return n; } // align +4byte
int MLObjectAlign4r( unsigned int n ){ return n; } // align +4byte
int MLObjectAlign4s( unsigned int n ){ return n; } // align +4byte
int MLObjectAlign4t( unsigned int n ){ return n; } // align +4byte
//int MLObjectAlign4s( unsigned int n ){ return n; } // align +4byte
//int MLObjectAlign4t( unsigned int n ){ return n; } // align +4byte
//int MLObjectAlign4u( unsigned int n ){ return n; } // align +4byte
//int MLObjectAlign4v( unsigned int n ){ return n; } // align +4byte
//int MLObjectAlign4w( unsigned int n ){ return n; } // align +4byte

View File

@ -2464,10 +2464,10 @@ void CB_RclVWin( char *SRC ) {
}
//----------------------------------------------------------------------------------------------
//int GObjectAlign4d( unsigned int n ){ return n; } // align +4byte
//int GObjectAlign4e( unsigned int n ){ return n; } // align +4byte
//int GObjectAlign4f( unsigned int n ){ return n; } // align +4byte
//int GObjectAlign4g( unsigned int n ){ return n; } // align +4byte
int GObjectAlign4d( unsigned int n ){ return n; } // align +4byte
int GObjectAlign4e( unsigned int n ){ return n; } // align +4byte
int GObjectAlign4f( unsigned int n ){ return n; } // align +4byte
int GObjectAlign4g( unsigned int n ){ return n; } // align +4byte
//int GObjectAlign4h( unsigned int n ){ return n; } // align +4byte
//int GObjectAlign4i( unsigned int n ){ return n; } // align +4byte
//int GObjectAlign4j( unsigned int n ){ return n; } // align +4byte

View File

@ -522,8 +522,8 @@ void ML_line(int x1, int y1, int x2, int y2, ML_Color color)
dy = y2 - y1;
sx = sgn(dx);
sy = sgn(dy);
dx = abs(dx); if ( dx>127 ) dx=127;
dy = abs(dy); if ( dy> 63 ) dy= 63;
dx = abs(dx);
dy = abs(dy);
ML_pixel(x, y, color);
if(dx > dy)
{