updated

- changed PIDs for Deneyap Development Boards - updated deneyap.h files - changed json file
deneyapkart · Dec 22, 2022 · 7a86c4e · 7a86c4e
1 parent c13ff27
commit 7a86c4e
Show file tree

Hide file tree

Showing 4 changed files with 226 additions and 154 deletions.
diff --git a/boards.txt b/boards.txt
@@ -300,11 +300,11 @@ dydk1a_mpv10.menu.EraseFlash.all=Enabled
 dydk1a_mpv10.menu.EraseFlash.all.upload.erase_cmd=-e
 
 ##############################################################
-#
+
 #dydk1a_mpv20.name=Deneyap Kart 1A v2
 #
-#dydk1a_mpv20.vid.0=0x303a
-#dydk1a_mpv20.pid.0=0x1001
+#dydk1a_mpv20.vid.0=0x303A
+#dydk1a_mpv20.pid.0=0x8147
 #
 #dydk1a_mpv20.bootloader.tool=esptool_py
 #dydk1a_mpv20.bootloader.tool.default=esptool_py
@@ -510,13 +510,13 @@ dydk1a_mpv10.menu.EraseFlash.all.upload.erase_cmd=-e
 #dydk1a_mpv20.menu.EraseFlash.none.upload.erase_cmd=
 #dydk1a_mpv20.menu.EraseFlash.all=Enabled
 #dydk1a_mpv20.menu.EraseFlash.all.upload.erase_cmd=-e
-#
+
 ##############################################################
 
 dym_mpv10.name=Deneyap Mini
 
-dym_mpv10.vid.0=0x303a
-dym_mpv10.pid.0=0x0002
+dym_mpv10.vid.0=0x303A
+dym_mpv10.pid.0=0x8141
 
 dym_mpv10.bootloader.tool=esptool_py
 dym_mpv10.bootloader.tool.default=esptool_py
@@ -605,6 +605,9 @@ dym_mpv10.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
 dym_mpv10.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS)
 dym_mpv10.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
 dym_mpv10.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+dym_mpv10.menu.PartitionScheme.rainmaker=RainMaker
+dym_mpv10.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
+dym_mpv10.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
 
 dym_mpv10.menu.CPUFreq.240=240MHz (WiFi)
 dym_mpv10.menu.CPUFreq.240.build.f_cpu=240000000L
@@ -691,11 +694,11 @@ dym_mpv10.menu.EraseFlash.all=Enabled
 dym_mpv10.menu.EraseFlash.all.upload.erase_cmd=-e
 
 ##############################################################
-#
+
 #dym_mpv20.name=Deneyap Mini v2
 #
-#dym_mpv20.vid.0=0x303a
-#dym_mpv20.pid.0=0x0002
+#dym_mpv20.vid.0=0x303A
+#dym_mpv20.pid.0=0x8144
 #
 #dym_mpv20.bootloader.tool=esptool_py
 #dym_mpv20.bootloader.tool.default=esptool_py
@@ -789,6 +792,9 @@ dym_mpv10.menu.EraseFlash.all.upload.erase_cmd=-e
 #dym_mpv20.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
 #dym_mpv20.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
 #dym_mpv20.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+#dym_mpv20.menu.PartitionScheme.rainmaker=RainMaker
+#dym_mpv20.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
+#dym_mpv20.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
 #
 #dym_mpv20.menu.CPUFreq.240=240MHz (WiFi)
 #dym_mpv20.menu.CPUFreq.240.build.f_cpu=240000000L
@@ -873,13 +879,13 @@ dym_mpv10.menu.EraseFlash.all.upload.erase_cmd=-e
 #dym_mpv20.menu.EraseFlash.none.upload.erase_cmd=
 #dym_mpv20.menu.EraseFlash.all=Enabled
 #dym_mpv20.menu.EraseFlash.all.upload.erase_cmd=-e
-#
+
 ##############################################################
 
 dyg_mpv10.name=Deneyap Kart G 
 
-dyg_mpv10.vid.0=0x303a
-dyg_mpv10.pid.0=0x1001
+dyg_mpv10.vid.0=0x303A
+dyg_mpv10.pid.0=0x814A
 
 dyg_mpv10.bootloader.tool=esptool_py
 dyg_mpv10.bootloader.tool.default=esptool_py

diff --git a/cores/esp32/deneyap.cpp b/cores/esp32/deneyap.cpp
@@ -1,13 +1,10 @@
 /******************************************************************************
 deneyap.cpp
 Main Deneyap Development Boards Library
-
 Main functions used for read, write, pin mode etc. operations
-
 Ozgur BOSTAN @ RFtek Electronics
 ozgur.bostan@rftek.com.tr
 April 08, 2020
-
 2020 Copyright (c) RFtek Electronics Ltd.  All right reserved.
 ******************************************************************************/
 
@@ -21,12 +18,12 @@ April 08, 2020
 //   */
 // void pinMode(uint16_t pinNumber, uint16_t pinMode)
 // {
-// 	if(pinMode == INPUT)
-// 		pinDirConfig(pinNumber, GPIO_INPUT);
-// 	else if(pinMode == OUTPUT)
-// 		pinDirConfig(pinNumber, GPIO_OUTPUT);
-// 	else
-// 		pinDirConfig(pinNumber, pinMode);
+//  if(pinMode == INPUT)
+//    pinDirConfig(pinNumber, GPIO_INPUT);
+//  else if(pinMode == OUTPUT)
+//    pinDirConfig(pinNumber, GPIO_OUTPUT);
+//  else
+//    pinDirConfig(pinNumber, pinMode);
 // }
 
 // /**
@@ -59,15 +56,15 @@ April 08, 2020
 
 void writeRedLed(uint8_t state)
 {
-	if(state == HIGH || state == PIN_HIGH)
+  if(state == HIGH || state == PIN_HIGH)
 #if ARDUINO_DYDK
-		digitalWrite(LEDR, PIN_LOW);
+    digitalWrite(LEDR, PIN_LOW);
 #elif ARDUINO_DYM
     digitalWrite(LEDR, PIN_HIGH);
 #endif
-	else if(state == LOW || state == PIN_LOW)
+  else if(state == LOW || state == PIN_LOW)
 #if ARDUINO_DYDK
-		digitalWrite(LEDR, PIN_HIGH);
+    digitalWrite(LEDR, PIN_HIGH);
 #elif ARDUINO_DYM
     digitalWrite(LEDR, PIN_LOW);
 #endif

diff --git a/cores/esp32/deneyap.h b/cores/esp32/deneyap.h
@@ -39,9 +39,12 @@
 #define D11	(uint8_t)(18)
 #define D12	(uint8_t)(17)
 #define D13	(uint8_t)(0)
+#elif defined (ARDUINO_DYM)
 #define D14	(uint8_t)(35)
 #define D15	(uint8_t)(33)
 #define D16	(uint8_t)(34)
+#elif defined (ARDUINO_DYMv2)
+#define D14	(uint8_t)(33)
 #elif defined (ARDUINO_DYG)
 #define D0	(uint8_t)(21)
 #define D1	(uint8_t)(20)
@@ -67,7 +70,7 @@
 #define D13	(uint8_t)(10)
 #define D14	(uint8_t)(3)
 #define D15	(uint8_t)(8)
-#endif
+#endif 
 
 // Analog input pins
 #if defined (ARDUINO_DYDK) || defined (ARDUINO_DYDK1A)
@@ -101,7 +104,7 @@
 #define A5	(uint8_t)(16)
 #define A6	(uint8_t)(17)
 #define A7	(uint8_t)(18)
-#endif
+#endif 
 
 // Analog output pins
 #if defined (ARDUINO_DYDK) || defined (ARDUINO_DYDK1A)
@@ -124,7 +127,7 @@
 #define SCL	D6
 #endif
 
-// SPI pins
+/*// SPI pins
 #if defined (ARDUINO_DYDK) || defined (ARDUINO_DYDK1A) || defined (ARDUINO_DYDK1Av2)
 #define MOSI	D7
 #define MISO	D6
@@ -140,15 +143,15 @@
 #define MISO	A4
 #define SCK	A3
 #define SS	D5
-#endif
+#endif*/
 
 // UART pins
 #if defined (ARDUINO_DYDK) || defined (ARDUINO_DYDK1A) || defined (ARDUINO_DYDK1Av2)
 #define TX	D2
 #define RX	D3
 #elif defined (ARDUINO_DYM) || defined (ARDUINO_DYMv2)
-#define TX	D0
-#define RX	D1
+#define TX	D1
+#define RX	D0
 #elif defined (ARDUINO_DYG)
 #define TX	D1
 #define RX	D0
@@ -159,15 +162,15 @@
 #define PWM0	D0
 #define PWM1	D1
 #elif defined (ARDUINO_DYM) || defined (ARDUINO_DYMv2)
-#define P0	D2
-#define P1	D3
+#define PWM0	D2
+#define PWM1	D3
 #elif defined (ARDUINO_DYG)
 #define PWM0	A0
 #define PWM1	A1
 #define PWM2	A2
 #endif
 
-// Capacitive-Sensing pins
+/*// Capacitive-Sensing pins
 #if defined (ARDUINO_DYDK) || defined (ARDUINO_DYDK1A)
 #define T0	A4
 #define T1	A5
@@ -182,7 +185,7 @@
 #define T3	A3
 #define T4	A4
 #define T5	A5
-#endif
+#endif*/
 
 // Camera pins
 #if defined (ARDUINO_DYDK) || defined (ARDUINO_DYDK1A)
@@ -245,6 +248,7 @@
 #define LEDR	D3
 #define LEDG	D2
 #define LEDB	D10
+#define LED_BUILTIN D10
 #define GPKEY	D8
 #define BOOT	D8
 #elif defined (ARDUINO_DYDK1A)
@@ -255,6 +259,7 @@
 #define LEDR	D16
 #define LEDG	D15
 #define LEDB	D14
+#define LED_BUILTIN D14
 #define GPKEY	D13
 #define BT		D13
 #elif defined (ARDUINO_DYG)