Klagarge/SummerSchool2-Controller
Klagarge/SummerSchool2-Controller
Archived
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases 1 Activity

move led controller

Browse Source
This commit is contained in:
Rémi Heredero 2023-09-11 17:35:57 +02:00
parent 1fa34dea8a
commit c7c67d2931
6 changed files with 3049 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
306-controller_interface.X/app/eeprom.c
View File

@ -24,7 +24,7 @@ void MEM_init(){
uint8_t check = MEM_read_1_byte(0x0); uint8_t check = MEM_read_1_byte(0x0);
if(check != 0x42){ if(check != 0x42){
KART_CST.CONTROL_STEERING_MODE = 0; KART_CST.CONTROL_STEERING_MODE = 0;
KART_CST.CONTROL_ALIVE_TIME = 50; // should be 50 KART_CST.CONTROL_ALIVE_TIME = 10;
KART_CST.CONTROL_SPEED_FACTOR = 111111; // 111'111 KART_CST.CONTROL_SPEED_FACTOR = 111111; // 111'111
KART_CST.CONTROL_POWER_FACTOR = 10000; // 10'000 KART_CST.CONTROL_POWER_FACTOR = 10000; // 10'000
KART_CST.CONTROL_STEERING_FACTOR = 5600240; // 5'600'024 KART_CST.CONTROL_STEERING_FACTOR = 5600240; // 5'600'024

2
306-controller_interface.X/app/factory/factory.c
View File

@ -42,7 +42,7 @@ void Factory_init() {
MEM_init(); MEM_init();
initRamp(); initRamp();
ALIVE_init(ALcontroller(), 6); ALIVE_init(ALcontroller(), 5);
ALIVE_setAliveTime(ALcontroller(), KART_CST.CONTROL_ALIVE_TIME); ALIVE_setAliveTime(ALcontroller(), KART_CST.CONTROL_ALIVE_TIME);
ALIVE_init(ALjoy(), 1); ALIVE_init(ALjoy(), 1);

4
306-controller_interface.X/nbproject/configurations.xml
View File

@ -247,7 +247,7 @@
<property key="programoptions.preservedataflash" value="false"/> <property key="programoptions.preservedataflash" value="false"/>
<property key="programoptions.preservedataflash.ranges" <property key="programoptions.preservedataflash.ranges"
value="${programoptions.preservedataflash.ranges}"/> value="${programoptions.preservedataflash.ranges}"/>
<property key="programoptions.preserveeeprom" value="true"/> <property key="programoptions.preserveeeprom" value="false"/>
<property key="programoptions.preserveeeprom.ranges" value="310000-3103ff"/> <property key="programoptions.preserveeeprom.ranges" value="310000-3103ff"/>
<property key="programoptions.preserveprogram.ranges" value=""/> <property key="programoptions.preserveprogram.ranges" value=""/>
<property key="programoptions.preserveprogramrange" value="false"/> <property key="programoptions.preserveprogramrange" value="false"/>
@ -295,7 +295,7 @@
<property key="programoptions.preservedataflash" value="false"/> <property key="programoptions.preservedataflash" value="false"/>
<property key="programoptions.preservedataflash.ranges" <property key="programoptions.preservedataflash.ranges"
value="${programoptions.preservedataflash.ranges}"/> value="${programoptions.preservedataflash.ranges}"/>
<property key="programoptions.preserveeeprom" value="true"/> <property key="programoptions.preserveeeprom" value="false"/>
<property key="programoptions.preserveeeprom.ranges" value="310000-3103ff"/> <property key="programoptions.preserveeeprom.ranges" value="310000-3103ff"/>
<property key="programoptions.preserveprogram.ranges" value=""/> <property key="programoptions.preserveprogram.ranges" value=""/>
<property key="programoptions.preserveprogramrange" value="false"/> <property key="programoptions.preserveprogramrange" value="false"/>

2972
binary_files/v1_2_1-led.hex Normal file
View File

File diff suppressed because it is too large Load Diff

98
busmaster_config.cfx
View File

@ -2,14 +2,14 @@
<BUSMASTER_CONFIGURATION> <BUSMASTER_CONFIGURATION>
<Global_Configuration> <Global_Configuration>
<BUSMASTER_Version>3.2.2</BUSMASTER_Version> <BUSMASTER_Version>3.2.2</BUSMASTER_Version>
<IsMsgFilterEnabled>TRUE</IsMsgFilterEnabled> <IsMsgFilterEnabled>FALSE</IsMsgFilterEnabled>
<IsMsgFilterEnabledLin>FALSE</IsMsgFilterEnabledLin> <IsMsgFilterEnabledLin>FALSE</IsMsgFilterEnabledLin>
<IsReplayFilterEnabled>FALSE</IsReplayFilterEnabled> <IsReplayFilterEnabled>FALSE</IsReplayFilterEnabled>
<IsLogFilterEnabled>FALSE</IsLogFilterEnabled> <IsLogFilterEnabled>FALSE</IsLogFilterEnabled>
<IsLogFilterLINEnabled>FALSE</IsLogFilterLINEnabled> <IsLogFilterLINEnabled>FALSE</IsLogFilterLINEnabled>
<IsLoggingEnabled>FALSE</IsLoggingEnabled> <IsLoggingEnabled>FALSE</IsLoggingEnabled>
<IsMsgIntepretationEnabled>TRUE</IsMsgIntepretationEnabled> <IsMsgIntepretationEnabled>TRUE</IsMsgIntepretationEnabled>
<IsOverWriteEnabled>FALSE</IsOverWriteEnabled> <IsOverWriteEnabled>TRUE</IsOverWriteEnabled>
<DisplayTimeMode>SYSTEM</DisplayTimeMode> <DisplayTimeMode>SYSTEM</DisplayTimeMode>
<DisplayNumericMode>FALSE</DisplayNumericMode> <DisplayNumericMode>FALSE</DisplayNumericMode>
<LogOnConnect_CAN>FALSE</LogOnConnect_CAN> <LogOnConnect_CAN>FALSE</LogOnConnect_CAN>
@ -46,10 +46,10 @@
<Window_Position> <Window_Position>
<Visibility>SHOWNORMAL</Visibility> <Visibility>SHOWNORMAL</Visibility>
<WindowPlacement>RESTORETOMAXIMIZED</WindowPlacement> <WindowPlacement>RESTORETOMAXIMIZED</WindowPlacement>
<Top>195</Top> <Top>291</Top>
<Left>426</Left> <Left>403</Left>
<Bottom>692</Bottom> <Bottom>788</Bottom>
<Right>848</Right> <Right>825</Right>
</Window_Position> </Window_Position>
</Bus_Statistics> </Bus_Statistics>
<J1939_Database_Files/> <J1939_Database_Files/>
@ -355,16 +355,20 @@
<Message> <Message>
<Id>1540</Id> <Id>1540</Id>
</Message> </Message>
<Message>
<Id>260</Id>
<Signal>headlights</Signal>
</Message>
<Window_Position> <Window_Position>
<Visibility>SHOWNORMAL</Visibility> <Visibility>SHOWNORMAL</Visibility>
<WindowPlacement>HIDE</WindowPlacement> <WindowPlacement>HIDE</WindowPlacement>
<Top>170</Top> <Top>186</Top>
<Left>421</Left> <Left>513</Left>
<Right>868</Right> <Right>960</Right>
<Bottom>731</Bottom> <Bottom>747</Bottom>
</Window_Position> </Window_Position>
<COLUMN_WIDTH> <COLUMN_WIDTH>
<MESSAGE_COLUMN>144</MESSAGE_COLUMN> <MESSAGE_COLUMN>86</MESSAGE_COLUMN>
<Raw_Val_Column>86</Raw_Val_Column> <Raw_Val_Column>86</Raw_Val_Column>
<Physical_Val_Column>172</Physical_Val_Column> <Physical_Val_Column>172</Physical_Val_Column>
<Signal_Column>86</Signal_Column> <Signal_Column>86</Signal_Column>
@ -498,19 +502,19 @@
<Filter IsEnabled="0">steering</Filter> <Filter IsEnabled="0">steering</Filter>
<COLUMN> <COLUMN>
<ID/> <ID/>
<Order>1</Order> <Order>5</Order>
<IsVisible>0</IsVisible> <IsVisible>1</IsVisible>
<Width>0</Width> <Width>19</Width>
</COLUMN> </COLUMN>
<COLUMN> <COLUMN>
<ID>Time</ID> <ID>Time</ID>
<Order>5</Order> <Order>4</Order>
<IsVisible>1</IsVisible> <IsVisible>1</IsVisible>
<Width>129</Width> <Width>129</Width>
</COLUMN> </COLUMN>
<COLUMN> <COLUMN>
<ID>Tx/Rx</ID> <ID>Tx/Rx</ID>
<Order>4</Order> <Order>1</Order>
<IsVisible>1</IsVisible> <IsVisible>1</IsVisible>
<Width>53</Width> <Width>53</Width>
</COLUMN> </COLUMN>
@ -548,11 +552,11 @@
<ID>Data Byte(s)</ID> <ID>Data Byte(s)</ID>
<Order>9</Order> <Order>9</Order>
<IsVisible>1</IsVisible> <IsVisible>1</IsVisible>
<Width>158</Width> <Width>139</Width>
</COLUMN> </COLUMN>
<IsHex>1</IsHex> <IsHex>1</IsHex>
<IsAppend>1</IsAppend> <IsAppend>0</IsAppend>
<IsInterpret>0</IsInterpret> <IsInterpret>1</IsInterpret>
<Time_Mode>SYSTEM</Time_Mode> <Time_Mode>SYSTEM</Time_Mode>
<Window_Position> <Window_Position>
<Visibility>SHOWNORMAL</Visibility> <Visibility>SHOWNORMAL</Visibility>
@ -575,8 +579,8 @@
<COLUMN> <COLUMN>
<ID/> <ID/>
<Order>1</Order> <Order>1</Order>
<IsVisible>1</IsVisible> <IsVisible>0</IsVisible>
<Width>19</Width> <Width>0</Width>
</COLUMN> </COLUMN>
<COLUMN> <COLUMN>
<ID>Time</ID> <ID>Time</ID>
@ -648,11 +652,11 @@
<ID>Data Byte(s)</ID> <ID>Data Byte(s)</ID>
<Order>13</Order> <Order>13</Order>
<IsVisible>1</IsVisible> <IsVisible>1</IsVisible>
<Width>643</Width> <Width>662</Width>
</COLUMN> </COLUMN>
<IsHex>1</IsHex> <IsHex>1</IsHex>
<IsAppend>0</IsAppend> <IsAppend>1</IsAppend>
<IsInterpret>1</IsInterpret> <IsInterpret>0</IsInterpret>
<Time_Mode>SYSTEM</Time_Mode> <Time_Mode>SYSTEM</Time_Mode>
<Window_Position> <Window_Position>
<Visibility>SHOWNORMAL</Visibility> <Visibility>SHOWNORMAL</Visibility>
@ -678,8 +682,8 @@
<COLUMN> <COLUMN>
<ID/> <ID/>
<Order>1</Order> <Order>1</Order>
<IsVisible>1</IsVisible> <IsVisible>0</IsVisible>
<Width>19</Width> <Width>0</Width>
</COLUMN> </COLUMN>
<COLUMN> <COLUMN>
<ID>Time</ID> <ID>Time</ID>
@ -733,11 +737,11 @@
<ID>Checksum</ID> <ID>Checksum</ID>
<Order>10</Order> <Order>10</Order>
<IsVisible>1</IsVisible> <IsVisible>1</IsVisible>
<Width>657</Width> <Width>676</Width>
</COLUMN> </COLUMN>
<IsHex>1</IsHex> <IsHex>1</IsHex>
<IsAppend>0</IsAppend> <IsAppend>1</IsAppend>
<IsInterpret>1</IsInterpret> <IsInterpret>0</IsInterpret>
<Time_Mode>SYSTEM</Time_Mode> <Time_Mode>SYSTEM</Time_Mode>
<Window_Position> <Window_Position>
<Visibility>SHOWNORMAL</Visibility> <Visibility>SHOWNORMAL</Visibility>
@ -886,6 +890,42 @@
<Key_Value>a</Key_Value> <Key_Value>a</Key_Value>
<Key_Enabled>FALSE</Key_Enabled> <Key_Enabled>FALSE</Key_Enabled>
</Message> </Message>
<Message>
<Channel>1</Channel>
<Message_ID>1298</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>
<Key_Enabled>FALSE</Key_Enabled>
</Message>
<Message>
<Channel>1</Channel>
<Message_ID>337</Message_ID>
<IsExtended>FALSE</IsExtended>
<IsRtr>FALSE</IsRtr>
<DLC>4</DLC>
<DataBytes>0,0,78,32</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>336</Message_ID>
<IsExtended>FALSE</IsExtended>
<IsRtr>FALSE</IsRtr>
<DLC>4</DLC>
<DataBytes>0,1,0,0</DataBytes>
<Repetion>10</Repetion>
<Repetition_Enabled>FALSE</Repetition_Enabled>
<Key_Value>a</Key_Value>
<Key_Enabled>FALSE</Key_Enabled>
</Message>
</Message_List> </Message_List>
</CAN_Tx_Window> </CAN_Tx_Window>
<CAN_Wave_Form_Genarator> <CAN_Wave_Form_Genarator>

5
threewheeler.DBF
View File

@ -6,7 +6,7 @@
[BUSMASTER_VERSION] [3.2.2] [BUSMASTER_VERSION] [3.2.2]
[NUMBER_OF_MESSAGES] 32 [NUMBER_OF_MESSAGES] 33
[START_MSG] JOY_MEASURE,529,3,3,1,S [START_MSG] JOY_MEASURE,529,3,3,1,S
[START_SIGNALS] posX,8,1,0,I,127,-128,1,0.000000,1.000000,%, [START_SIGNALS] posX,8,1,0,I,127,-128,1,0.000000,1.000000,%,
@ -187,4 +187,7 @@
[START_MSG] HEADLIGHTS,260,1,1,1,S [START_MSG] HEADLIGHTS,260,1,1,1,S
[START_SIGNALS] headlights,1,1,0,B,1,0,1,0.000000,1.000000,, [START_SIGNALS] headlights,1,1,0,B,1,0,1,0.000000,1.000000,,
[END_MSG]
[START_MSG] SUPPLY_ALIVE,1551,0,0,1,S
[END_MSG] [END_MSG]