Add support for joycon programs.

Author: Mysticial

SerialPrograms/CMakeLists.txt

@@ -858,6 +858,8 @@ file(GLOB MAIN_SOURCES
     Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_SelectorWidget.h
     Source/NintendoSwitch/DevPrograms/BoxDraw.cpp
     Source/NintendoSwitch/DevPrograms/BoxDraw.h
+    Source/NintendoSwitch/DevPrograms/JoyconProgram.cpp
+    Source/NintendoSwitch/DevPrograms/JoyconProgram.h
     Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp
     Source/NintendoSwitch/DevPrograms/TestProgramComputer.h
     Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

SerialPrograms/SerialPrograms.pro

@@ -422,6 +422,7 @@ SOURCES += \
     Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Descriptor.cpp \
     Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_ProController.cpp \
     Source/NintendoSwitch/DevPrograms/BoxDraw.cpp \
+    Source/NintendoSwitch/DevPrograms/JoyconProgram.cpp \
     Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp \
     Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp \
     Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramOption.cpp \
@@ -1595,6 +1596,7 @@ HEADERS += \
     Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_ProController.h \
     Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_SelectorWidget.h \
     Source/NintendoSwitch/DevPrograms/BoxDraw.h \
+    Source/NintendoSwitch/DevPrograms/JoyconProgram.h \
     Source/NintendoSwitch/DevPrograms/TestProgramComputer.h \
     Source/NintendoSwitch/DevPrograms/TestProgramSwitch.h \
     Source/NintendoSwitch/NintendoSwitch_ConsoleHandle.h \

SerialPrograms/Source/Controllers/ControllerTypeStrings.cpp

@@ -30,6 +30,8 @@ const EnumStringMap<ControllerFeature> CONTROLLER_FEATURE_STRINGS{
     {ControllerFeature::QueryTickSize,                      "QueryTickSize"},
     {ControllerFeature::QueryCommandQueueSize,              "QueryCommandQueueSize"},
     {ControllerFeature::NintendoSwitch_ProController,       "NintendoSwitch_ProController"},
+    {ControllerFeature::NintendoSwitch_LeftJoycon,          "NintendoSwitch_LeftJoycon"},
+    {ControllerFeature::NintendoSwitch_RightJoycon,         "NintendoSwitch_RightJoycon"},
     {ControllerFeature::NintendoSwitch_DateSkip,            "NintendoSwitch_DateSkip"},
 };
 

SerialPrograms/Source/Controllers/ControllerTypes.h

@@ -40,6 +40,8 @@ enum class ControllerFeature{
     QueryTickSize,
     QueryCommandQueueSize,
     NintendoSwitch_ProController,
+    NintendoSwitch_LeftJoycon,
+    NintendoSwitch_RightJoycon,
     NintendoSwitch_DateSkip,
 };
 

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase.cpp

@@ -114,10 +114,12 @@ const std::map<
             {ControllerType::NintendoSwitch_LeftJoycon, {
                 ControllerFeature::TickPrecise,
                 ControllerFeature::QueryCommandQueueSize,
+                ControllerFeature::NintendoSwitch_LeftJoycon,
             }},
             {ControllerType::NintendoSwitch_RightJoycon, {
                 ControllerFeature::TickPrecise,
                 ControllerFeature::QueryCommandQueueSize,
+                ControllerFeature::NintendoSwitch_RightJoycon,
             }},
         }},
     }},

SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp

@@ -142,6 +142,46 @@ int register_message_converters_push_button_framework(){
     return 0;
 }
 int init_PushButtonFramework = register_message_converters_push_button_framework();
+
+
+
+
+
+
+void pbf_wait(JoyconContext& context, Milliseconds duration){
+    ssf_do_nothing(context, duration);
+}
+void pbf_press_button(JoyconContext& context, Button button, Milliseconds hold, Milliseconds release){
+    ssf_press_button(context, button, hold + release, hold, 0ms);
+}
+void pbf_move_joystick(JoyconContext& context, uint8_t x, uint8_t y, Milliseconds hold, Milliseconds release){
+    ssf_press_joystick(context, x, y, hold + release, hold, 0ms);
+}
+void pbf_mash_button(JoyconContext& context, Button button, Milliseconds duration){
+    ssf_mash1_button(context, button, duration);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h

@@ -18,6 +18,7 @@
 #define PokemonAutomation_NintendoSwitch_Commands_PushButtons_H
 
 #include "NintendoSwitch/Controllers/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/Controllers/NintendoSwitch_Joycon.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -114,6 +115,15 @@ void pbf_controller_state(
 
 
 
+
+void pbf_wait           (JoyconContext& context, Milliseconds duration);
+void pbf_press_button   (JoyconContext& context, Button button, Milliseconds hold, Milliseconds release);
+void pbf_move_joystick  (JoyconContext& context, uint8_t x, uint8_t y, Milliseconds hold, Milliseconds release);
+void pbf_mash_button    (JoyconContext& context, Button button, Milliseconds duration);
+
+
+
+
 }
 }
 #endif

SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.cpp

@@ -136,6 +136,29 @@ void ssf_issue_scroll(
 
 
 
+void ssf_flush_pipeline(JoyconContext& context){
+    context->issue_barrier(&context);
+}
+void ssf_do_nothing(JoyconContext& context, Milliseconds duration){
+    context->issue_nop(&context, duration);
+}
+void ssf_press_button(
+    JoyconContext& context,
+    Button button,
+    Milliseconds delay, Milliseconds hold, Milliseconds cool
+){
+    context->issue_buttons(&context, button, delay, hold, cool);
+}
+void ssf_press_joystick(
+    JoyconContext& context,
+    uint8_t x, uint8_t y,
+    Milliseconds delay, Milliseconds hold, Milliseconds cool
+){
+    context->issue_joystick(&context, x, y, delay, hold, cool);
+}
+void ssf_mash1_button(JoyconContext& context, Button button, Milliseconds duration){
+    context->issue_mash_button(&context, button, duration);
+}
 
 
 

SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h

@@ -16,7 +16,7 @@
 #define PokemonAutomation_NintendoSwitch_Commands_Superscalar_H
 
 #include "NintendoSwitch/Controllers/NintendoSwitch_ProController.h"
-
+#include "NintendoSwitch/Controllers/NintendoSwitch_Joycon.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -215,6 +215,25 @@ inline void ssf_hold_joystick1(
 
 
 
+void ssf_flush_pipeline (JoyconContext& context);
+void ssf_do_nothing     (JoyconContext& context, Milliseconds duration);
+void ssf_press_button(
+    JoyconContext& context,
+    Button button,
+    Milliseconds delay, Milliseconds hold = 3*15ms, Milliseconds cool = 2*15ms
+);
+void ssf_press_joystick(
+    JoyconContext& context,
+    uint8_t x, uint8_t y,
+    Milliseconds delay, Milliseconds hold, Milliseconds cool = 0ms
+);
+void ssf_mash1_button   (JoyconContext& context, Button button, Milliseconds duration);
+
+
+
+
+
+
 }
 }
 #endif

SerialPrograms/Source/NintendoSwitch/DevPrograms/JoyconProgram.cpp

@@ -0,0 +1,66 @@
+/*  Joycon Test Program
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Controllers/NintendoSwitch_Joycon.h"
+#include "JoyconProgram.h"
+
+//  REMOVE
+#include <iostream>
+using std::cout;
+using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+JoyconProgram_Descriptor::JoyconProgram_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "NintendoSwitch:JoyconProgram",
+        "Nintendo Switch", "Joycon Program",
+        "",
+        "Template for a joycon program.",
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS,
+        {ControllerFeature::NintendoSwitch_RightJoycon},
+        FasterIfTickPrecise::NOT_FASTER
+    )
+{}
+
+
+JoyconProgram::JoyconProgram(){}
+void JoyconProgram::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
+    JoyconContext context(scope, env.console.controller<JoyconController>());
+
+    //
+    //  Sample joycon program.
+    //
+    //  This will start from the grip menu and enter the system settings.
+    //  Note that the joycon is horizontal.
+    //
+    //  You can press any button, but if it doesn't exist, it won't do anything.
+    //
+    //  No support for gyro yet. That's coming later.
+    //
+
+    pbf_press_button(context, BUTTON_A, 200ms, 2000ms);
+    pbf_press_button(context, BUTTON_HOME, 200ms, 2000ms);
+    pbf_move_joystick(context, 128, 0, 100ms, 100ms);
+    pbf_move_joystick(context, 128, 0, 100ms, 100ms);
+    pbf_move_joystick(context, 255, 128, 100ms, 100ms);
+    pbf_move_joystick(context, 128, 0, 100ms, 100ms);
+    pbf_press_button(context, BUTTON_X, 200ms, 2000ms);
+
+
+}
+
+
+
+
+
+
+}
+}