Commit 3357ce65 authored by axel.maurer's avatar axel.maurer
Browse files

Changed to DEV Kit Version 4.05

parent d0b26799
......@@ -202,10 +202,12 @@ void StartBeep(void)
{
// Etwas piepsen zum Start, nicht ganz so laut:
// Beep(Volume, Freq, OnTime, OffTime)
#ifndef READER_ACTION
Beep(50, 392, 75, 20);
Beep(50, 392, 75, 30);
Beep(50, 523, 88, 20);
Beep(50, 523, 88, 30);
#endif
Beep(50, 659, 75, 20);
Beep(50, 523, 75, 40);
Beep(50, 392, 90, 20);
......@@ -1813,7 +1815,14 @@ int main(void)
char resultBuffer[MBUFFER_LEN];
char parmStr[100];
byte parmByteBuffer[PARM_BUFFER_LEN];
const byte cfgParams[] = {SUPPORT_CONFIGCARD, 1, SUPPORT_CONFIGCARD_ON, TLV_END};
const byte cfgParams[] = {
SUPPORT_CONFIGCARD, 1, SUPPORT_CONFIGCARD_ON,
USB_KEYBOARDREPEATRATE,1,1,
#ifdef GERMAN_KEYBOARD
USB_KEYBOARDLAYOUT, 1, USB_KEYBOARDLAYOUT_GERMAN,
#endif
TLV_END
};
pStr = pStr;
// Parameter setzen
......
......@@ -7,23 +7,25 @@ set PROJECT_SOURCE=KIT-Card
set PROJECT=KIT-Card_Reader
rem Development KIT Version
set DEV_VERSION=401b
set DEV_VERSION=405
set FIRMWARE_VERSION=%DEV_VERSION%
set ELATEC_DIR=C:\Users\xy0007\Documents\KIT-Card\Elatec\TWN4DevPack%DEV_VERSION%
set BIX_FILE=TWN4_CCx%DEV_VERSION%_KIT100_%PROJECT%.bix
set FIRMWARE_PATH=Firmware\TWN4_xKx401_STD204_Multi_Keyboard_Standard.bix
set BIX_FILE=TWN4_CCx%FIRMWARE_VERSION%_KIT100_%PROJECT%.bix
set FIRMWARE_PATH=Firmware\TWN4_xKx%FIRMWARE_VERSION%_STD204_Multi_Keyboard_Standard.bix
@REM set FIRMWARE_PATH=Firmware\TWN4_xCx401_STD204_Multi_CDC_Standard.bix
rem eventuell zu setzende Compiler Switches. Es können auch mehrere -D gesetzt werden
@REM set DEBUG= -DDEBUG
set READER_ACTION= -DREADER_ACTION=70
set READER_ACTION= -DREADER_ACTION=65
@REM set SECURE= -DSECURE
set GERMAN_KEYBOARD= -DGERMAN_KEYBOARD
c:
cd %ELATEC_DIR%\Apps\%PROJECT_DIR%
"%ELATEC_DIR%\Tools\Yagarto-20110328\bin\arm-none-eabi-gcc" -std=c99 -mcpu=cortex-m0 -Os -ffunction-sections -gdwarf-2 -mthumb -fomit-frame-pointer -Wall -Wstrict-prototypes -fverbose-asm -Wa,-ahlms="App_KITC100_%PROJECT%.lst" -DAPPCHARS=KITC -DVERSION=0x100 -DAPPEXTCONFIG=0 %DEBUG% %SECURE% %READER_ACTION% -I. -I"%ELATEC_DIR%\Tools\sys" "%ELATEC_DIR%\Tools\sys\twn4.crt.c" "%PROJECT_SOURCE%.c" -nostartfiles -T"%ELATEC_DIR%\Tools\sys\app.ld" -Wl,--gc-sections,-e,AppHeader,--no-print-gc-sections,-Map="App_KITC100_%PROJECT%.map",--cref,--no-warn-mismatch "%ELATEC_DIR%\Tools\sys\libapp.a" -lc -o "App_KITC100_%PROJECT%.elf"
"%ELATEC_DIR%\Tools\Yagarto-20110328\bin\arm-none-eabi-gcc" -std=c99 -mcpu=cortex-m0 -Os -ffunction-sections -gdwarf-2 -mthumb -fomit-frame-pointer -Wall -Wstrict-prototypes -fverbose-asm -Wa,-ahlms="App_KITC100_%PROJECT%.lst" -DAPPCHARS=KITC -DVERSION=0x100 -DAPPEXTCONFIG=0 %DEBUG% %SECURE% %READER_ACTION% %GERMAN_KEYBOARD% -I. -I"%ELATEC_DIR%\Tools\sys" "%ELATEC_DIR%\Tools\sys\twn4.crt.c" "%PROJECT_SOURCE%.c" -nostartfiles -T"%ELATEC_DIR%\Tools\sys\app.ld" -Wl,--gc-sections,-e,AppHeader,--no-print-gc-sections,-Map="App_KITC100_%PROJECT%.map",--cref,--no-warn-mismatch "%ELATEC_DIR%\Tools\sys\libapp.a" -lc -o "App_KITC100_%PROJECT%.elf"
if errorlevel 1 goto ende
copy "%ELATEC_DIR%\%FIRMWARE_PATH%" TWN4_%DEV_VERSION%.bix
"%ELATEC_DIR%\Tools\Yagarto-20110328\bin\arm-none-eabi-objcopy" -O ihex "App_KITC100_%PROJECT%.elf" "App_KITC100_%PROJECT%.hex"
......@@ -31,6 +33,5 @@ if errorlevel 1 goto ende
"%ELATEC_DIR%\Tools\makeapp" -tTWN4 -nTWN4 "-iTWN4_%DEV_VERSION%.bix" "-hApp_KITC100_%PROJECT%.hex" "-o%BIX_FILE%"
if errorlevel 1 goto ende
del "App_KITC100_%PROJECT%.elf" "App_KITC100_%PROJECT%.lst" "App_KITC100_%PROJECT%.map" "App_KITC100_%PROJECT%.hex" "TWN4_%DEV_VERSION%.bix"
taskkill /IM coolterm.exe /F
"%ELATEC_DIR%\Tools\flash" USB %BIX_FILE%
:ende
\ No newline at end of file
......@@ -7,11 +7,12 @@ set PROJECT_SOURCE=KIT-Card
set PROJECT=KIT-Card_Serial
rem Development KIT Version
set DEV_VERSION=401b
set DEV_VERSION=405
set FIRMWARE_VERSION=%DEV_VERSION%
set ELATEC_DIR=C:\Users\xy0007\Documents\KIT-Card\Elatec\TWN4DevPack%DEV_VERSION%
set BIX_FILE=TWN4_CCx%DEV_VERSION%_KIT100_%PROJECT%.bix
set FIRMWARE_PATH=Firmware\TWN4_xCx401_STD204_Multi_CDC_Standard.bix
set BIX_FILE=TWN4_CCx%FIRMWARE_VERSION%_KIT100_%PROJECT%.bix
set FIRMWARE_PATH=Firmware\TWN4_xCx%FIRMWARE_VERSION%_STD204_Multi_CDC_Standard.bix
rem eventuell zu setzende Compiler Switches. Es können auch mehrere -D gesetzt werden
......@@ -32,6 +33,6 @@ if errorlevel 1 goto ende
del "App_KITC100_%PROJECT%.elf" "App_KITC100_%PROJECT%.lst" "App_KITC100_%PROJECT%.map" "App_KITC100_%PROJECT%.hex" "TWN4_%DEV_VERSION%.bix"
"%ELATEC_DIR%\Tools\flash" USB %BIX_FILE%
@REM exit
timeout /T 1
timeout /T 2
python -m serial.tools.miniterm -e --exit-char 25 com9
:ende
\ No newline at end of file
Supports Markdown
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