From d667b7d01e5b75b8f55269414c6733c3fd993c5d Mon Sep 17 00:00:00 2001
From: Klagarge <remi@heredero.ch>
Date: Thu, 7 Sep 2023 16:56:02 +0200
Subject: [PATCH] try way to setup drive every time

---
 .../app/factory/factory.c                     |   2 +-
 .../nbproject/configurations.xml              |   5 +-
 ...nter.hex => v1_0_2-without_set_center.hex} |   0
 busmaster_config.cfx                          | 171 ++++++------------
 threewheeler.DBF                              |  13 +-
 5 files changed, 74 insertions(+), 117 deletions(-)
 rename binary_files/{without_set_center.hex => v1_0_2-without_set_center.hex} (100%)

diff --git a/306-controller_interface.X/app/factory/factory.c b/306-controller_interface.X/app/factory/factory.c
index f326b16..56b976f 100644
--- a/306-controller_interface.X/app/factory/factory.c
+++ b/306-controller_interface.X/app/factory/factory.c
@@ -57,7 +57,7 @@ void Factory_build() {
     
     ALIVE_onAlive(ALcontroller(), CM_CONTROLLER_ALIVE, NULL);
     
-    ALIVE_onSetup(ALjoy(), CM_JOY_SETUP, NULL);
+    //ALIVE_onSetup(ALjoy(), CM_JOY_SETUP, NULL);
     ALIVE_setAliveTime(ALjoy(), KART_CST.JOYSTICK_ALIVE_TIME);
     //ALIVE_onBorn(ALjoy(), LED_on, l1());
     ALIVE_onDead(ALjoy(), deadJoystick, NULL);
diff --git a/306-controller_interface.X/nbproject/configurations.xml b/306-controller_interface.X/nbproject/configurations.xml
index c7281e6..39bf0d7 100644
--- a/306-controller_interface.X/nbproject/configurations.xml
+++ b/306-controller_interface.X/nbproject/configurations.xml
@@ -224,7 +224,6 @@
         <property key="debugoptions.useswbreakpoints" value="false"/>
         <property key="event.recorder.enabled" value="false"/>
         <property key="event.recorder.scvd.files" value=""/>
-        <property key="firmware.download.all" value="false"/>
         <property key="hwtoolclock.frcindebug" value="false"/>
         <property key="lastid" value=""/>
         <property key="memories.aux" value="false"/>
@@ -248,7 +247,7 @@
         <property key="programoptions.preservedataflash" value="false"/>
         <property key="programoptions.preservedataflash.ranges"
                   value="${programoptions.preservedataflash.ranges}"/>
-        <property key="programoptions.preserveeeprom" value="false"/>
+        <property key="programoptions.preserveeeprom" value="true"/>
         <property key="programoptions.preserveeeprom.ranges" value="310000-3103ff"/>
         <property key="programoptions.preserveprogram.ranges" value=""/>
         <property key="programoptions.preserveprogramrange" value="false"/>
@@ -296,7 +295,7 @@
         <property key="programoptions.preservedataflash" value="false"/>
         <property key="programoptions.preservedataflash.ranges"
                   value="${programoptions.preservedataflash.ranges}"/>
-        <property key="programoptions.preserveeeprom" value="false"/>
+        <property key="programoptions.preserveeeprom" value="true"/>
         <property key="programoptions.preserveeeprom.ranges" value="310000-3103ff"/>
         <property key="programoptions.preserveprogram.ranges" value=""/>
         <property key="programoptions.preserveprogramrange" value="false"/>
diff --git a/binary_files/without_set_center.hex b/binary_files/v1_0_2-without_set_center.hex
similarity index 100%
rename from binary_files/without_set_center.hex
rename to binary_files/v1_0_2-without_set_center.hex
diff --git a/busmaster_config.cfx b/busmaster_config.cfx
index d30f012..25b8137 100644
--- a/busmaster_config.cfx
+++ b/busmaster_config.cfx
@@ -2,14 +2,14 @@
 <BUSMASTER_CONFIGURATION>
   <Global_Configuration>
     <BUSMASTER_Version>3.2.2</BUSMASTER_Version>
-    <IsMsgFilterEnabled>FALSE</IsMsgFilterEnabled>
+    <IsMsgFilterEnabled>TRUE</IsMsgFilterEnabled>
     <IsMsgFilterEnabledLin>FALSE</IsMsgFilterEnabledLin>
     <IsReplayFilterEnabled>FALSE</IsReplayFilterEnabled>
     <IsLogFilterEnabled>FALSE</IsLogFilterEnabled>
     <IsLogFilterLINEnabled>FALSE</IsLogFilterLINEnabled>
     <IsLoggingEnabled>FALSE</IsLoggingEnabled>
     <IsMsgIntepretationEnabled>TRUE</IsMsgIntepretationEnabled>
-    <IsOverWriteEnabled>TRUE</IsOverWriteEnabled>
+    <IsOverWriteEnabled>FALSE</IsOverWriteEnabled>
     <DisplayTimeMode>SYSTEM</DisplayTimeMode>
     <DisplayNumericMode>FALSE</DisplayNumericMode>
     <LogOnConnect_CAN>FALSE</LogOnConnect_CAN>
@@ -328,7 +328,6 @@
         <Id>529</Id>
         <Signal>posX</Signal>
         <Signal>posY</Signal>
-        <Signal>button</Signal>
       </Message>
       <Message>
         <Id>1040</Id>
@@ -347,30 +346,26 @@
         <Signal>SteeringPosition</Signal>
       </Message>
       <Message>
-        <Id>336</Id>
-        <Signal>RESET</Signal>
-        <Signal>SET_CENTER</Signal>
-        <Signal>HOMING</Signal>
+        <Id>1311</Id>
       </Message>
       <Message>
-        <Id>82</Id>
-        <Signal>CENTER_POS</Signal>
+        <Id>1294</Id>
+        <Signal>brake</Signal>
       </Message>
       <Message>
-        <Id>1298</Id>
-        <Signal>POSITION</Signal>
+        <Id>1540</Id>
       </Message>
       <Window_Position>
         <Visibility>SHOWNORMAL</Visibility>
         <WindowPlacement>HIDE</WindowPlacement>
-        <Top>456</Top>
-        <Left>632</Left>
-        <Right>1079</Right>
-        <Bottom>744</Bottom>
+        <Top>170</Top>
+        <Left>421</Left>
+        <Right>868</Right>
+        <Bottom>731</Bottom>
       </Window_Position>
       <COLUMN_WIDTH>
-        <MESSAGE_COLUMN>151</MESSAGE_COLUMN>
-        <Raw_Val_Column>137</Raw_Val_Column>
+        <MESSAGE_COLUMN>144</MESSAGE_COLUMN>
+        <Raw_Val_Column>86</Raw_Val_Column>
         <Physical_Val_Column>172</Physical_Val_Column>
         <Signal_Column>86</Signal_Column>
       </COLUMN_WIDTH>
@@ -424,15 +419,15 @@
         <Display_Type>NORMAL</Display_Type>
       </GRAPH_PARAMETERS>
       <GRAPH_ELEMENT>
-        <Message_ID>321</Message_ID>
-        <Message_Name>DRIVE_POWER</Message_Name>
+        <Message_ID>1586</Message_ID>
+        <Message_Name>DISPLAY_CURRENT</Message_Name>
         <Frame_Format/>
-        <Element_Name>Power</Element_Name>
+        <Element_Name>BatteryCurrent</Element_Name>
         <Value_Type>Physical</Value_Type>
         <Line_Type>SOLID</Line_Type>
-        <Line_Color>16711680</Line_Color>
-        <Point_Type>1</Point_Type>
-        <Point_Color>8388736</Point_Color>
+        <Line_Color>65280</Line_Color>
+        <Point_Type>2</Point_Type>
+        <Point_Color>8421376</Point_Color>
         <Visibility>TRUE</Visibility>
         <Enable>TRUE</Enable>
         <Display_Type>NORMAL</Display_Type>
@@ -440,10 +435,10 @@
       <Window_Position>
         <Visibility>SHOWNORMAL</Visibility>
         <Window_Position>HIDE</Window_Position>
-        <Top>291</Top>
-        <Left>205</Left>
-        <Bottom>957</Bottom>
-        <Right>1530</Right>
+        <Top>39</Top>
+        <Left>74</Left>
+        <Bottom>586</Bottom>
+        <Right>1399</Right>
       </Window_Position>
       <Splitter_Window_Col_0>
         <CxIdeal>479</CxIdeal>
@@ -454,11 +449,11 @@
         <CxMin>0</CxMin>
       </Splitter_Window_Col_1>
       <Splitter_Window_Row_0>
-        <CxIdeal>308</CxIdeal>
+        <CxIdeal>275</CxIdeal>
         <CxMin>0</CxMin>
       </Splitter_Window_Row_0>
       <Splitter_Window_Row_1>
-        <CxIdeal>308</CxIdeal>
+        <CxIdeal>222</CxIdeal>
         <CxMin>0</CxMin>
       </Splitter_Window_Row_1>
     </CAN_Signal_Graph>
@@ -503,19 +498,19 @@
       <Filter IsEnabled="0">steering</Filter>
       <COLUMN>
         <ID/>
-        <Order>5</Order>
-        <IsVisible>1</IsVisible>
-        <Width>19</Width>
+        <Order>1</Order>
+        <IsVisible>0</IsVisible>
+        <Width>0</Width>
       </COLUMN>
       <COLUMN>
         <ID>Time</ID>
-        <Order>4</Order>
+        <Order>5</Order>
         <IsVisible>1</IsVisible>
         <Width>129</Width>
       </COLUMN>
       <COLUMN>
         <ID>Tx/Rx</ID>
-        <Order>1</Order>
+        <Order>4</Order>
         <IsVisible>1</IsVisible>
         <Width>53</Width>
       </COLUMN>
@@ -553,11 +548,11 @@
         <ID>Data Byte(s)</ID>
         <Order>9</Order>
         <IsVisible>1</IsVisible>
-        <Width>139</Width>
+        <Width>158</Width>
       </COLUMN>
       <IsHex>1</IsHex>
-      <IsAppend>0</IsAppend>
-      <IsInterpret>1</IsInterpret>
+      <IsAppend>1</IsAppend>
+      <IsInterpret>0</IsInterpret>
       <Time_Mode>SYSTEM</Time_Mode>
       <Window_Position>
         <Visibility>SHOWNORMAL</Visibility>
@@ -570,10 +565,10 @@
       <Interpretation_Window_Position>
         <Visibility>SHOWNORMAL</Visibility>
         <WindowPlacement>RESTORETOMAXIMIZED</WindowPlacement>
-        <Top>173</Top>
-        <Left>10</Left>
-        <Bottom>451</Bottom>
-        <Right>359</Right>
+        <Top>181</Top>
+        <Left>12</Left>
+        <Bottom>459</Bottom>
+        <Right>361</Right>
       </Interpretation_Window_Position>
     </CAN_Message_Window>
     <J1939_Message_Window>
@@ -670,10 +665,10 @@
       <Interpretation_Window_Position>
         <Visibility>SHOWNORMAL</Visibility>
         <WindowPlacement>RESTORETOMAXIMIZED</WindowPlacement>
-        <Top>173</Top>
-        <Left>10</Left>
-        <Bottom>451</Bottom>
-        <Right>359</Right>
+        <Top>181</Top>
+        <Left>12</Left>
+        <Bottom>459</Bottom>
+        <Right>361</Right>
       </Interpretation_Window_Position>
     </J1939_Message_Window>
     <LIN_Message_Window>
@@ -755,10 +750,10 @@
       <Interpretation_Window_Position>
         <Visibility>SHOWNORMAL</Visibility>
         <WindowPlacement>RESTORETOMAXIMIZED</WindowPlacement>
-        <Top>173</Top>
-        <Left>10</Left>
-        <Bottom>451</Bottom>
-        <Right>359</Right>
+        <Top>181</Top>
+        <Left>12</Left>
+        <Bottom>459</Bottom>
+        <Right>361</Right>
       </Interpretation_Window_Position>
     </LIN_Message_Window>
     <CAN_Tx_Window>
@@ -855,73 +850,25 @@
           <Key_Value>a</Key_Value>
           <Key_Enabled>FALSE</Key_Enabled>
         </Message>
-        <Message>
-          <Channel>1</Channel>
-          <Message_ID>1311</Message_ID>
-          <IsExtended>FALSE</IsExtended>
-          <IsRtr>FALSE</IsRtr>
-          <DLC>2</DLC>
-          <DataBytes>16,0</DataBytes>
-          <Repetion>500</Repetion>
-          <Repetition_Enabled>FALSE</Repetition_Enabled>
-          <Key_Value>a</Key_Value>
-          <Key_Enabled>FALSE</Key_Enabled>
-        </Message>
-        <Message>
-          <Channel>1</Channel>
-          <Message_ID>1297</Message_ID>
-          <IsExtended>FALSE</IsExtended>
-          <IsRtr>FALSE</IsRtr>
-          <DLC>8</DLC>
-          <DataBytes>152,139,8,0,0,0,0,0</DataBytes>
-          <Repetion>10</Repetion>
-          <Repetition_Enabled>FALSE</Repetition_Enabled>
-          <Key_Value>a</Key_Value>
-          <Key_Enabled>FALSE</Key_Enabled>
-        </Message>
-        <Message>
-          <Channel>1</Channel>
-          <Message_ID>529</Message_ID>
-          <IsExtended>FALSE</IsExtended>
-          <IsRtr>FALSE</IsRtr>
-          <DLC>3</DLC>
-          <DataBytes>25,50,0</DataBytes>
-          <Repetion>10</Repetion>
-          <Repetition_Enabled>FALSE</Repetition_Enabled>
-          <Key_Value>a</Key_Value>
-          <Key_Enabled>FALSE</Key_Enabled>
-        </Message>
-        <Message>
-          <Channel>1</Channel>
-          <Message_ID>1055</Message_ID>
-          <IsExtended>FALSE</IsExtended>
-          <IsRtr>FALSE</IsRtr>
-          <DLC>2</DLC>
-          <DataBytes>0,0</DataBytes>
-          <Repetion>500</Repetion>
-          <Repetition_Enabled>FALSE</Repetition_Enabled>
-          <Key_Value>a</Key_Value>
-          <Key_Enabled>FALSE</Key_Enabled>
-        </Message>
-        <Message>
-          <Channel>1</Channel>
-          <Message_ID>543</Message_ID>
-          <IsExtended>FALSE</IsExtended>
-          <IsRtr>FALSE</IsRtr>
-          <DLC>1</DLC>
-          <DataBytes>0</DataBytes>
-          <Repetion>100</Repetion>
-          <Repetition_Enabled>FALSE</Repetition_Enabled>
-          <Key_Value>a</Key_Value>
-          <Key_Enabled>FALSE</Key_Enabled>
-        </Message>
         <Message>
           <Channel>1</Channel>
           <Message_ID>23</Message_ID>
           <IsExtended>FALSE</IsExtended>
           <IsRtr>FALSE</IsRtr>
           <DLC>4</DLC>
-          <DataBytes>250,0,0,0</DataBytes>
+          <DataBytes>0,0,0,0</DataBytes>
+          <Repetion>10</Repetion>
+          <Repetition_Enabled>FALSE</Repetition_Enabled>
+          <Key_Value>a</Key_Value>
+          <Key_Enabled>FALSE</Key_Enabled>
+        </Message>
+        <Message>
+          <Channel>1</Channel>
+          <Message_ID>24</Message_ID>
+          <IsExtended>FALSE</IsExtended>
+          <IsRtr>FALSE</IsRtr>
+          <DLC>4</DLC>
+          <DataBytes>0,0,0,0</DataBytes>
           <Repetion>10</Repetion>
           <Repetition_Enabled>FALSE</Repetition_Enabled>
           <Key_Value>a</Key_Value>
@@ -932,8 +879,8 @@
           <Message_ID>1540</Message_ID>
           <IsExtended>FALSE</IsExtended>
           <IsRtr>FALSE</IsRtr>
-          <DLC>4</DLC>
-          <DataBytes>0,0,0,0</DataBytes>
+          <DLC>0</DLC>
+          <DataBytes>0</DataBytes>
           <Repetion>10</Repetion>
           <Repetition_Enabled>FALSE</Repetition_Enabled>
           <Key_Value>a</Key_Value>
diff --git a/threewheeler.DBF b/threewheeler.DBF
index 2cc5931..3ea3098 100644
--- a/threewheeler.DBF
+++ b/threewheeler.DBF
@@ -6,7 +6,7 @@
 
 [BUSMASTER_VERSION] [3.2.2]
 
-[NUMBER_OF_MESSAGES] 29
+[NUMBER_OF_MESSAGES] 32
 
 [START_MSG] JOY_MEASURE,529,3,3,1,S
 [START_SIGNALS] posX,8,1,0,I,127,-128,1,0.000000,1.000000,%,
@@ -176,4 +176,15 @@
 [START_MSG] CONTROL_SETUP_PARAM,21,4,2,1,S
 [START_SIGNALS] displayAliveTime,8,1,0,U,255,0,1,0.000000,10.000000,ms,
 [START_SIGNALS] steeringAliveTime,8,2,0,U,255,0,1,0.000000,10.000000,ms,
+[END_MSG]
+
+[START_MSG] BRAKE,1294,1,1,1,S
+[START_SIGNALS] brake,1,1,0,B,1,0,1,0.000000,1.000000,,
+[END_MSG]
+
+[START_MSG] SUPPLY_48V_READY,1540,0,0,1,S
+[END_MSG]
+
+[START_MSG] HEADLIGHTS,260,1,1,1,S
+[START_SIGNALS] headlights,1,1,0,B,1,0,1,0.000000,1.000000,,
 [END_MSG]
\ No newline at end of file