Skip to content

Convert all C and C++ source files to UTF-8 #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Convert all C and C++ source files to UTF-8 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Applications/uTaskerBoot/Simulator/StdAfx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// stdafx.cpp : Quelltextdatei, die nur die Standard-Includes einbindet
// Ethernet1.pch ist die vorkompilierte Header-Datei
// stdafx.obj enth�lt die vorkompilierte Typinformation
// stdafx.obj enthält die vorkompilierte Typinformation

#include "stdafx.h"

// ZU ERLEDIGEN: Verweis auf alle zus�tzlichen Header-Dateien, die Sie in STDAFX.H
// und nicht in dieser Datei ben�tigen
// ZU ERLEDIGEN: Verweis auf alle zusätzlichen Header-Dateien, die Sie in STDAFX.H
// und nicht in dieser Datei benötigen
2 changes: 1 addition & 1 deletion Applications/uTaskerBoot/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down
2 changes: 1 addition & 1 deletion Applications/uTaskerBoot/uTaskerBootLoader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down
2 changes: 1 addition & 1 deletion Applications/uTaskerSerialBoot/Loader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down
6 changes: 3 additions & 3 deletions Applications/uTaskerSerialBoot/Simulator/StdAfx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// stdafx.cpp : Quelltextdatei, die nur die Standard-Includes einbindet
// Ethernet1.pch ist die vorkompilierte Header-Datei
// stdafx.obj enth�lt die vorkompilierte Typinformation
// stdafx.obj enthält die vorkompilierte Typinformation

#include "stdafx.h"

// ZU ERLEDIGEN: Verweis auf alle zus�tzlichen Header-Dateien, die Sie in STDAFX.H
// und nicht in dieser Datei ben�tigen
// ZU ERLEDIGEN: Verweis auf alle zusätzlichen Header-Dateien, die Sie in STDAFX.H
// und nicht in dieser Datei benötigen
2 changes: 1 addition & 1 deletion Applications/uTaskerSerialBoot/TaskConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down
2 changes: 1 addition & 1 deletion Applications/uTaskerSerialBoot/app_hw_stm32.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down
14 changes: 7 additions & 7 deletions Applications/uTaskerSerialBoot/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down Expand Up @@ -1404,7 +1404,7 @@

#define WEB_PARAMETER_GENERATION // support of parameter generating (eg. manipulating select and adding values)
#define WEB_PARAMETER_HANDLING // support handling of received web parameters
#define WEB_PARSER_START '�' // this symbol is used in Web pages to instruct parsing to begin
#define WEB_PARSER_START '\xA3' // this symbol is used in Web pages to instruct parsing to begin
#define WEB_INSERT_STRING 'v'
#define WEB_DISABLE_FIELD 'D'
#define WEB_NOT_DISABLE_FIELD 'd'
Expand All @@ -1416,11 +1416,11 @@
#define FILE404_IN_PROG // fixed FILE404 in Code (no NE64 support since it pages the file system in memory)
#endif

#define FILE_404_CONTENT "<html><head><title>�vN0 Loader</title></head><body bgcolor=#d0d000 text=#000000 topmargin=3 marginheight=3><center><td valign=top class=h> \
<font color=#ff0000 style=font-size:30px><b style='mso-bidi-font-weight:normal'>�vN0</font> - Loader (�vV0)</b></td><br><td align=left><br><br> \
<form action=webpage.html name=e1><input type=submit value=""Erase-Application"" name=e>Enter Password <input maxLength=17 size=17 name=c1 value=""�ve0""> �vV1</form> \
<form action=0S.bin enctype=""multipart/form-data"" method=""post""><p><input type=""file"" name=""datafile"" size=""30""><input type=""submit"" value=""Upload"" �ds0></p></form> \
<br><form action=webpage.html name=e0><input type=submit value=""Mass-Erase"" name=e>Enter Password <input maxLength=17 size=17 name=c0 value=""�ve0""></form> \
#define FILE_404_CONTENT "<html><head><title>\xA3vN0 Loader</title></head><body bgcolor=#d0d000 text=#000000 topmargin=3 marginheight=3><center><td valign=top class=h> \
<font color=#ff0000 style=font-size:30px><b style='mso-bidi-font-weight:normal'>\xA3vN0</font> - Loader (\xA3vV0)</b></td><br><td align=left><br><br> \
<form action=webpage.html name=e1><input type=submit value=""Erase-Application"" name=e>Enter Password <input maxLength=17 size=17 name=c1 value=""\xA3ve0""> \xA3vV1</form> \
<form action=0S.bin enctype=""multipart/form-data"" method=""post""><p><input type=""file"" name=""datafile"" size=""30""><input type=""submit"" value=""Upload"" \xA3ds0></p></form> \
<br><form action=webpage.html name=e0><input type=submit value=""Mass-Erase"" name=e>Enter Password <input maxLength=17 size=17 name=c0 value=""\xA3ve0""></form> \
<br></font></td></body></html>";

#define _FIXED_WEB_PAGE_404 // force 404 error on every file served
Expand Down
2 changes: 1 addition & 1 deletion Applications/uTaskerSerialBoot/disk_loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down
2 changes: 1 addition & 1 deletion Applications/uTaskerSerialBoot/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down
2 changes: 1 addition & 1 deletion Applications/uTaskerSerialBoot/usb_application.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down
2 changes: 1 addition & 1 deletion Applications/uTaskerSerialBoot/usb_device_loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down
2 changes: 1 addition & 1 deletion Applications/uTaskerSerialBoot/usb_host_loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down
2 changes: 1 addition & 1 deletion Applications/uTaskerSerialBoot/usb_msd_descriptors.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down
6 changes: 3 additions & 3 deletions Applications/uTaskerSerialBoot/webInterface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down Expand Up @@ -142,7 +142,7 @@ extern void fnConfigureAndStartWebServer(void)
static unsigned char fnIsSelected(unsigned char *ptrBuffer)
{
int iDisabled = 0;
// Format �sAB (length assumed to be 4 bytes, even when both parameters are not used)
// Format \xA3sAB (length assumed to be 4 bytes, even when both parameters are not used)
//
switch (*(ptrBuffer + 1)) {
case 's':
Expand Down Expand Up @@ -259,7 +259,7 @@ static CHAR *fnInsertString(unsigned char *ptrBuffer, LENGTH_CHUNK_COUNT TxLengt
static CHAR *fnInsertString(unsigned char *ptrBuffer, LENGTH_CHUNK_COUNT TxLength, unsigned short *usLengthToSend)
#endif
{
// �vXY commands - to display a value, string etc.
// \xA3vXY commands - to display a value, string etc.
//
#if !defined WEB_ESCAPE_LEN
#define WEB_ESCAPE_LEN 4
Expand Down
2 changes: 1 addition & 1 deletion Applications/uTaskerV1.4/ADC_Timers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down
2 changes: 1 addition & 1 deletion Applications/uTaskerV1.4/FreeMaster.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down
2 changes: 1 addition & 1 deletion Applications/uTaskerV1.4/FreeRTOSapplication.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down
2 changes: 1 addition & 1 deletion Applications/uTaskerV1.4/KeyScan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down
2 changes: 1 addition & 1 deletion Applications/uTaskerV1.4/NetworkIndicator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down
2 changes: 1 addition & 1 deletion Applications/uTaskerV1.4/Port_Interrupts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down
6 changes: 3 additions & 3 deletions Applications/uTaskerV1.4/Simulator/StdAfx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// stdafx.cpp : Quelltextdatei, die nur die Standard-Includes einbindet
// Ethernet1.pch ist die vorkompilierte Header-Datei
// stdafx.obj enth�lt die vorkompilierte Typinformation
// stdafx.obj enthält die vorkompilierte Typinformation

#include "stdafx.h"

// ZU ERLEDIGEN: Verweis auf alle zus�tzlichen Header-Dateien, die Sie in STDAFX.H
// und nicht in dieser Datei ben�tigen
// ZU ERLEDIGEN: Verweis auf alle zusätzlichen Header-Dateien, die Sie in STDAFX.H
// und nicht in dieser Datei benötigen
2 changes: 1 addition & 1 deletion Applications/uTaskerV1.4/TaskConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down
2 changes: 1 addition & 1 deletion Applications/uTaskerV1.4/app_hw_kinetis.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down
2 changes: 1 addition & 1 deletion Applications/uTaskerV1.4/app_hw_stm32.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down
8 changes: 4 additions & 4 deletions Applications/uTaskerV1.4/app_user_files.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down Expand Up @@ -266,12 +266,12 @@ static const unsigned char ST_favicon[] = {
#define LCD_WEB_INTERFACE // allow posting an image to the display and displaying the image in the LCD on a web page
#endif

//static const CHAR ajax1[] = "<Dummy>�vX4</Dummy>"; // example of file used for ajax interpetation
//static const CHAR ajax1[] = "<Dummy>\xA3vX4</Dummy>"; // example of file used for ajax interpetation
//static const CHAR link_page[] = "This is another embedded page - <a href=""0.htm"">Go to main start page</a>";
//static const CHAR start_page[] = "<html><head><title>uTasker Test</title></head><body>This is a start test page embedded in the code<br><a href=""0.htm"">Go to main start page</a><br><a href=""link.htm"">Test another embedded page</a></body></html>";
static const CHAR gen_binary[] = "�H10"; // command generation of large binary content
static const CHAR gen_binary[] = "\xA3H10"; // command generation of large binary content
#if defined LCD_WEB_INTERFACE // {1}{2}
static const CHAR gen_bmp[] = "�H20"; // command to generate a BMP from the present LCD display content
static const CHAR gen_bmp[] = "\xA3H20"; // command to generate a BMP from the present LCD display content
#endif

static const USER_FILE user_files[] = {
Expand Down
2 changes: 1 addition & 1 deletion Applications/uTaskerV1.4/application.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down
2 changes: 1 addition & 1 deletion Applications/uTaskerV1.4/application.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down
2 changes: 1 addition & 1 deletion Applications/uTaskerV1.4/application_lcd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down
2 changes: 1 addition & 1 deletion Applications/uTaskerV1.4/can_tests.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down
4 changes: 2 additions & 2 deletions Applications/uTaskerV1.4/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down Expand Up @@ -2243,7 +2243,7 @@

#define WEB_PARAMETER_GENERATION // support of parameter generating (eg. manipulating select and adding values)
#define WEB_PARAMETER_HANDLING // support handling of received web parameters
#define WEB_PARSER_START '\xa3' //'�' // this symbol is used in Web pages to instruct parsing to begin
#define WEB_PARSER_START '\xa3' //'\xA3' // this symbol is used in Web pages to instruct parsing to begin
#define WEB_INSERT_STRING 'v'
#define WEB_DISABLE_FIELD 'D'
#define WEB_NOT_DISABLE_FIELD 'd'
Expand Down
4 changes: 2 additions & 2 deletions Applications/uTaskerV1.4/debug.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down Expand Up @@ -2904,7 +2904,7 @@ static void fnShowCoordinates(COORDINATE *coord)

static int fnGetCoordinates(COORDINATE *coord, CHAR *ptrInput)
{
// Input: 50D46M30S or 50� 46' 30''
// Input: 50D46M30S or 50° 46' 30''
CHAR *pInput = ptrInput;

pInput = fStrchr(ptrInput, 'D');
Expand Down
2 changes: 1 addition & 1 deletion Applications/uTaskerV1.4/debug_hal_kinetis.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down
2 changes: 1 addition & 1 deletion Applications/uTaskerV1.4/debug_hal_stm32.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Mark Butcher Bsc (Hons) MPhil MIET

M.J.Butcher Consulting
Birchstrasse 20f, CH-5406, R�tihof
Birchstrasse 20f, CH-5406, Rütihof
Switzerland

www.uTasker.com Skype: M_J_Butcher
Expand Down
Loading