cchen/OGX-Mini
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.0.0-alpha

Browse Source
This commit is contained in:
wiredopposite
2024-12-20 00:32:43 -07:00
parent 9a8a5313b2
commit ee8d5e7036
8 changed files with 9 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/RP2040/src/Bluepad32/Bluepad32.cpp
View File

@@ -119,7 +119,7 @@ static void init_complete_cb(void)
{
uni_bt_enable_new_connections_unsafe(true);
// uni_bt_del_keys_unsafe();
uni_bt_del_keys_unsafe();
uni_property_dump_all();
}

2
Firmware/RP2040/src/Board/board_api.cpp
View File

@@ -216,7 +216,9 @@ void init_board()
mutex_exit(&gpio_mutex_);
#if (OGXM_BOARD != PI_PICOW)
set_led(false);
#endif
OGXM_LOG("Board initialized\n");
}

1
Firmware/RP2040/src/Gamepad.h
View File

@@ -86,7 +86,6 @@ public:
uint8_t MAP_ANALOG_OFF_LB = ANALOG_OFF_LB ;
uint8_t MAP_ANALOG_OFF_RB = ANALOG_OFF_RB ;
//
#pragma pack(push, 1)
struct PadIn
{

2
Firmware/RP2040/src/I2CDriver/ESP32/I2CDriver.cpp
View File

@@ -21,7 +21,7 @@ struct PacketIn
uint8_t packet_len;
uint8_t packet_id;
uint8_t index;
uint8_t gp_data[sizeof(Gamepad::PadIn) - sizeof(Gamepad::PadIn::analog) - sizeof(Gamepad::PadIn::chatpad)];
uint8_t gp_data[sizeof(Gamepad::PadIn) - sizeof(Gamepad::PadIn::analog)];
PacketIn()
{

4
Firmware/RP2040/src/OGXMini/OGXMini_PicoW.cpp
View File

@@ -24,8 +24,8 @@ void update_tud_status(bool host_mounted) { }
void core1_task()
{
if (cyw43_arch_init() != 0)
{
return;
{
panic("CYW43 init failed");
}
//Doesn't return, don't do anything with core1 unless it's executing within the BTStack loop

450
Firmware/RP2040/src/TaskQueue/TaskQueue.cpp
View File

@@ -213,16 +213,6 @@ private:
static inline uint32_t TIMER_IRQ(uint32_t alarm_num)
{
// switch (alarm_num)
// {
// case 1:
// return TIMER_IRQ_1;
// case 2:
// return TIMER_IRQ_2;
// default:
// return TIMER_IRQ_0;
// }
return timer_hardware_alarm_get_irq_num(timer_hw, alarm_num);
}
@@ -358,442 +348,4 @@ namespace Core1
#endif // OGXM_BOARD != PI_PICOW
} // namespace TaskQueue
// #include <array>
// #include <algorithm>
// #include <pico/stdlib.h>
// #include <hardware/timer.h>
// #include <hardware/irq.h>
// #include <hardware/sync.h>
// #include "Board/board_api.h"
// #include "TaskQueue/TaskQueue.h"
// namespace TaskQueue {
// struct Task
// {
// // uint32_t task_id = 0;
// std::function<void()> function = nullptr;
// };
// struct DelayedTask
// {
// uint32_t task_id = 0;
// uint32_t interval_ms = 0;
// uint64_t target_time = 0;
// std::function<void()> function = nullptr;
// };
// static constexpr uint8_t MAX_TASKS = 8;
// static constexpr uint8_t MAX_DELAYED_TASKS = MAX_TASKS * 2;
// static inline uint32_t TIMER_IRQ(int alarm_num)
// {
// return timer_hardware_alarm_get_irq_num(timer_hw, alarm_num);
// }
// static uint64_t get_time_64_us()
// {
// static spin_lock_t* spinlock_64_us = spin_lock_instance(4);
// uint32_t irq_state = spin_lock_blocking(spinlock_64_us);
// uint32_t lo = timer_hw->timelr;
// uint32_t hi = timer_hw->timehr;
// spin_unlock(spinlock_64_us, irq_state);
// return ((uint64_t) hi << 32u) | lo;;
// }
// #if OGXM_BOARD != PI_PICOW
// namespace Core1 {
// static constexpr uint32_t ALARM_NUM = 1;
// static std::array<Task, MAX_TASKS> tasks_;
// static std::array<DelayedTask, MAX_DELAYED_TASKS> delayed_tasks_;
// static bool delay_irq_set_ = false;
// static uint32_t new_task_id_ = 1;
// static spin_lock_t* spinlock_ = spin_lock_instance(1);
// static spin_lock_t* spinlock_delayed_ = spin_lock_instance(2);
// bool queue_task(const std::function<void()>& function);
// uint32_t get_new_task_id()
// {
// return new_task_id_++;
// }
// static void timer_irq_handler()
// {
// hw_clear_bits(&timer_hw->intr, 1u << ALARM_NUM);
// uint64_t now = get_time_64_us();
// uint32_t irq_state = spin_lock_blocking(spinlock_delayed_);
// for (auto& task : delayed_tasks_)
// {
// if (task.function && task.target_time <= now)
// {
// auto function = task.function;
// if (task.interval_ms)
// {
// task.target_time += (task.interval_ms * 1000);
// }
// else
// {
// task.function = nullptr;
// task.task_id = 0;
// }
// spin_unlock(spinlock_delayed_, irq_state);
// queue_task(function);
// irq_state = spin_lock_blocking(spinlock_delayed_);
// }
// }
// auto it = std::min_element(delayed_tasks_.begin(), delayed_tasks_.end(), [](const DelayedTask& a, const DelayedTask& b)
// {
// //Get task with the earliest target time
// return a.function && (!b.function || a.target_time < b.target_time);
// });
// if (it != delayed_tasks_.end() && it->function)
// {
// timer_hw->alarm[ALARM_NUM] = static_cast<uint32_t>(it->target_time);
// }
// spin_unlock(spinlock_delayed_, irq_state);
// }
// bool queue_delayed_task(uint32_t task_id, uint32_t delay_ms, bool repeating, const std::function<void()>& function)
// {
// uint32_t irq_state = spin_lock_blocking(spinlock_delayed_);
// for (const auto& task : delayed_tasks_)
// {
// if (task.task_id == task_id)
// {
// spin_unlock(spinlock_delayed_, irq_state);
// return false;
// }
// }
// spin_unlock(spinlock_delayed_, irq_state);
// hw_set_bits(&timer_hw->inte, 1u << ALARM_NUM);
// if (!delay_irq_set_)
// {
// delay_irq_set_ = true;
// irq_set_exclusive_handler(TIMER_IRQ(ALARM_NUM), timer_irq_handler);
// irq_set_enabled(TIMER_IRQ(ALARM_NUM), true);
// }
// irq_state = spin_lock_blocking(spinlock_delayed_);
// //Might come back to this, there is overflow potential
// uint64_t target_time = timer_hw->timerawl + static_cast<uint64_t>(delay_ms) * 1000;
// for (auto& task : delayed_tasks_)
// {
// if (!task.function)
// {
// task.target_time = target_time;
// task.interval_ms = repeating ? delay_ms : 0;
// task.function = function;
// task.task_id = task_id;
// auto it = std::min_element(delayed_tasks_.begin(), delayed_tasks_.end(), [](const DelayedTask& a, const DelayedTask& b)
// {
// return a.function && (!b.function || a.target_time < b.target_time);
// });
// if (it != delayed_tasks_.end() && it->function)
// {
// timer_hw->alarm[ALARM_NUM] = static_cast<uint32_t>(it->target_time);
// }
// spin_unlock(spinlock_delayed_, irq_state);
// return true;
// }
// }
// spin_unlock(spinlock_delayed_, irq_state);
// return false;
// }
// void cancel_delayed_task(uint32_t task_id)
// {
// uint32_t irq_state = spin_lock_blocking(spinlock_delayed_);
// bool found = false;
// for (auto& task : delayed_tasks_)
// {
// if (task.task_id == task_id)
// {
// task.function = nullptr;
// task.task_id = 0;
// found = true;
// }
// }
// if (!found || !delay_irq_set_)
// {
// spin_unlock(spinlock_delayed_, irq_state);
// return;
// }
// hw_set_bits(&timer_hw->inte, 1u << ALARM_NUM);
// auto it = std::min_element(delayed_tasks_.begin(), delayed_tasks_.end(), [](const DelayedTask& a, const DelayedTask& b)
// {
// return a.function && (!b.function || a.target_time < b.target_time);
// });
// if (it != delayed_tasks_.end() && it->function)
// {
// timer_hw->alarm[ALARM_NUM] = static_cast<uint32_t>(it->target_time);
// }
// spin_unlock(spinlock_delayed_, irq_state);
// }
// bool queue_task(const std::function<void()>& function)
// {
// uint32_t irq_state = spin_lock_blocking(spinlock_);
// for (auto& task : tasks_)
// {
// if (!task.function)
// {
// task.function = function;
// spin_unlock(spinlock_, irq_state);
// return true;
// }
// }
// spin_unlock(spinlock_, irq_state);
// return false;
// }
// void process_tasks()
// {
// uint32_t irq_state = spin_lock_blocking(spinlock_);
// for (auto& task : tasks_)
// {
// if (task.function)
// {
// auto function = task.function;
// task.function = nullptr;
// spin_unlock(spinlock_, irq_state);
// function();
// irq_state = spin_lock_blocking(spinlock_);
// }
// else
// {
// break; //No more tasks
// }
// }
// spin_unlock(spinlock_, irq_state);
// }
// } // namespace Core1
// #endif // OGXM_BOARD != PI_PICOW
// namespace Core0 {
// #if OGXM_BOARD == PI_PICOW
// static constexpr uint32_t ALARM_NUM = 1;
// #else
// static constexpr uint32_t ALARM_NUM = 0;
// #endif
// static std::array<Task, MAX_TASKS> tasks_;
// static std::array<DelayedTask, MAX_DELAYED_TASKS> delayed_tasks_;
// static bool delay_irq_set_ = false;
// static uint32_t new_task_id_ = 1;
// static spin_lock_t* spinlock_ = spin_lock_instance(3);
// static spin_lock_t* spinlock_delayed_ = spin_lock_instance(4);
// uint32_t get_new_task_id()
// {
// return new_task_id_++;
// }
// static void timer_irq_handler()
// {
// hw_clear_bits(&timer_hw->intr, 1u << ALARM_NUM);
// uint64_t now = get_time_64_us();
// uint32_t irq_state = spin_lock_blocking(spinlock_delayed_);
// for (auto& task : delayed_tasks_)
// {
// if (task.function && task.target_time <= now)
// {
// auto function = task.function;
// if (task.interval_ms)
// {
// task.target_time += (task.interval_ms * 1000);
// }
// else
// {
// task.function = nullptr;
// task.task_id = 0;
// }
// spin_unlock(spinlock_delayed_, irq_state);
// queue_task(function);
// irq_state = spin_lock_blocking(spinlock_delayed_);
// }
// }
// auto it = std::min_element(delayed_tasks_.begin(), delayed_tasks_.end(), [](const DelayedTask& a, const DelayedTask& b)
// {
// return a.function && (!b.function || a.target_time < b.target_time);
// });
// if (it != delayed_tasks_.end() && it->function)
// {
// timer_hw->alarm[ALARM_NUM] = static_cast<uint32_t>(it->target_time);
// }
// spin_unlock(spinlock_delayed_, irq_state);
// }
// bool queue_delayed_task(uint32_t task_id, uint32_t delay_ms, bool repeating, const std::function<void()>& function)
// {
// uint32_t irq_state = spin_lock_blocking(spinlock_delayed_);
// for (const auto& task : delayed_tasks_)
// {
// if (task.task_id == task_id)
// {
// spin_unlock(spinlock_delayed_, irq_state);
// return false;
// }
// }
// spin_unlock(spinlock_delayed_, irq_state);
// hw_set_bits(&timer_hw->inte, 1u << ALARM_NUM);
// if (!delay_irq_set_)
// {
// delay_irq_set_ = true;
// irq_set_exclusive_handler(TIMER_IRQ(ALARM_NUM), timer_irq_handler);
// irq_set_enabled(TIMER_IRQ(ALARM_NUM), true);
// }
// irq_state = spin_lock_blocking(spinlock_delayed_);
// uint64_t target_time = timer_hw->timerawl + static_cast<uint64_t>(delay_ms) * 1000;
// for (auto& task : delayed_tasks_)
// {
// if (!task.function)
// {
// task.target_time = target_time;
// task.interval_ms = repeating ? delay_ms : 0;
// task.function = function;
// task.task_id = task_id;
// auto it = std::min_element(delayed_tasks_.begin(), delayed_tasks_.end(), [](const DelayedTask& a, const DelayedTask& b)
// {
// return a.function && (!b.function || a.target_time < b.target_time);
// });
// if (it != delayed_tasks_.end() && it->function)
// {
// timer_hw->alarm[ALARM_NUM] = static_cast<uint32_t>(it->target_time);
// }
// spin_unlock(spinlock_delayed_, irq_state);
// return true;
// }
// }
// spin_unlock(spinlock_delayed_, irq_state);
// return false;
// }
// void cancel_delayed_task(uint32_t task_id)
// {
// uint32_t irq_state = spin_lock_blocking(spinlock_delayed_);
// bool found = false;
// for (auto& task : delayed_tasks_)
// {
// if (task.task_id == task_id)
// {
// task.function = nullptr;
// task.task_id = 0;
// found = true;
// }
// }
// if (!found || !delay_irq_set_)
// {
// spin_unlock(spinlock_delayed_, irq_state);
// return;
// }
// hw_set_bits(&timer_hw->inte, 1u << ALARM_NUM);
// auto it = std::min_element(delayed_tasks_.begin(), delayed_tasks_.end(), [](const DelayedTask& a, const DelayedTask& b)
// {
// return a.function && (!b.function || a.target_time < b.target_time);
// });
// if (it != delayed_tasks_.end() && it->function)
// {
// timer_hw->alarm[ALARM_NUM] = static_cast<uint32_t>(it->target_time);
// }
// spin_unlock(spinlock_delayed_, irq_state);
// }
// bool queue_task(const std::function<void()>& function)
// {
// uint32_t irq_state = spin_lock_blocking(spinlock_);
// for (auto& task : tasks_)
// {
// if (!task.function)
// {
// task.function = function;
// spin_unlock(spinlock_, irq_state);
// return true;
// }
// }
// spin_unlock(spinlock_, irq_state);
// return false;
// }
// void process_tasks()
// {
// uint32_t irq_state = spin_lock_blocking(spinlock_);
// for (auto& task : tasks_)
// {
// if (task.function)
// {
// auto function = task.function;
// task.function = nullptr;
// spin_unlock(spinlock_, irq_state);
// function();
// irq_state = spin_lock_blocking(spinlock_);
// }
// else
// {
// break; //No more tasks
// }
// }
// spin_unlock(spinlock_, irq_state);
// }
// } // namespace Core0
// } // namespace TaskQueue
} // namespace TaskQueue

1
Firmware/RP2040/src/USBDevice/DeviceDriver/XboxOG/XboxOG_SB.cpp
View File

@@ -1,4 +1,5 @@
#include <cstring>
#include <cstdlib>
#include <pico/time.h>
#include "Descriptors/XInput.h"

2
README.md
View File

@@ -1,7 +1,7 @@
# OGX-Mini
![OGX-Mini Boards](images/OGX-Mini-github.jpg "OGX-Mini Boards")
Firmware for the RP2040, capable of emulating gamepads for several game consoles. The firmware comes in many flavors, supported on the [Adafruit Feather USB Host board](https://www.adafruit.com/product/5723), Pi Pico, Waveshare RP2040-Zero, Pi Pico W, RP2040/ESP32 hybrid, and a 4-Channel RP2040-Zero setup.
Firmware for the RP2040, capable of emulating gamepads for several game consoles. The firmware comes in many flavors, supported on the [Adafruit Feather USB Host board](https://www.adafruit.com/product/5723), Pi Pico, Pi Pico 2, Waveshare RP2040-Zero, Pi Pico W, RP2040/ESP32 hybrid, and a 4-Channel RP2040-Zero setup.
## Supported platforms
- Original Xbox