diff --git a/GyverCore/cores/arduino/main.cpp b/GyverCore/cores/arduino/main.cpp index 738e94d..4b0558c 100644 --- a/GyverCore/cores/arduino/main.cpp +++ b/GyverCore/cores/arduino/main.cpp @@ -1,6 +1,6 @@ /* Главный цикл программы */ #pragma message "Нас тут заперли, вызовите 911!" -#pragma message "GyverCore v2.0.2 inside. Enjoy" +#pragma message "GyverCore v2.0.3 inside. Enjoy" #include diff --git a/GyverCore/platform.txt b/GyverCore/platform.txt index b21d2e9..7c3052a 100644 --- a/GyverCore/platform.txt +++ b/GyverCore/platform.txt @@ -5,7 +5,7 @@ # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5-3rd-party-Hardware-specification name=GyverCore -version=2.0 +version=2.0.3 # AVR compile variables # --------------------- diff --git a/GyverCore/programmers.txt b/GyverCore/programmers.txt index 056a688..a0847c8 100644 --- a/GyverCore/programmers.txt +++ b/GyverCore/programmers.txt @@ -1,27 +1,132 @@ +# 1 - 750000 Hz usbasp1.name=USBasp 750 kHz usbasp1.communication=usb usbasp1.protocol=usbasp usbasp1.program.protocol=usbasp usbasp1.program.tool=avrdude -usbasp1.program.extra_params=-Pusb -usbasp1.program.extra_params=-B 1 +usbasp1.program.extra_params=-Pusb -B 1 +# 2 - 375000 Hz usbasp2.name=USBasp 375 kHz usbasp2.communication=usb usbasp2.protocol=usbasp usbasp2.program.protocol=usbasp usbasp2.program.tool=avrdude -usbasp2.program.extra_params=-Pusb -usbasp2.program.extra_params=-B 2 +usbasp2.program.extra_params=-Pusb -B 2 +# 3 - 187500 Hz usbasp3.name=USBasp 187 kHz usbasp3.communication=usb usbasp3.protocol=usbasp usbasp3.program.protocol=usbasp usbasp3.program.tool=avrdude -usbasp3.program.extra_params=-Pusb -usbasp3.program.extra_params=-B 3 +usbasp3.program.extra_params=-Pusb -B 3 -# 1 - 750000 Hz -# 2 - 375000 Hz -# 3 - 187500 Hz \ No newline at end of file +avrisp.name=AVR ISP +avrisp.communication=serial +avrisp.protocol=stk500v1 +avrisp.program.protocol=stk500v1 +avrisp.program.tool=avrdude +avrisp.program.extra_params=-P{serial.port} + +avrispmkii.name=AVRISP mkII +avrispmkii.communication=usb +avrispmkii.protocol=stk500v2 +avrispmkii.program.protocol=stk500v2 +avrispmkii.program.tool=avrdude +avrispmkii.program.extra_params=-Pusb + +usbtinyisp.name=USBtinyISP +usbtinyisp.protocol=usbtiny +usbtinyisp.program.tool=avrdude +usbtinyisp.program.extra_params= + +arduinoisp.name=ArduinoISP +arduinoisp.protocol=arduinoisp +arduinoisp.program.tool=avrdude +arduinoisp.program.extra_params= + +arduinoisporg.name=ArduinoISP.org +arduinoisporg.protocol=arduinoisporg +arduinoisporg.program.tool=avrdude +arduinoisporg.program.extra_params= + +parallel.name=Parallel Programmer +parallel.protocol=dapa +parallel.force=true +# parallel.delay=200 +parallel.program.tool=avrdude +parallel.program.extra_params=-F + +arduinoasisp.name=Arduino as ISP +arduinoasisp.communication=serial +arduinoasisp.protocol=stk500v1 +arduinoasisp.speed=19200 +arduinoasisp.program.protocol=stk500v1 +arduinoasisp.program.speed=19200 +arduinoasisp.program.tool=avrdude +arduinoasisp.program.extra_params=-P{serial.port} -b{program.speed} + +arduinoasispatmega32u4.name=Arduino as ISP (ATmega32U4) +arduinoasispatmega32u4.communication=serial +arduinoasispatmega32u4.protocol=arduino +arduinoasispatmega32u4.speed=19200 +arduinoasispatmega32u4.program.protocol=arduino +arduinoasispatmega32u4.program.speed=19200 +arduinoasispatmega32u4.program.tool=avrdude +arduinoasispatmega32u4.program.extra_params=-P{serial.port} -b{program.speed} + +usbGemma.name=Arduino Gemma +usbGemma.protocol=arduinogemma +usbGemma.program.tool=avrdude +usbGemma.program.extra_params= +usbGemma.config.path={runtime.platform.path}/bootloaders/gemma/avrdude.conf + +## Notes about Dangerous Prototypes Bus Pirate as ISP +## Bus Pirate V3 need Firmware v5.10 or later +## Bus Pirate V4 need Firmware v6.3-r2151 or later +## Could happen that BP does not have enough current to power an Arduino board +## through the ICSP connector. In this case disconnect the +Vcc from ICSP connector +## and power Arduino board in the normal way. +buspirate.name=BusPirate as ISP +buspirate.communication=serial +buspirate.protocol=buspirate +buspirate.program.protocol=buspirate +buspirate.program.tool=avrdude +buspirate.program.extra_params=-P{serial.port} + +# STK500 firmware version v1 and v2 use different serial protocols. +# Using the 'stk500' protocol tells avrdude to try and autodetect the +# firmware version. If this leads to problems, we might need to add +# stk500v1 and stk500v2 entries to allow explicitely selecting the +# firmware version. +stk500.name=Atmel STK500 development board +stk500.communication=serial +stk500.protocol=stk500 +stk500.program.protocol=stk500 +stk500.program.tool=avrdude +stk500.program.extra_params=-P{serial.port} + +jtag3isp.name=Atmel JTAGICE3 (ISP mode) +jtag3isp.communication=usb +jtag3isp.protocol=jtag3isp +jtag3isp.program.protocol=jtag3isp +jtag3isp.program.tool=avrdude +jtag3isp.program.extra_params= + +jtag3.name=Atmel JTAGICE3 (JTAG mode) +jtag3.communication=usb +jtag3.protocol=jtag3 +jtag3.program.protocol=jtag3 +jtag3.program.tool=avrdude +# Set a bitclock of 0.1us (the fastest supported value). This should +# work regardless of the crystal used, since JTAG doesn't use the MCU +# clock but dictates its own clock. +jtag3.program.extra_params=-B0.1 + +atmel_ice.name=Atmel-ICE (AVR) +atmel_ice.communication=usb +atmel_ice.protocol=atmelice_isp +atmel_ice.program.protocol=atmelice_isp +atmel_ice.program.tool=avrdude +atmel_ice.program.extra_params=-Pusb diff --git a/README.md b/README.md index 61ccfb3..a26e2d9 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ![CORE_PHOTO](https://github.com/AlexGyver/GyverCore/blob/master/gyverCoreLogo.jpg) # GyverCore for ATmega328 [**▶SWITCH TO ENGLISH◀**](https://github.com/AlexGyver/GyverCore/blob/master/README_eng.md) - **Версия 2.0 от 01.02.2020** + **Версия 2.0.3 от 27.09.2020** Быстрое и лёгкое ядро для Arduino IDE с расширенной конфигурацией. Основано на оригинальном ядре Arduino версии 1.8.9, большинство функций заменены на более быстрые и лёгкие аналоги, убрано всё лишнее и не относящееся к микроконтроллеру ATmega328p, убран почти весь Wiring-мусор, код упрощён и причёсан. Добавлено несколько функций и интересных вариантов компиляции. Разработано by Александр **AlexGyver** и Egor 'Nich1con' Zaharov @@ -299,4 +299,6 @@ parseFloat | 1070 | 246 | 824 - Ускорен digitalToggle - Обновлён uart - Чуть ускорен analogRead - - Добавлена поддержка клока 20 МГц \ No newline at end of file + - Добавлена поддержка клока 20 МГц +- 2.0.3 + - Возвращены стандартные программаторы \ No newline at end of file diff --git a/Release v2.0.2/GyverCore_linux.zip b/Release v2.0.3/GyverCore_linux.zip similarity index 99% rename from Release v2.0.2/GyverCore_linux.zip rename to Release v2.0.3/GyverCore_linux.zip index 6c3181f..8921ab5 100644 Binary files a/Release v2.0.2/GyverCore_linux.zip and b/Release v2.0.3/GyverCore_linux.zip differ diff --git a/Release v2.0.2/GyverCore_win32.zip b/Release v2.0.3/GyverCore_win32.zip similarity index 99% rename from Release v2.0.2/GyverCore_win32.zip rename to Release v2.0.3/GyverCore_win32.zip index 8b4bd65..3b2347e 100644 Binary files a/Release v2.0.2/GyverCore_win32.zip and b/Release v2.0.3/GyverCore_win32.zip differ diff --git a/Release v2.0.2/GyverCore_win64.zip b/Release v2.0.3/GyverCore_win64.zip similarity index 99% rename from Release v2.0.2/GyverCore_win64.zip rename to Release v2.0.3/GyverCore_win64.zip index 2df677c..63389f4 100644 Binary files a/Release v2.0.2/GyverCore_win64.zip and b/Release v2.0.3/GyverCore_win64.zip differ diff --git a/package_GyverCore_index.json b/package_GyverCore_index.json index 317ce4b..66e5322 100644 --- a/package_GyverCore_index.json +++ b/package_GyverCore_index.json @@ -338,6 +338,20 @@ "category": "Contributed", "url": "https://github.com/AlexGyver/GyverCore/releases/download/GyverCore-2.0.2/GyverCore.zip", "archiveFileName": "GyverCore.zip", + "checksum": "MD5:ef241914d2e81c75dc416d5f04a51794", + "size": "59051970", + "boards": [ + {"name": "ATmega328 based boards"} + ], + "toolsDependencies": [] + }, + { + "name": "GyverCore", + "architecture": "avr", + "version": "2.0.3", + "category": "Contributed", + "url": "https://github.com/AlexGyver/GyverCore/releases/download/GyverCore-2.0.3/GyverCore.zip", + "archiveFileName": "GyverCore.zip", "checksum": "MD5:8116f9d81d6c014dc29615600d7afbc9", "size": "59050976", "boards": [