mirror of
https://github.com/dimoniche/solarium.vlad.git
synced 2026-01-30 04:53:30 +03:00
Исправление ошибок
This commit is contained in:
parent
650ba39500
commit
b59e345abd
@ -6,36 +6,3 @@ char* get_service_name()
|
||||
{
|
||||
return service_name;
|
||||
}
|
||||
|
||||
// Returns the number of characters in an UTF-8 encoded string.
|
||||
// (Does not check for encoding validity)
|
||||
int u8strlen(const char *s)
|
||||
{
|
||||
int len=0;
|
||||
while (*s) {
|
||||
if ((*s & 0xC0) != 0x80) len++ ;
|
||||
s++;
|
||||
}
|
||||
return len;
|
||||
}
|
||||
|
||||
// Avoids truncating multibyte UTF-8 encoding at the end.
|
||||
char *u8strncpy(char *dest, const char *src, size_t n)
|
||||
{
|
||||
int k = n-1;
|
||||
int i;
|
||||
if (n) {
|
||||
dest[k] = 0;
|
||||
strncpy(dest,src,n);
|
||||
if (dest[k] & 0x80) { // Last byte has been overwritten
|
||||
for (i=k; (i>0) && ((k-i) < 3) && ((dest[i] & 0xC0) == 0x80); i--) ;
|
||||
switch(k-i) {
|
||||
case 0: dest[i] = '\0'; break;
|
||||
case 1: if ( (dest[i] & 0xE0) != 0xC0) dest[i] = '\0'; break;
|
||||
case 2: if ( (dest[i] & 0xF0) != 0xE0) dest[i] = '\0'; break;
|
||||
case 3: if ( (dest[i] & 0xF8) != 0xF0) dest[i] = '\0'; break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return dest;
|
||||
}
|
||||
|
||||
@ -591,7 +591,7 @@ void TermAppTask(void *p_arg)
|
||||
packet_len += ttk2_tag_add(&content[packet_len], 0x06, "60", 1);
|
||||
|
||||
// Product name
|
||||
packet_len += ttk2_tag_add(&content[packet_len], 0x0F, get_service_name(), strlen(get_service_name()));
|
||||
packet_len += ttk2_tag_add(&content[packet_len], 0x0F, get_service_name(), 43);
|
||||
|
||||
// äëèíà â ïàêåòå
|
||||
ttk2_tag_setlen(term_buffer, packet_len + 2);
|
||||
|
||||
@ -25,7 +25,7 @@ if not "%~1" == "" goto debugFile
|
||||
|
||||
@echo on
|
||||
|
||||
"C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" --backend -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl"
|
||||
"C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" --backend -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl"
|
||||
|
||||
@echo off
|
||||
goto end
|
||||
@ -34,7 +34,7 @@ goto end
|
||||
|
||||
@echo on
|
||||
|
||||
"C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" "--debug_file=%~1" --backend -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl"
|
||||
"C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" "--debug_file=%~1" --backend -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl"
|
||||
|
||||
@echo off
|
||||
:end
|
||||
@ -23,9 +23,9 @@
|
||||
|
||||
if ($debugfile -eq "")
|
||||
{
|
||||
& "C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" --backend -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl"
|
||||
& "C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" --backend -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl"
|
||||
}
|
||||
else
|
||||
{
|
||||
& "C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" --debug_file=$debugfile --backend -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl"
|
||||
& "C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" --debug_file=$debugfile --backend -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl"
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
"C:\Program Files\IAR Systems\Embedded Workbench 9.0\arm\bin\armJLINK.dll"
|
||||
|
||||
"C:\git_work\solarium.vlad\Solarium Vlad\Exe\sk_mlpc2368.out"
|
||||
"C:\work\solarium.vlad\Solarium Vlad\Exe\sk_mlpc2368.out"
|
||||
|
||||
--plugin="C:\Program Files\IAR Systems\Embedded Workbench 9.0\arm\bin\armbat.dll"
|
||||
|
||||
|
||||
File diff suppressed because one or more lines are too long
2886
sk-mlpc2368.dep
2886
sk-mlpc2368.dep
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user