a.binder 4 gadi atpakaļ
vecāks
revīzija
f255b3489e

+ 2 - 0
SE/schema/WPS_Functions/automation_driven/build.automation_driven.PRODUCT.xml

@@ -74,6 +74,8 @@
    <property name="automation_driven.module"
              location="${automation_driven.repository}/automation_driven.module"/>
    
+   
+   <include file="build.automation_driven_main.PRODUCT.submodule.xml"/>
    <include file="build.automation_driven.PRODUCT.submodule.xml"/>
    <include file="build.automation_driven.PRODUCT.raspberry.xml"/>
    

+ 63 - 0
SE/schema/WPS_Functions/automation_driven/build_automation_driven.xml

@@ -29,6 +29,69 @@
    <extension-point name="default" depends="PRODUCT.PRODUCT,INSTALL.INSTALL"/>
    
    
+   
+   
+   
+   
+   
+   <target name="automation_driven_main.submodule.xsd__struct_write.lcd_menu"
+      description="to generate lcd menu from assoc obj  NATIVE AUTOMATION TODO" 
+      depends="automation_driven.submodule.xsd__struct_files__fixed"
+      >
+      
+      <!--depends="automation_driven.submodule.xsd__struct_files__fixed"-->
+      
+      <echo>#801 generating from ${automation_driven.submodule.struct.write_neuron.lcd_menu.xsd} </echo>
+      <xslt basedir="${automation_driven.submodule.basedir}"
+         destdir="${automation_driven.submodule.temp}"
+         force="true"
+         in="${automation_driven_main.submodule.struct.write.lcd_menu.xsd}"
+         out="${automation_driven_main.submodule.struct.write.lcd_menu.h}"
+         style="${automation_driven_main.submodule.struct.write.lcd_menu.xsl}"> <!-- ${automation_driven.submodule.struct.h} -->
+         <factory name="net.sf.saxon.TransformerFactoryImpl">
+            <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
+            <!--<attribute name="http://saxon.sf.net/feature/initialTemplate"
+               value="{http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/automation_driven/automation_driven.submodule.struct.xsd}read.xml"/>-->
+            <attribute name="http://saxon.sf.net/feature/initialMode"
+               value="{http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/automation_driven/automation_driven.submodule.struct.xsd}write.lcd_menu.h"/>
+            <attribute name="http://saxon.sf.net/feature/dtd-validation-recoverable"
+               value="true"/>
+         </factory>
+         <param name="build_complexType_dir" expression="${build_complexType.local}"/>
+         <param name="detect_resource_type.local" expression="${detect_resource_type.local}"/>
+         <param name="detect_objects_parent_relations.xml" expression="${detect_objects_parent_relations.xml}"/>
+         <param name="{http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/automation_driven/automation_driven.xsd}basedir"
+            expression="${automation_driven.basedir}"/>
+         <param name="{http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/automation_driven/automation_driven.xsd}repository"
+            expression="${automation_driven.repository}"/>
+         <param name="{http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/automation_driven/automation_driven.xsd}temp"
+            expression="${automation_driven.temp}"/>
+         
+         <param name="{http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/automation_driven/automation_driven.submodule.xsd}basedir"
+            expression="${automation_driven.submodule.basedir}"/>
+         <param name="{http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/automation_driven/automation_driven.submodule.xsd}repository"
+            expression="${automation_driven.submodule.repository}"/>
+         <param name="{http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/automation_driven/automation_driven.submodule.xsd}temp"
+            expression="${automation_driven.submodule.temp}"/>
+         
+         <param name="{http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/automation_driven/automation_driven.submodule.struct.xsd}h"
+            expression="${automation_driven.submodule.struct.h}"/>
+         
+         <param name="{http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/automation_driven/automation_driven.submodule.namespaces.xsd}xsd"
+            expression="${automation_driven.submodule.namespaces.xsd}"/>
+       
+         <param name="{http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/automation_driven/automation_driven.submodule.struct.xsd}struct_files_fix_default.xml"
+            expression="${automation_driven.submodule.xsd__struct_files_fix_default.xml}"/>
+         
+         <classpath location="/opt/local/share/java/saxon9he.jar"/>
+         <xmlcatalog refid="dita-ot.dtd.catalog"/>
+      </xslt>
+   </target>
+   
+   
+   
+   
+   
    <target name="automation_driven.submodule.xsd__struct_write_neuron"
       description="to initially generate h " >
       <echo>#42 generating from ${automation_driven.submodule.struct.write.xsd} </echo>

+ 13 - 8
SE/stuff/P5_Automation_can-dev-res-working-1930/P5_Automation_can-dev-res-working-1930.ino

@@ -254,7 +254,7 @@ const int DISPLAY_MENU_A__PROGMEM_CONSOLE_PRINT = 3 ;
  */
 
 //BEGIN 1602
-#if defined(HAS_LCD1602)
+#if defined(HAS_LCD1602)  or defined(HAS_LCD1602_I2C)
  
   // initialize the library with the numbers of the interface pins
   //LiquidCrystal lcd(4, 6, 10, 11, 12, 13);
@@ -318,11 +318,11 @@ const int DISPLAY_MENU_A__PROGMEM_CONSOLE_PRINT = 3 ;
 
 
 
-#if defined(HAS_LCD1602)
+#if defined(HAS_LCD1602) or defined(HAS_LCD1602_I2C)
   #include "_LCD1602_init.h"
 #endif
 
-#if defined(HAS_LCD1602)
+#if defined(HAS_LCD1602)  or defined(HAS_LCD1602_I2C)
   #include "_LCD1602_func.h"
   //#include "_LCD1602_init.h"
 #endif
@@ -444,6 +444,12 @@ const int DISPLAY_MENU_A__PROGMEM_CONSOLE_PRINT = 3 ;
 
  #include "scan.h"
 
+
+//test driven lcd_display
+#include "automation_driven_main.submodule.struct.write.lcd_menu.h"
+
+
+
 void setup() {  //REMEMBER NOT INITIALIZE ANY VARIABLES OR ARRAYS
     Serial.begin(115200);
      Wire.begin();
@@ -502,7 +508,7 @@ ARDUINO_SETUP_DEF_T HAS_ROTTARY_SW_A = false;
   
   // put your setup code here, to run once:
 ARDUINO_SETUP_DEF_T HAS_LCD1602_A = false; //todo
-  #if defined(HAS_LCD1602)
+  #if defined(HAS_LCD1602)  or defined(HAS_LCD1602_I2C)
    #include "_LCD1602_setup.h"
   #endif
 
@@ -518,7 +524,7 @@ ARDUINO_SETUP_DEF_T HAS_TFT_ILI9163C_A = false ; //todo
   
   #include "_CAN_setup.h" //lite _CAN/
  
-   #if defined(HAS_LCD1602) 
+   #if defined(HAS_LCD1602)  or defined(HAS_LCD1602_I2C)
    /* todo 
       LCDarray1 = "loop.... ";
       LCDarray2 = "....";
@@ -536,8 +542,6 @@ ARDUINO_SETUP_DEF_T HAS_TFT_ILI9163C_A = false ; //todo
         #include "___DEBUG/___DEBUG_DISABLE_SETUP.h"
     #endif
 
-
-
 }
 
     //#if Active_ControllerID == _ControllerID
@@ -552,6 +556,7 @@ ARDUINO_SETUP_DEF_T HAS_TFT_ILI9163C_A = false ; //todo
    #include "_LOOP_LATENCY_COUNTER.h" //lite ___loop/
 
 
+
 void loop() {
     register long time;
     time = millis();
@@ -582,7 +587,7 @@ void loop() {
      //   Serial.print("] COUNTER__MAIN_END_A["); Serial.print(ARDUINO_LOOP_LATENCY_COUNTER__MAIN_END_A);
     }
   DEBUG_LAST_ACTION_TRIG = DEBUG_ACTION_TRIG ;
-  
+
 }