Skip to content

R span r zero #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Bilchreis wants to merge 2 commits into
base: master
Choose a base branch
from
Open

R span r zero #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e0503a
added span and zero messages
Jun 20, 2025
8394d0e
bug fix: date was overwritten in diag_buffer when r_span and r_zero w…
Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions LHe-Level-Meter.cproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@
<eraseonlaunchrule>0</eraseonlaunchrule>
<AsfFrameworkConfig>
<framework-data>
<options />
<configurations />
<files />
<documentation help="" />
<offline-documentation help="" />
<dependencies>
<content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.44.1" />
</dependencies>
</framework-data>
<options />
<configurations />
<files />
<documentation help="" />
<offline-documentation help="" />
<dependencies>
<content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.44.1" />
</dependencies>
</framework-data>
</AsfFrameworkConfig>
<avrtool>com.atmel.avrdbg.tool.powerdebugger</avrtool>
<avrtoolserialnumber>J50200002200</avrtoolserialnumber>
<avrtoolserialnumber>J51800003073</avrtoolserialnumber>
<avrdeviceexpectedsignature>0x1E9705</avrdeviceexpectedsignature>
<com_atmel_avrdbg_tool_stk500>
<ToolOptions>
Expand All @@ -54,7 +54,7 @@
<ToolName>STK500</ToolName>
</com_atmel_avrdbg_tool_stk500>
<avrtoolinterface>ISP</avrtoolinterface>
<avrtoolinterfaceclock>944399</avrtoolinterfaceclock>
<avrtoolinterfaceclock>976237</avrtoolinterfaceclock>
<com_atmel_avrdbg_tool_simulator>
<ToolOptions>
<InterfaceProperties>
Expand All @@ -69,7 +69,7 @@
<com_atmel_avrdbg_tool_powerdebugger>
<ToolOptions>
<InterfaceProperties>
<IspClock>944399</IspClock>
<IspClock>976237</IspClock>
<JtagDbgClock>220000</JtagDbgClock>
<JtagEnableExtResetOnStartSession>true</JtagEnableExtResetOnStartSession>
<JtagInChain>false</JtagInChain>
Expand All @@ -85,7 +85,7 @@
<InterfaceName>ISP</InterfaceName>
</ToolOptions>
<ToolType>com.atmel.avrdbg.tool.powerdebugger</ToolType>
<ToolNumber>J50200002200</ToolNumber>
<ToolNumber>J51800003073</ToolNumber>
<ToolName>Power Debugger</ToolName>
</com_atmel_avrdbg_tool_powerdebugger>
<ResetRule>0</ResetRule>
Expand Down
2 changes: 1 addition & 1 deletion avr-util-library
Open in desktop
Submodule avr-util-library updated 1 files
+35 −0 xbee.h
2 changes: 1 addition & 1 deletion config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@



#define FIRMWARE_VERSION 223
#define FIRMWARE_VERSION 224

#define BRANCH_ID 1
#define LAST_FIRMWARE_EEPROM_CHANGED 222
Expand Down
29 changes: 28 additions & 1 deletion diag_pulse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,10 @@ void diag_pulse_send(diag_pulseType *dp){
xbee_wake_up_plus();


InitScreen_AddLine("Sending Pulse Data:",1);


diag_send_r_calibration(dp);


if (connected.DS3231M)
Expand Down Expand Up @@ -804,7 +808,7 @@ void diag_pulse_send(diag_pulseType *dp){
diag_send_buffer[6] = n_Packets;


InitScreen_AddLine("Sending Pulse Data:",1);



InitScreen_AddLine("Sending I data...",0);
Expand Down Expand Up @@ -892,6 +896,29 @@ void diag_send_sub_packets(diag_pulseType *dp,uint8_t Message_code,uint8_t n_Pac
}
}

void diag_send_r_calibration(diag_pulseType *dp){
sprintf(LVM.temp->string,"Sending R span, zero");
InitScreen_AddLine(LVM.temp->string,0);

int32_t span32 = (int32_t)round(dp->r_span* 1000);
diag_send_buffer[0] = (span32 >> 24) & 0xFF;
diag_send_buffer[1] = (span32 >> 16) & 0xFF;
diag_send_buffer[2] = (span32 >> 8) & 0xFF;
diag_send_buffer[3] = span32 & 0xFF;


int16_t zero16 = (int16_t)round(dp->r_zero*10);
diag_send_buffer[4] = zero16 >> 8 & 0xFF;
diag_send_buffer[5] = zero16 & 0xFF ;

memcpy(LVM.temp->buffer,diag_send_buffer,6);
xbee_send_message(GET_R_CALIBRATION,LVM.temp->buffer,6);
_delay_ms(500);



}



void diag_pulse(diag_pulseType *dp){
Expand Down
1 change: 1 addition & 0 deletions diag_pulse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,6 @@ void diag_pulse_move_cursor(diag_pulseType *dp,int8_t direction);
void diag_pulse_send(diag_pulseType *dp);
void diag_pulse(diag_pulseType *dp);
void diag_send_sub_packets(diag_pulseType *dp,uint8_t Message_code,uint8_t n_Packets);
void diag_send_r_calibration(diag_pulseType *dp);

#endif /* DIAG_PULSE_H_ */