Skip to content

Commit c140d43

Browse files
author
Peter Wegmann
committed
minor fixes
1 parent 1d07bbd commit c140d43

File tree

4 files changed

+8
-15
lines changed

4 files changed

+8
-15
lines changed

Controller/base_controller.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1475,6 +1475,11 @@ void handle_received_Messages(Controller_Model *Model){
14751475
xbee_init(&paint_info_line,LVM.vars->Device_ID_Str,DEV_ID_CHARS_MAX,LVM.options->SC_mask);
14761476
xbee_Set_Scan_Channels(xbee.ScanChannels);
14771477
xbee_WR();
1478+
1479+
//Send Status Ack
1480+
LVM.temp->buffer[0] = 0;
1481+
xbee_send_message(SET_SC_XBEE_MASK,LVM.temp->buffer,1);
1482+
break;
14781483

14791484

14801485
case DEPRECATED_ILM_BROADCAST: // ILM messages are sent in broadcast mode and are ignored by other devices

LHe-Level-Meter.atsln

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
99
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12-
Debug|AVR = Debug|AVR
1312
DISP_3000-DEFAULT|AVR = DISP_3000-DEFAULT|AVR
14-
DISP_3000-HZB|AVR = DISP_3000-HZB|AVR
1513
DISP_3000-ILL|AVR = DISP_3000-ILL|AVR
1614
ili9341-DEFAULT|AVR = ili9341-DEFAULT|AVR
17-
ili9341-HZB|AVR = ili9341-HZB|AVR
1815
ili9341-ILL|AVR = ili9341-ILL|AVR
19-
Release|AVR = Release|AVR
2016
EndGlobalSection
2117
GlobalSection(ProjectConfigurationPlatforms) = postSolution
22-
{DCE6C7E3-EE26-4D79-826B-08594B9AD897}.Debug|AVR.ActiveCfg = DISP_3000-DEFAULT|AVR
23-
{DCE6C7E3-EE26-4D79-826B-08594B9AD897}.Debug|AVR.Build.0 = DISP_3000-DEFAULT|AVR
2418
{DCE6C7E3-EE26-4D79-826B-08594B9AD897}.DISP_3000-DEFAULT|AVR.ActiveCfg = DISP_3000-DEFAULT|AVR
2519
{DCE6C7E3-EE26-4D79-826B-08594B9AD897}.DISP_3000-DEFAULT|AVR.Build.0 = DISP_3000-DEFAULT|AVR
26-
{DCE6C7E3-EE26-4D79-826B-08594B9AD897}.DISP_3000-HZB|AVR.ActiveCfg = DISP_3000-HZB|AVR
27-
{DCE6C7E3-EE26-4D79-826B-08594B9AD897}.DISP_3000-HZB|AVR.Build.0 = DISP_3000-HZB|AVR
2820
{DCE6C7E3-EE26-4D79-826B-08594B9AD897}.DISP_3000-ILL|AVR.ActiveCfg = DISP_3000-ILL|AVR
2921
{DCE6C7E3-EE26-4D79-826B-08594B9AD897}.DISP_3000-ILL|AVR.Build.0 = DISP_3000-ILL|AVR
3022
{DCE6C7E3-EE26-4D79-826B-08594B9AD897}.ili9341-DEFAULT|AVR.ActiveCfg = ili9341-DEFAULT|AVR
3123
{DCE6C7E3-EE26-4D79-826B-08594B9AD897}.ili9341-DEFAULT|AVR.Build.0 = ili9341-DEFAULT|AVR
32-
{DCE6C7E3-EE26-4D79-826B-08594B9AD897}.ili9341-HZB|AVR.ActiveCfg = ili9341-HZB|AVR
33-
{DCE6C7E3-EE26-4D79-826B-08594B9AD897}.ili9341-HZB|AVR.Build.0 = ili9341-HZB|AVR
3424
{DCE6C7E3-EE26-4D79-826B-08594B9AD897}.ili9341-ILL|AVR.ActiveCfg = ili9341-ILL|AVR
3525
{DCE6C7E3-EE26-4D79-826B-08594B9AD897}.ili9341-ILL|AVR.Build.0 = ili9341-ILL|AVR
36-
{DCE6C7E3-EE26-4D79-826B-08594B9AD897}.Release|AVR.ActiveCfg = DISP_3000-DEFAULT|AVR
37-
{DCE6C7E3-EE26-4D79-826B-08594B9AD897}.Release|AVR.Build.0 = DISP_3000-DEFAULT|AVR
3826
EndGlobalSection
3927
GlobalSection(SolutionProperties) = preSolution
4028
HideSolutionNode = FALSE

LHe-Level-Meter.cproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<ToolName>STK500</ToolName>
5555
</com_atmel_avrdbg_tool_stk500>
5656
<avrtoolinterface>ISP</avrtoolinterface>
57-
<avrtoolinterfaceclock>125000</avrtoolinterfaceclock>
57+
<avrtoolinterfaceclock>999946</avrtoolinterfaceclock>
5858
<com_atmel_avrdbg_tool_simulator>
5959
<ToolOptions>
6060
<InterfaceProperties>
@@ -69,7 +69,7 @@
6969
<com_atmel_avrdbg_tool_powerdebugger>
7070
<ToolOptions>
7171
<InterfaceProperties>
72-
<IspClock>125000</IspClock>
72+
<IspClock>999946</IspClock>
7373
<JtagDbgClock>220000</JtagDbgClock>
7474
<JtagEnableExtResetOnStartSession>true</JtagEnableExtResetOnStartSession>
7575
<JtagInChain>false</JtagInChain>

main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ VarsType vars = {
193193
.transmit_slow_changed = 0,
194194
.fill_meas_counter =0,
195195
.Device_ID_Str="",
196-
.n_pulse_wakes = NUMBER_POST_PULSE_WAKES
196+
.n_pulse_wakes = 0
197197
};
198198

199199

0 commit comments

Comments
 (0)