Merge branch 'MatrixRevC'

Author: 203Null

README.md

@@ -29,7 +29,7 @@ Applications that run on Matrix OS. All user interactions are Matrix OS applicat
    Compile and Upload for Matrix Pro:
    Set Matrix Pro into bootloader mode (Hold the FN key while powering up or going though system settings) and the following
    ```
-   make DEVICE=MatrixPro build uf2-upload
+   make DEVICE=Matrix build uf2-upload
    ```
    TODO
 ### Make your own Matrix OS applications

applications/BootAnimations/MatrixBoot/MatrixBoot.cpp

@@ -188,7 +188,15 @@ void MatrixBoot::BootPhase2QuadSetColor(uint8_t x_offset, uint8_t y_offset, Colo
 }
 
 void MatrixBoot::BootPhase2() {
-  const uint8_t hue[2] = {127, 212};
+  uint8_t hue[2] = {127, 212};
+
+  #if FAMILY == MATRIX
+    if(Device::deviceInfo.Model[3] == 'S')
+    { hue[1] = 43; }
+    else if(Device::deviceInfo.Model[3] == 'P')
+    { hue[1] = 212; }
+  #endif
+
   const uint16_t start_offset = 150;
   if (timer.Tick(10))
   {

applications/Matrix/FactoryMenu/EFuseBurner.cpp

@@ -4,17 +4,17 @@ void BurnEFuse();  // This is in device folder, a custom BurnEFuse will be provi
 
 void FactoryMenu::EFuseBurner() {
 #ifdef EFUSE_BURNER
-  if (esp_efuse_block_is_empty(EFUSE_BLK3))
+  if (true)
   {
     UI efuseConfirm("eFuse Burn Confirmation", Color(0xFFFFFF));
 
     UIButtonLarge confirmBtn("Confirm", Color(0x00FF00), Dimension(2, 2), [&]() -> void {
       BurnEFuse();
-      Exit();
+      efuseConfirm.Exit();
     });
     efuseConfirm.AddUIComponent(confirmBtn, Point(1, 5));
 
-    UIButtonLarge cancelBtn("Cancel", Color(0xFF0000), Dimension(2, 2), [&]() -> void { Exit(); });
+    UIButtonLarge cancelBtn("Cancel", Color(0xFF0000), Dimension(2, 2), [&]() -> void { efuseConfirm.Exit(); });
     efuseConfirm.AddUIComponent(cancelBtn, Point(5, 5));
 
     efuseConfirm.Start();

applications/Matrix/FactoryMenu/FactoryMenu.cpp

@@ -27,6 +27,19 @@ void FactoryMenu::Setup() {
       [&]() -> void {});
   factoryMenu.AddUIComponent(usbConnection, Point(7, 7));
 
+  Color deviceColor = Color(0xFFFFFF);
+  if(Device::deviceInfo.Model[3] == 'S')
+  {
+    deviceColor = Color(0x00FFFF);
+  }
+  else if(Device::deviceInfo.Model[3] == 'P')
+  {
+    deviceColor = Color(0xFF00FF);
+  }
+
+  UIButtonLarge deviceVersionBtn("Device Version", deviceColor, Dimension(4, 1), [&]() -> void {});
+  factoryMenu.AddUIComponent(deviceVersionBtn, Point(2, 7));
+
   factoryMenu.Start();
   Exit();
 }

…SP32S3/Varients/MatrixPro/V100/EFuse.cpp …s/MatrixBlock6_ESP32S3/Drivers/EFuse.cppdevices/MatrixBlock6_ESP32S3/Varients/MatrixPro/V100/EFuse.cpp renamed to devices/MatrixBlock6_ESP32S3/Drivers/EFuse.cpp devices/MatrixBlock6_ESP32S3/Varients/MatrixPro/V100/EFuse.cpp renamed to devices/MatrixBlock6_ESP32S3/Drivers/EFuse.cpp

@@ -1,6 +1,6 @@
 #include "Device.h"
 
-#if FACTORY_CONFIG == V100
+#ifdef FACTORY_CONFIG
 #include "esp_efuse.h"
 #include "esp_efuse_table.h"
 void BurnEFuse() {

devices/MatrixBlock6_ESP32S3/Drivers/Keypad.cpp

@@ -2,38 +2,20 @@
 #include "Device.h"
 #include "timers.h"
 
-#include "ulp_riscv.h"
-#include "ulp_keypad.h"
-
-#include "esp_private/esp_sleep_internal.h"
-#include "esp_private/adc_share_hw_ctrl.h"
-
-#define VELOCITY_SENSITIVE_KEYPAD_ADC_ATTEN ADC_ATTEN_DB_0
-#define VELOCITY_SENSITIVE_KEYPAD_ADC_WIDTH ADC_BITWIDTH_12
-
-extern const uint8_t ulp_keypad_bin_start[] asm("_binary_ulp_keypad_bin_start");
-extern const uint8_t ulp_keypad_bin_end[] asm("_binary_ulp_keypad_bin_end");
-
 namespace Device::KeyPad
 {
-  adc_oneshot_unit_handle_t adc_handle;
   StaticTimer_t keypad_timer_def;
   TimerHandle_t keypad_timer;
 
   void Init() {
     LoadCustomSettings();
+    InitFN();
     InitKeyPad();
     InitTouchBar();
   }
 
-  void Scan() {
-    if (ScanFN())
-      return;
-    if (ScanKeyPad())
-      return;
-  }
-
-  void InitKeyPad() {
+  // TODO Change to use interrupt
+  void InitFN() {
     gpio_config_t io_conf;
 
     // Config FN
@@ -51,66 +33,30 @@ namespace Device::KeyPad
 #endif
     gpio_config(&io_conf);
 
-    // Config Input Pins
-    if (!keypad_config.velocity_sensitive)  // Non velocity sensitive keypad
-    {
-      io_conf.intr_type = GPIO_INTR_DISABLE;
-      io_conf.mode = GPIO_MODE_INPUT;
-      io_conf.pull_down_en = GPIO_PULLDOWN_ENABLE;
-      io_conf.pull_up_en = GPIO_PULLUP_DISABLE;
-      io_conf.pin_bit_mask = 0;
-      for (uint8_t y = 0; y < y_size; y++)
-      { io_conf.pin_bit_mask |= (1ULL << keypad_read_pins[y]); }
-      gpio_config(&io_conf);
-    }
-    else  // Velocity sensitive keypad
-    {
-      adc_oneshot_unit_init_cfg_t init_config = {
-          .unit_id = ADC_UNIT_1,
-          .ulp_mode = ADC_ULP_MODE_RISCV,
-      };
-      adc_oneshot_new_unit(&init_config, &adc_handle);
-
-      adc_oneshot_chan_cfg_t adc_config = {
-          .atten = VELOCITY_SENSITIVE_KEYPAD_ADC_ATTEN,
-          .bitwidth = VELOCITY_SENSITIVE_KEYPAD_ADC_WIDTH,
-      };
-
-      for (uint8_t y = 0; y < y_size; y++)
-      { adc_oneshot_config_channel(adc_handle, keypad_read_adc_channel[y], &adc_config); }
-    }
-
-    // Config Output Pins
-    io_conf.intr_type = GPIO_INTR_DISABLE;
-    io_conf.mode = GPIO_MODE_OUTPUT;
-    io_conf.pull_down_en = GPIO_PULLDOWN_DISABLE;
-    io_conf.pull_up_en = GPIO_PULLUP_DISABLE;
-    io_conf.pin_bit_mask = 0;
-    for (uint8_t x = 0; x < x_size; x++)
-    { io_conf.pin_bit_mask |= (1ULL << keypad_write_pins[x]); }
-    gpio_config(&io_conf);
-
-    // Calibrate the ADC
-    adc_set_hw_calibration_code(ADC_UNIT_1, VELOCITY_SENSITIVE_KEYPAD_ADC_ATTEN);
-
-    // Enables the use of ADC and temperature sensor in monitor (ULP) mode
-    esp_sleep_enable_adc_tsens_monitor(true);
-
     // Set up Matrix OS key config
     fnState.setConfig(&fn_config);
+  }
 
-    for (uint8_t x = 0; x < x_size; x++)
-    {
-      for (uint8_t y = 0; y < y_size; y++)
-      { keypadState[x][y].setConfig(&keypad_config); }
-    }
+  void InitKeyPad() {
+    if (!velocity_sensitivity)
+    { Binary::Init(); }
+    else
+    { FSR::Init(); }
   }
 
   void StartKeyPad() {
-    ulp_riscv_load_binary(ulp_keypad_bin_start, (ulp_keypad_bin_end - ulp_keypad_bin_start));
-    ulp_riscv_run();
+    if (!velocity_sensitivity)
+    {
+      Binary::Start();
+    }
+    else
+    {
+      FSR::Start();
+    }
 
     keypad_timer = xTimerCreateStatic(NULL, configTICK_RATE_HZ / Device::keypad_scanrate, true, NULL, reinterpret_cast<TimerCallbackFunction_t>(Scan), &keypad_timer_def);
+    
+
     xTimerStart(keypad_timer, 0);
   }
 
@@ -119,6 +65,31 @@ namespace Device::KeyPad
     StartTouchBar();
   }
 
+  void Scan() {
+    ScanFN();
+    ScanKeyPad();
+  }
+
+  bool ScanKeyPad() {
+    if (!velocity_sensitivity)
+    { return Binary::Scan(); }
+    else
+    { return FSR::Scan(); }
+  }
+
+  bool ScanFN() {
+    Fract16 read = gpio_get_level(fn_pin) * UINT16_MAX;
+    // ESP_LOGI("FN", "%d", gpio_get_level(fn_pin));
+    if (fn_active_low)
+    { read = UINT16_MAX - (uint16_t)read; }
+    if (fnState.update(read, false))
+    {
+      if (NotifyOS(0, &fnState))
+      { return true; }
+    }
+    return false;
+  }
+
   void Clear() {
     fnState.Clear();
 
@@ -165,86 +136,6 @@ namespace Device::KeyPad
     }
     return nullptr;  // Return an empty KeyInfo
   }
-
-  bool ScanFN() {
-    Fract16 read = gpio_get_level(fn_pin) * UINT16_MAX;
-    // ESP_LOGI("FN", "%d", gpio_get_level(fn_pin));
-    if (fn_active_low)
-    { read = UINT16_MAX - (uint16_t)read; }
-    if (fnState.update(read, false))
-    {
-      if (NotifyOS(0, &fnState))
-      { return true; }
-    }
-    return false;
-  }
-
-  uint16_t middleOfThree(uint16_t a, uint16_t b, uint16_t c)
-  {
-      // Checking for a
-      if ((b <= a && a <= c) || (c <= a && a <= b))
-      return a;
-
-      // Checking for b
-      if ((a <= b && b <= c) || (c <= b && b <= a))
-      return b;
-
-      return c;
-  }
-
-  uint16_t minOfThree(uint16_t a, uint16_t b, uint16_t c)
-  {
-      // Checking for a
-      if (a < b && a < c)
-      return a;
-  
-      // Checking for b
-      if (b < a && b < c)
-      return b;
-  
-      return c;
-  }
-
-  bool ScanKeyPad()
-  {
-    // ESP_LOGI("Keypad ULP", "Scaned: %lu", ulp_count);
-    uint16_t (*result)[8][3] = (uint16_t(*)[8][3])&ulp_result;
-    for(uint8_t y = 0; y < Device::y_size; y ++)
-    {
-      for(uint8_t x = 0; x < Device::x_size; x++)
-      {
-        // printf("%d,", result[x][y][0]);
-        uint16_t reading = 0;
-        if(result[x][y][0] != 0 && result[x][y][1] != 0 && result[x][y][2] != 0)
-        {
-          reading = middleOfThree(result[x][y][0], result[x][y][1], result[x][y][2]);
-        }
-        // uint16_t reading = resxult[x][y][0] + result[x][y][1] + result[x][y][2] + result[x][y][ulp_latest];
-        Fract16 read = (reading << 4) + (reading >> 8);  // Raw Voltage mapped. Will add calibration curve later.
-        bool updated = keypadState[x][y].update(read, true);
-        // if(keypadState[x][y].state == DEBUNCING)
-        // {
-        //   printf("Key %d %d Debuncing - %d - [%d, %d, %d]\n", x, y, (uint16_t)read, result[x][y][ulp_latest], result[x][y][(ulp_latest + 1) % 3], result[x][y][(ulp_latest + 2) % 3]);
-        // }
-        // else if(keypadState[x][y].state == PRESSED)
-        // {
-        //   printf("Key %d %d Pressed - %d - [%d, %d, %d]\n", x, y, (uint16_t)read, result[x][y][ulp_latest], result[x][y][(ulp_latest + 1) % 3], result[x][y][(ulp_latest + 2) % 3]);
-        // }
-        if (updated)
-        {
-          uint16_t keyID = (1 << 12) + (x << 6) + y;
-          if (NotifyOS(keyID, &keypadState[x][y]))
-          {           
-            // printf("\n");
-            return true; 
-          }
-        }
-      }
-    }
-    // printf("\n");
-    return false;
-  }
-
   bool NotifyOS(uint16_t keyID, KeyInfo* keyInfo) {
     KeyEvent keyEvent;
     keyEvent.id = keyID;