Changes needed for opmode to work

Author: alan412

server_python_scripts/blocks_base_classes/__init__.py

@@ -1,7 +1,8 @@
 """Base classes for SystemCore blocks interface."""
 
-from .opmode import OpMode, Teleop
+from .opmode import OpMode, Teleop, Auto, Test, Name, Group
 from .mechanism import Mechanism
 from .robot_base import RobotBase
 
-__all__ = ['OpMode', 'Teleop', 'Mechanism', 'RobotBase']
+__all__ = ['OpMode', 'Teleop', 'Auto', 'Test', 'Name', 'Group'
+           'Mechanism', 'RobotBase']

server_python_scripts/blocks_base_classes/opmode.py

@@ -11,4 +11,16 @@ def stop(self):
 
 # For now this does nothing but it lets the decorator work
 def Teleop(OpMode):
+    return OpMode
+
+def Auto(OpMode):
+    return OpMode
+
+def Test(OpMode):
+    return OpMode
+
+def Name(OpMode, str):
+    return OpMode
+
+def Group(OpMode, str):
     return OpMode

src/editor/extended_python_generator.ts

@@ -26,17 +26,17 @@ import * as MechanismContainerHolder from '../blocks/mrc_mechanism_component_hol
 
 export class OpModeDetails {
   constructor(private name: string, private group : string, private enabled : boolean, private type : string) {}
-  annotations() : string{
+  annotations(className : string) : string{
     let code = '';
 
     if (this.enabled){
       code += '@' + this.type + "\n";
 
       if (this.name){
-        code += '@name("' + this.name + '")\n';
+        code += '@Name(' + className + ', "' + this.name + '")\n';
       }
       if (this.group){
-        code += '@group("' + this.group + '")\n';
+        code += '@Group(' + className + ', "' + this.group + '")\n';
       }
     }
     return code;
@@ -46,10 +46,10 @@ export class OpModeDetails {
     if (this.enabled){
       code += 'from blocks_base_classes import ' + this.type + '\n';
       if (this.name){
-        code += 'from blocks_base_classes import name\n';
+        code += 'from blocks_base_classes import Name\n';
       }
       if (this.group){
-        code += 'from blocks_base_classes import group\n';
+        code += 'from blocks_base_classes import Group\n';
       }
     }
 
@@ -195,7 +195,7 @@ export class ExtendedPythonGenerator extends PythonGenerator {
     if (this.context && this.workspace) {
       const className = this.context.getClassName();
       const classParent = this.context.getClassParent();
-      const annotations = this.details?.annotations();
+      const annotations = this.details?.annotations(className);
       const import_annotations = this.details?.imports();
 
       if(import_annotations){