Update to Version 0.7

nakhonthai · Mar 30, 2022 · c9520d5 · c9520d5
1 parent 47cd728
commit c9520d5
Show file tree

Hide file tree

Showing 52 changed files with 109,018 additions and 496 deletions.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -3,5 +3,8 @@
     // for the documentation about the extensions.json format
     "recommendations": [
         "platformio.platformio-ide"
+    ],
+    "unwantedRecommendations": [
+        "ms-vscode.cpptools-extension-pack"
     ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "esp32-hal.h": "c"
+    }
+}
diff --git a/README.md b/README.md
@@ -2,26 +2,128 @@
 How to Make digital voice radio (M17 Digital Voice) analog gateway yourself over the internet width ESP32 NodeMCU/DOIT/DevKIT Module.
 The project made M17AnalogGateway to convert digital voice with M17 mode to Analog Radio.
 
-## Simple Circuit
-![image](https://github.com/nakhonthai/M17AnalogGateway/blob/master/schematic/M17Hotspot.png)
+## Feature
 
-To connect, connect the MIC,PTT,SPEKER to Analog Radio.
+* supported hardware: ESP32DR Simple or ESP32DR_SA818 by Module ESP32 DevKit
+* using ESP-Arduino development on Visual studio code IDE
+* support M17 mref reflector
+* support noise cancel
+* support AGC
+* support TNC2 Raw protocol only
+* using USB serial for host connection and power supply
+* support Wi-Fi connection (UDP) to Reflector
+* support Web Service config and control system
+* display received and transmit packet on the LED
+* display infomation on OLED display
+
+![esp32dr-test](image/ESP32DR_Simple_Test.png)
+
+## ESP32DR Simple
+
+ESP32DR Simple Circut is small interface board for connecting to a transceiver.
+
+* PCB size is 64x58mm
+* PCB Single size
+* RJ11 6 Pin out to Radio
+
+### Schematic
+
+[![schematic](image/ESP32DR_SimpleCircuit.png)](image/ESP32DR_SimpleCircuit.png)
+
+### CAD data
+
+The gerber data is [here](doc/Gerber_ESP32DR_Simple.zip)
+
+The PCB film positive is [here](doc/PCB_Bottom.pdf)
+
+The PCB film negative is [here](doc/PCB_Bottom_Invert.pdf)
+
+The PCB Layout is [here](doc/PCB_Layout.pdf)
+
+The Schematic PDF is [here](doc/ESP32DR_Simple_Schematic.pdf)
+
+### BOM list  
+
+|Reference|Value|Description|
+|---|:---:|---|
+|U1|ESP32 DEVKIT|DOIT ESP32 DEVKIT (โมดูล ESP32)|
+|RP2|10K|VR 3362W (R ปรับค่าเสียงออก)|
+|RP1|10K|VR 3362W (R ปรับค่าเสียงเข้า)|
+|RJ11|RJ11-6P6C|แจ๊คโมดูล RJ11 แบบ 6ขา|
+|R13,R12,R11,R5,R3,R9|1K|R 1K 1/4W (ค่าสี: น้ำตาล ดำ แดง)|
+|R7,R18,R19|100R|R 100R  1/4W (ค่าสี: น้ำตาล ดำ ดำ)|
+|R6,R2,R1|10K|R 10k  1/4W  (ค่าสี: น้ำตาล ดำ ส้ม)|
+|R4|3K|R 3k 1/4W (ค่าสี: ส้ม ดำ แดง)|
+|R10|33K|R 33K 1/4W (ค่าสี: ส้ม ส้ม ส้ม)|
+|Q1|2N3904|ทรานซิสเตอร์ NPN (TO-92)|
+|LED3|LED 3.5mm|สีเหลือง แสดงส่งสัญญาณ TX|
+|LED2|LED 3.5mm|สีเขียว แสดงรับสัญญาณ RX|
+|LED1|LED 3.5mm|สีแดง แสดงไฟเข้าทำงาน|
+|L1|L or JMP|L Isolate or Jumper|
+|C11|100uF/6.3V|ตัวเก็บประจุแบบอิเล็กโทรไลติก|
+|C4,C5|100nF|ตัวเก็บประจุแบบเซรามิกมัลติเลเยอร์|
+|C6|470uF/10V|ตัวเก็บประจุแบบอิเล็กโทรไลติก|
+|C1,C3,C10|100nF หรือ 0.1uF|ตัวเก็บประจุแบบโพลีโพรไพลีน|
+|C2|10nF หรือ 0.01uF|ตัวเก็บประจุแบบโพลีโพรไพลีน|
+|D2,D1|1N4148|ไดโอด หรือใช้ C 0.01uF แทนได้|
+
+*R18 and R19 ไม่ใส่ก็ได้.  
+*D2,D1 เปลี่ยนเป็นตัวเก็บประจุแบบเซรามิกมัลติเลเยอร์ค่า 10nF แทนได้ 
+*หากใช้ต่อกับวิทยุรับส่งเข้าขาไมค์นอก ให้เปลี่ยน R4 เป็น 100K
+
+จัดซื้อชุดคิทผ่าน Shopee ได้ที่ [คลิ๊ก](https://shopee.co.th/product/45191268/13373396785)
+
+The Howto DIY is [here](doc/ESP32DR_DIY-Thai.pdf)
+
+### Mounting drawing
+
+![mounting](image/ESP32DR_SimpleLayout.png)
+
+### Transceiver connection
+
+Solder jumper is needed depending on a transceiver.
+
+![ESP32DR_Pinout](image/RJ12Pinout.png)
+
+|Manufacture|RJ11-1 (+VIN)|RJ11-2 (SPK)|RJ11-3 (PTT)|RJ11-4 (GND)|RJ11-5 (MIC)|RJ11-6 (SQL)|
+|---|---|---|---|---|---|---|
+|Alinco DR-135(DB9)|-|2|7|5|9|1|
+|IC2200(RJ45)|-|SP|4|5|6|-|
+|FT-2800(RJ11)|-|SP|1|3|2|-|
+|HT Mic Cable|-|SPK|PTT|GND|MIC|-|
+
+for Alinco DR-135(DB9)
+
+![Alinco](image/ESP32DR_DR135.png)
+
+for ICOM IC2200(RJ45)
+
+![IC2200](image/ESP32DR_IC2200.png)
+
+for Yaesu FT-2800(RJ11)
+
+![FT2800](image/ESP32DR_FT2800.png)
+
+for Handheld
+
+![Handheld](image/ESP32DR_HT.png)
+
+![HT-RX](image/ESP32DR_RxOnly.png)
 
 ## Howto Devellop
 -Pull and Compile by PlatformIO on the Visual Studio Code.
 
-## M17Hotspot firmware installation (do it first, next, update via web)
+## ESP32IGate firmware installation (do it first, next, update via web)
 - 1.Connect the USB cable to the ESP32 Module.
-- 2.Download firmware and open the program ESP32 DOWNLOAD TOOL, set it in the firmware upload program, set the firmware to M17Hotspot_Vxx.bin, location 0x10000 and partitions.bin at 0x8000 and bootloader.bin at 0x1000 and boot.bin at 0xe000, if not loaded, connect GPIO0 cable to GND, press START button finished, press power button or reset (red) again.
-- 3.Then go to WiFi AP SSID: M17Hotspot and open a browser to the website. http://192.168.4.1 Can be fixed Or turn on your Wi-Fi router.
+- 2.Download firmware and open the program ESP32 DOWNLOAD TOOL, set it in the firmware upload program, set the firmware to ESP32IGate_Vxx.bin, location 0x10000 and partitions.bin at 0x8000 and bootloader.bin at 0x1000 and boot.bin at 0xe000, if not loaded, connect GPIO0 cable to GND, press START button finished, press power button or reset (red) again.
+- 3.Then go to WiFi AP SSID: M17Analog and open a browser to the website. http://192.168.4.1 password: aprsthnetwork Can be fixed Or turn on your Wi-Fi router.
+- 4.Push BOOT button long >100ms to TX Position and >10Sec to Factory Default
+
+![ESP32Tool](image/ESP32Tool.png)
 
 ## ESP32 Flash Download Tools
 https://www.espressif.com/en/support/download/other-tools
 
-## Setting up using a web browser
-- 1.Set up Wi-Fi in the Settings tab. Connect to a router or device that shares the Internet. According to the router name (SSID) and password
-- 2.Set up digital voices in the IoT tab in the server side. Refactor service also does not need to be modified (except for testing elsewhere), the test room in the M17 Module compartment has 26 rooms, AZ insert one. letter Users put their own name in the myCallSign field and the device sequence (some people use multiple machines) can be assigned 26 characters, one letter A-Z as well.
-
 ## M17-THA Reflector
 	Name: M17-THA
 	IP: 203.150.19.24

diff --git a/doc/ESP32DR_DIY-Thai.pdf b/doc/ESP32DR_DIY-Thai.pdf
diff --git a/doc/ESP32DR_Simple_Schematic.pdf b/doc/ESP32DR_Simple_Schematic.pdf
diff --git a/doc/Gerber_ESP32DR_Simple.zip b/doc/Gerber_ESP32DR_Simple.zip
diff --git a/doc/PCB_Bottom.pdf b/doc/PCB_Bottom.pdf
diff --git a/doc/PCB_Bottom_Invert.pdf b/doc/PCB_Bottom_Invert.pdf
diff --git a/doc/PCB_Layout.pdf b/doc/PCB_Layout.pdf
diff --git a/image/Alinco_Pinout.png b/image/Alinco_Pinout.png
diff --git a/image/ESP32DR_DR135.png b/image/ESP32DR_DR135.png
diff --git a/image/ESP32DR_FT2800.png b/image/ESP32DR_FT2800.png
diff --git a/image/ESP32DR_HT.png b/image/ESP32DR_HT.png
diff --git a/image/ESP32DR_IC2200.png b/image/ESP32DR_IC2200.png
diff --git a/image/ESP32DR_RxOnly.png b/image/ESP32DR_RxOnly.png
diff --git a/image/ESP32DR_SimpleCircuit.png b/image/ESP32DR_SimpleCircuit.png
diff --git a/image/ESP32DR_SimpleLayout.png b/image/ESP32DR_SimpleLayout.png
diff --git a/image/ESP32DR_Simple_Model.png b/image/ESP32DR_Simple_Model.png
diff --git a/image/ESP32DR_Simple_Test.png b/image/ESP32DR_Simple_Test.png
diff --git a/image/ESP32Tool.png b/image/ESP32Tool.png
diff --git a/image/IC2200_Pinout.png b/image/IC2200_Pinout.png
diff --git a/image/PCB_Layout.png b/image/PCB_Layout.png
diff --git a/image/RJ12.png b/image/RJ12.png
diff --git a/image/RJ12Pinout.png b/image/RJ12Pinout.png
diff --git a/include/Adafruit_SSD1306.h b/include/Adafruit_SSD1306.h
@@ -0,0 +1,194 @@
+/*!
+ * @file Adafruit_SSD1306.h
+ *
+ * This is part of for Adafruit's SSD1306 library for monochrome
+ * OLED displays: http://www.adafruit.com/category/63_98
+ *
+ * These displays use I2C or SPI to communicate. I2C requires 2 pins
+ * (SCL+SDA) and optionally a RESET pin. SPI requires 4 pins (MOSI, SCK,
+ * select, data/command) and optionally a reset pin. Hardware SPI or
+ * 'bitbang' software SPI are both supported.
+ *
+ * Adafruit invests time and resources providing this open source code,
+ * please support Adafruit and open-source hardware by purchasing
+ * products from Adafruit!
+ *
+ * Written by Limor Fried/Ladyada for Adafruit Industries, with
+ * contributions from the open source community.
+ *
+ * BSD license, all text above, and the splash screen header file,
+ * must be included in any redistribution.
+ *
+ */
+
+#ifndef _Adafruit_SSD1306_H_
+#define _Adafruit_SSD1306_H_
+
+// ONE of the following three lines must be #defined:
+#define SH1106_128_64
+//#define SSD1306_128_64 ///< DEPRECTAED: old way to specify 128x64 screen
+//#define SSD1306_128_32 ///< DEPRECATED: old way to specify 128x32 screen
+//#define SSD1306_96_16  ///< DEPRECATED: old way to specify 96x16 screen
+// This establishes the screen dimensions in old Adafruit_SSD1306 sketches
+// (NEW CODE SHOULD IGNORE THIS, USE THE CONSTRUCTORS THAT ACCEPT WIDTH
+// AND HEIGHT ARGUMENTS).
+
+#if defined(ARDUINO_STM32_FEATHER)
+typedef class HardwareSPI SPIClass;
+#endif
+
+#include <Adafruit_GFX.h>
+#include <SPI.h>
+#include <Wire.h>
+
+#if defined(__AVR__)
+typedef volatile uint8_t PortReg;
+typedef uint8_t PortMask;
+#define HAVE_PORTREG
+#elif defined(__SAM3X8E__)
+typedef volatile RwReg PortReg;
+typedef uint32_t PortMask;
+#define HAVE_PORTREG
+#elif (defined(__arm__) || defined(ARDUINO_FEATHER52)) &&                      \
+    !defined(ARDUINO_ARCH_MBED)
+typedef volatile uint32_t PortReg;
+typedef uint32_t PortMask;
+#define HAVE_PORTREG
+#endif
+
+/// The following "raw" color names are kept for backwards client compatability
+/// They can be disabled by predefining this macro before including the Adafruit
+/// header client code will then need to be modified to use the scoped enum
+/// values directly
+#ifndef NO_ADAFRUIT_SSD1306_COLOR_COMPATIBILITY
+#define BLACK SSD1306_BLACK     ///< Draw 'off' pixels
+#define WHITE SSD1306_WHITE     ///< Draw 'on' pixels
+#define INVERSE SSD1306_INVERSE ///< Invert pixels
+#endif
+/// fit into the SSD1306_ naming scheme
+#define SSD1306_BLACK 0   ///< Draw 'off' pixels
+#define SSD1306_WHITE 1   ///< Draw 'on' pixels
+#define SSD1306_INVERSE 2 ///< Invert pixels
+
+#define SSD1306_MEMORYMODE 0x20          ///< See datasheet
+#define SSD1306_COLUMNADDR 0x21          ///< See datasheet
+#define SSD1306_PAGEADDR 0x22            ///< See datasheet
+#define SSD1306_SETCONTRAST 0x81         ///< See datasheet
+#define SSD1306_CHARGEPUMP 0x8D          ///< See datasheet
+#define SSD1306_SEGREMAP 0xA0            ///< See datasheet
+#define SSD1306_DISPLAYALLON_RESUME 0xA4 ///< See datasheet
+#define SSD1306_DISPLAYALLON 0xA5        ///< Not currently used
+#define SSD1306_NORMALDISPLAY 0xA6       ///< See datasheet
+#define SSD1306_INVERTDISPLAY 0xA7       ///< See datasheet
+#define SSD1306_SETMULTIPLEX 0xA8        ///< See datasheet
+#define SSD1306_DISPLAYOFF 0xAE          ///< See datasheet
+#define SSD1306_DISPLAYON 0xAF           ///< See datasheet
+#define SSD1306_COMSCANINC 0xC0          ///< Not currently used
+#define SSD1306_COMSCANDEC 0xC8          ///< See datasheet
+#define SSD1306_SETDISPLAYOFFSET 0xD3    ///< See datasheet
+#define SSD1306_SETDISPLAYCLOCKDIV 0xD5  ///< See datasheet
+#define SSD1306_SETPRECHARGE 0xD9        ///< See datasheet
+#define SSD1306_SETCOMPINS 0xDA          ///< See datasheet
+#define SSD1306_SETVCOMDETECT 0xDB       ///< See datasheet
+
+#define SSD1306_SETLOWCOLUMN 0x00  ///< Not currently used
+#define SSD1306_SETHIGHCOLUMN 0x10 ///< Not currently used
+#define SSD1306_SETSTARTLINE 0x40  ///< See datasheet
+
+#define SSD1306_EXTERNALVCC 0x01  ///< External display voltage source
+#define SSD1306_SWITCHCAPVCC 0x02 ///< Gen. display voltage from 3.3V
+
+#define SH1106_SETSTARTPAGE 0xB0
+
+#define SSD1306_RIGHT_HORIZONTAL_SCROLL 0x26              ///< Init rt scroll
+#define SSD1306_LEFT_HORIZONTAL_SCROLL 0x27               ///< Init left scroll
+#define SSD1306_VERTICAL_AND_RIGHT_HORIZONTAL_SCROLL 0x29 ///< Init diag scroll
+#define SSD1306_VERTICAL_AND_LEFT_HORIZONTAL_SCROLL 0x2A  ///< Init diag scroll
+#define SSD1306_DEACTIVATE_SCROLL 0x2E                    ///< Stop scroll
+#define SSD1306_ACTIVATE_SCROLL 0x2F                      ///< Start scroll
+#define SSD1306_SET_VERTICAL_SCROLL_AREA 0xA3             ///< Set scroll range
+
+// Deprecated size stuff for backwards compatibility with old sketches
+#if defined SSD1306_128_64 || defined SH1106_128_64
+#define SSD1306_LCDWIDTH 128 ///< DEPRECATED: width w/SSD1306_128_64 defined
+#define SSD1306_LCDHEIGHT 64 ///< DEPRECATED: height w/SSD1306_128_64 defined
+#endif
+#if defined SSD1306_128_32
+#define SSD1306_LCDWIDTH 128 ///< DEPRECATED: width w/SSD1306_128_32 defined
+#define SSD1306_LCDHEIGHT 32 ///< DEPRECATED: height w/SSD1306_128_32 defined
+#endif
+#if defined SSD1306_96_16
+#define SSD1306_LCDWIDTH 96  ///< DEPRECATED: width w/SSD1306_96_16 defined
+#define SSD1306_LCDHEIGHT 16 ///< DEPRECATED: height w/SSD1306_96_16 defined
+#endif
+
+/*!
+    @brief  Class that stores state and functions for interacting with
+            SSD1306 OLED displays.
+*/
+class Adafruit_SSD1306 : public Adafruit_GFX {
+public:
+  // NEW CONSTRUCTORS -- recommended for new projects
+  Adafruit_SSD1306(uint8_t w, uint8_t h, TwoWire *twi = &Wire,
+                   int8_t rst_pin = -1, uint32_t clkDuring = 400000UL,
+                   uint32_t clkAfter = 100000UL);
+  Adafruit_SSD1306(uint8_t w, uint8_t h, int8_t mosi_pin, int8_t sclk_pin,
+                   int8_t dc_pin, int8_t rst_pin, int8_t cs_pin);
+  Adafruit_SSD1306(uint8_t w, uint8_t h, SPIClass *spi, int8_t dc_pin,
+                   int8_t rst_pin, int8_t cs_pin, uint32_t bitrate = 8000000UL);
+
+  // DEPRECATED CONSTRUCTORS - for back compatibility, avoid in new projects
+  Adafruit_SSD1306(int8_t mosi_pin, int8_t sclk_pin, int8_t dc_pin,
+                   int8_t rst_pin, int8_t cs_pin);
+  Adafruit_SSD1306(int8_t dc_pin, int8_t rst_pin, int8_t cs_pin);
+  Adafruit_SSD1306(int8_t rst_pin = -1);
+
+  ~Adafruit_SSD1306(void);
+
+  bool begin(uint8_t switchvcc = SSD1306_SWITCHCAPVCC, uint8_t i2caddr = 0,
+             bool reset = true, bool periphBegin = true);
+  void display(void);
+  void clearDisplay(void);
+  void invertDisplay(bool i);
+  void dim(bool dim);
+  void drawPixel(int16_t x, int16_t y, uint16_t color);
+  virtual void drawFastHLine(int16_t x, int16_t y, int16_t w, uint16_t color);
+  virtual void drawFastVLine(int16_t x, int16_t y, int16_t h, uint16_t color);
+  void startscrollright(uint8_t start, uint8_t stop);
+  void startscrollleft(uint8_t start, uint8_t stop);
+  void startscrolldiagright(uint8_t start, uint8_t stop);
+  void startscrolldiagleft(uint8_t start, uint8_t stop);
+  void stopscroll(void);
+  void ssd1306_command(uint8_t c);
+  bool getPixel(int16_t x, int16_t y);
+  uint8_t *getBuffer(void);
+
+private:
+  inline void SPIwrite(uint8_t d) __attribute__((always_inline));
+  void drawFastHLineInternal(int16_t x, int16_t y, int16_t w, uint16_t color);
+  void drawFastVLineInternal(int16_t x, int16_t y, int16_t h, uint16_t color);
+  void ssd1306_command1(uint8_t c);
+  void ssd1306_commandList(const uint8_t *c, uint8_t n);
+
+  SPIClass *spi;
+  TwoWire *wire;
+  uint8_t *buffer;
+  int8_t i2caddr, vccstate, page_end;
+  int8_t mosiPin, clkPin, dcPin, csPin, rstPin;
+#ifdef HAVE_PORTREG
+  PortReg *mosiPort, *clkPort, *dcPort, *csPort;
+  PortMask mosiPinMask, clkPinMask, dcPinMask, csPinMask;
+#endif
+#if ARDUINO >= 157
+  uint32_t wireClk;    // Wire speed for SSD1306 transfers
+  uint32_t restoreClk; // Wire speed following SSD1306 transfers
+#endif
+  uint8_t contrast; // normal contrast setting for this device
+#if defined(SPI_HAS_TRANSACTION)
+protected:
+  // Allow sub-class to change
+  SPISettings spiSettings;
+#endif
+};
+
+#endif // _Adafruit_SSD1306_H_