a.binder 5 سال پیش
والد
کامیت
7aded4abf6

+ 9 - 1
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/pismo/IN7_MK_BAZA_DYSTRYBUCJI.ditamap

@@ -563,7 +563,9 @@
           
           
           <p><sup>wygenerowano przez procesy5.pl</sup></p>
-          
+          <the_geom xpath="the_geom"
+            system_cache__appinfo:type="gml:SurfacePropertyType"
+            xml_id="d4556e16a"/>
         </body>
         
         <!--<topic id="topic_e22_jwx_yx">
@@ -578,6 +580,12 @@
         <get_wfs_recurse_xsl.RelatedFeature:RelatedFeature xpath="ID_PROJECT" get_wfs_recurse_xsl.RelatedFeature:gml.featureMember.copy="true" xpath_value="../ID" typeName="p5_default_db:Rozdzielcza_rurociag_wsg84" typeNameRealResource="p5_default_db:Rozdzielcza_rurociag_wsg84">
         </get_wfs_recurse_xsl.RelatedFeature:RelatedFeature>
       </IN7_MK_BAZA_DYSTRYBUCJI>
+      <!-- Test the geom only -->
+      <!--<IN7_MK_BAZA_DYSTRYBUCJI>
+        <ID xpath="ID"/>
+        <get_wfs_recurse_xsl.RelatedFeature:RelatedFeature xpath="ID" get_wfs_recurse_xsl.RelatedFeature:gml.featureMember.copy="true" xpath_value="../ID" typeName="p5_default_db:IN7_MK_BAZA_DYSTRYBUCJI" typeNameRealResource="p5_default_db:IN7_MK_BAZA_DYSTRYBUCJI">
+        </get_wfs_recurse_xsl.RelatedFeature:RelatedFeature>
+      </IN7_MK_BAZA_DYSTRYBUCJI>-->
     </map>
     
   </get_wfs_recurse_xsl.RelatedFeatureRoot:RelatedFeatureRoot>

+ 27 - 3
SE/stuff/P5_Automation_can-dev/P5_Automation_can-dev.ino

@@ -75,12 +75,11 @@
  *    logic
  */
 
-
 #include "Queue.h"
  
  Queue<int> _Slave_Ports_queue = Queue<int>(10);
+#include "Slave_Ports_Status.h"
 
- 
 
 
 #define  _ControllerID   0x101 
@@ -176,10 +175,33 @@ MCP_CAN CAN0(CAN_CSpin);                          // Set CS to pin 10
 
 
 #include "_PCINT.h"
+   
+
 
 
 void setup() {
-    Serial.begin(115200);
+
+ Serial.begin(115200);
+ #include "_Slave_Ports_LOCAL_LIST.h"
+ Slave_Ports_Status_T _add[] = { 1, Active_ControllerID, 0x01, 0x00, 1, 0x01, 0x01, 0x01 };
+ 
+
+ Slave_Ports_Status_C.list_ports();
+
+//Slave_Ports_Status_C.add_empty();
+ delay(10000);
+//Queue<int> _Slave_Ports_queue = Queue<int>(10);
+//  LiquidCrystal lcd(LCD1602rs, LCD1602en, LCD1602db4, LCD1602db5, LCD1602db6, LCD1602db7);
+
+
+ //Slave_Ports_Status_T
+//struct Slave_Ports_Status_S _add;
+
+
+
+
+
+
 // _LCD_print_queue.push(1);
 // _LCD_print_queue.push(2);
 // _LCD_print_queue.push(3);
@@ -349,6 +371,8 @@ void loop() {
  
   #include "_PCINT_loop.h"
 
+
+
   time = millis();
   Serial.print("Time: " );
   Serial.println(time);

+ 2 - 1
SE/stuff/P5_Automation_can-dev/_Slave_Ports_LOCAL.h

@@ -3,7 +3,8 @@ _Slave_Port _Slave_Ports[] = {
   {"CAN", 0x102, 0x07, 0x00, 0x00, 0x00, 0x00 }
   //,
   //{"CAN", 0x102, 0x01, 0x00, 0x01, 0xFF, 0x6d } //testowy ttl
-};
+}; //TO BE REPLACED BY  _Slave_Ports_LOCAL_LIST
+
 
 /*
 typedef struct  {

+ 1 - 1
SE/stuff/P5_Automation_can-dev/_Slave_Ports_queue_task_type_LIST.h

@@ -1,5 +1,5 @@
 
-const byte _Slave_Ports_queue_task_type_COUNT = 32;
+const unsigned char _Slave_Ports_queue_task_type_COUNT = 32; // byte is just an 'unsigned char'
 const char _Slave_Ports_queue_task_type_LIST[][_Slave_Ports_queue_task_type_COUNT] = {
         "_NOT_USED", //0
         "_Slave_Ports_ttl_decrement", //1