Skip to content

Commit

Permalink
Merge pull request #89 from AxxAxx/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
AxxAxx authored Dec 7, 2024
2 parents aa162fe + 4c8a26f commit f08617a
Show file tree
Hide file tree
Showing 21 changed files with 263 additions and 77 deletions.
1 change: 1 addition & 0 deletions AxxSolder_firmware/Core/Inc/main.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ typedef struct{
double temp_cal_400;
double temp_cal_450;
double serial_debug_print;
double displayed_temp_filter;
}Flash_values;

/* USER CODE END Includes */
Expand Down
186 changes: 111 additions & 75 deletions AxxSolder_firmware/Core/Src/main.c

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions AxxSolder_firmware/Drivers/UGUI/ugui.c
Original file line number Diff line number Diff line change
Expand Up @@ -535,11 +535,11 @@ void UG_PutString( UG_S16 x, UG_S16 y, char* str )
}
cw = _UG_GetCharData(chr,NULL);
if(cw==-1) continue;
if ( xp + cw > gui->device->x_dim - 1 )
/*if ( xp + cw > gui->device->x_dim - 1 )
{
xp = x;
yp += gui->currentFont.char_height+gui->char_v_space;
}
}*/

_UG_PutChar(chr, xp, yp, gui->fore_color, gui->back_color);

Expand Down
Binary file modified AxxSolder_hardware/bom/BOM_AxxSolder_V3_1.xlsx
Binary file not shown.
File renamed without changes.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
{
"head": {
"docType": "3",
"editorVersion": "6.5.47",
"newgId": true,
"c_para": {},
"x": "4020",
"y": "3928",
"hasIdFlag": true,
"importFlag": 0,
"transformList": ""
},
"canvas": "CA~1000~1000~#000000~yes~#FFFFFF~10~1000~1000~line~0.5~mm~1~45~visible~0.5~4020~3928~0~yes",
"shape": [
"CIRCLE~4020~3928~23.622~1~10~gge136~0~~circle_gge139,circle_gge142",
"PAD~ELLIPSE~4020~3928~9.8425~9.8425~11~~1~2.9921~~0~gge25~0~~Y~0~0~0.2~4020,3928",
"PAD~ELLIPSE~4032.283~3920.913~9.8425~9.8425~11~~1~2.9921~~0~gge61~0~~Y~0~0~0.2~4032.2834,3920.9134",
"PAD~ELLIPSE~4007.717~3920.913~9.8425~9.8425~11~~1~2.9921~~0~gge79~0~~Y~0~0~0.2~4007.7166,3920.9134",
"PAD~ELLIPSE~4020~3942.173~9.8425~9.8425~11~~1~2.9921~~0~gge97~0~~Y~0~0~0.2~4020,3942.1732",
"PAD~ELLIPSE~4032.283~3935.087~9.8425~9.8425~11~~1~2.9921~~0~gge115~0~~Y~0~0~0.2~4032.2834,3935.0866",
"PAD~ELLIPSE~4007.717~3935.087~9.8425~9.8425~11~~1~2.9921~~0~gge133~0~~Y~0~0~0.2~4007.7166,3935.0866",
"HOLE~4020~3913.039~2.9528~gge152~0"
],
"layers": [
"1~TopLayer~#FF0000~true~true~true~",
"2~BottomLayer~#0000FF~true~false~true~",
"3~TopSilkLayer~#FFCC00~true~false~true~",
"4~BottomSilkLayer~#66CC33~true~false~true~",
"5~TopPasteMaskLayer~#808080~true~false~true~",
"6~BottomPasteMaskLayer~#800000~true~false~true~",
"7~TopSolderMaskLayer~#800080~true~false~true~0.3",
"8~BottomSolderMaskLayer~#AA00FF~true~false~true~0.3",
"9~Ratlines~#6464FF~false~false~true~",
"10~BoardOutLine~#FF00FF~true~false~true~",
"11~Multi-Layer~#C0C0C0~true~false~true~",
"12~Document~#FFFFFF~true~false~true~",
"13~TopAssembly~#33CC99~false~false~false~",
"14~BottomAssembly~#5555FF~false~false~false~",
"15~Mechanical~#F022F0~false~false~false~",
"19~3DModel~#66CCFF~false~false~false~",
"21~Inner1~#999966~false~false~false~~",
"22~Inner2~#008000~false~false~false~~",
"23~Inner3~#00FF00~false~false~false~~",
"24~Inner4~#BC8E00~false~false~false~~",
"25~Inner5~#70DBFA~false~false~false~~",
"26~Inner6~#00CC66~false~false~false~~",
"27~Inner7~#9966FF~false~false~false~~",
"28~Inner8~#800080~false~false~false~~",
"29~Inner9~#008080~false~false~false~~",
"30~Inner10~#15935F~false~false~false~~",
"31~Inner11~#000080~false~false~false~~",
"32~Inner12~#00B400~false~false~false~~",
"33~Inner13~#2E4756~false~false~false~~",
"34~Inner14~#99842F~false~false~false~~",
"35~Inner15~#FFFFAA~false~false~false~~",
"36~Inner16~#99842F~false~false~false~~",
"37~Inner17~#2E4756~false~false~false~~",
"38~Inner18~#3535FF~false~false~false~~",
"39~Inner19~#8000BC~false~false~false~~",
"40~Inner20~#43AE5F~false~false~false~~",
"41~Inner21~#C3ECCE~false~false~false~~",
"42~Inner22~#728978~false~false~false~~",
"43~Inner23~#39503F~false~false~false~~",
"44~Inner24~#0C715D~false~false~false~~",
"45~Inner25~#5A8A80~false~false~false~~",
"46~Inner26~#2B937E~false~false~false~~",
"47~Inner27~#23999D~false~false~false~~",
"48~Inner28~#45B4E3~false~false~false~~",
"49~Inner29~#215DA1~false~false~false~~",
"50~Inner30~#4564D7~false~false~false~~",
"51~Inner31~#6969E9~false~false~false~~",
"52~Inner32~#9069E9~false~false~false~~",
"99~ComponentShapeLayer~#00CCCC~false~false~false~0.4",
"100~LeadShapeLayer~#CC9999~false~false~false~",
"101~ComponentMarkingLayer~#66FFCC~false~false~false~",
"Hole~Hole~#222222~false~false~true~",
"DRCError~DRCError~#FAD609~false~false~true~"
],
"objects": [
"All~true~false",
"Component~true~true",
"Prefix~true~true",
"Name~true~false",
"Track~true~true",
"Pad~true~true",
"Via~true~true",
"Hole~true~true",
"Copper_Area~true~true",
"Circle~true~true",
"Arc~true~true",
"Solid_Region~true~true",
"Text~true~true",
"Image~true~true",
"Rect~true~true",
"Dimension~true~true",
"Protractor~true~true"
],
"BBox": {
"x": 3996.4,
"y": 3904.4,
"width": 47.2,
"height": 47.2
},
"preference": {
"hideFootprints": "",
"hideNets": ""
},
"DRCRULE": {
"Default": {
"trackWidth": 1,
"clearance": 0.6,
"viaHoleDiameter": 2.4,
"viaHoleD": 1.2
},
"isRealtime": false,
"isDrcOnRoutingOrPlaceVia": false,
"checkObjectToCopperarea": true,
"showDRCRangeLine": true
},
"netColors": {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@

# 3D Printed Housing
The parts can be sources from JLC3DP.com With the following parameters:
- MJF (NYLON)
- with PA12-HP Nylon

![3d print at JLC3DP](img/jlc3dp.png)

# PCB
The gerber files and Easy EDA PCB is available in the PCB subfolder. There is no corresponding schematic, this was done by just placing vias on the PCB directly. The PCB is a 2 layer board, thickness 1.6mm.

![pcb](img/pcb_hirose.png)

## Pins
Mill-Max 1460-9-00-80-00-00-03-0 can be used to connect the PCB to the housing. The pins are available at
[Mouser](https://www.mouser.de/ProductDetail/Mill-Max/1460-9-00-80-00-00-03-0?qs=A6eO%252BMLsxmRGmneDPBh%2F2g%3D%3D&srsltid=AfmBOorVb9K-IJof6xZFDbLfKd0eUqV1-BJbkoN_Je9d1J5wIGALbRr7).

# Assembly
You have to make sure that the pins connect to the handle connector properly while not preventing the housing from being pushed all the way in.
A connector can be pushed into the 3D printed part for aligning the pins and the PCB. While still having everything put together the pins can soldered to the PCB. When having a HT Nylon part, the housing should be able to withstand soldering quickly.

Assembling the PCB apart from the housing is not recommended, since the tolerances of the housing and the handpiece connector are quite tight. It would be hard to get everything aligned properly.

After assembly just use some wire cutters and trim the pins to the desired length.

![connector assembled](img/20241016_203813.jpg)
![connector front](img/20241016_204725.jpg)
![connector back](img/20241016_204743.jpg)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
Binary file added CAD/AxxSolder_Portable/~$Encolsure_Portable.SLDPRT
Binary file not shown.

0 comments on commit f08617a

Please sign in to comment.