diff options
| author | Ben V. Brown <[email protected]> | 2017-07-23 16:54:12 +1000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-07-23 16:54:12 +1000 |
| commit | cb8bc643c413250711d882c261d7d5c13770fd53 (patch) | |
| tree | ae44c33104d2dcea25951a8bb78ab63f260f572f | |
| parent | 967d62f826a176d38f34e6cc3d652aafac3af0cc (diff) | |
| download | IronOS-1.15.tar.gz IronOS-1.15.zip | |
Adding support for boot up Logo's (#32)v1.15
This brings across a set of commits to support loading boot up images from a specific location in flash. And also creating a generator tool to make files to put images in said position.
23 files changed, 1123 insertions, 392 deletions
@@ -38,3 +38,5 @@ workspace/.metadata/* workspace/ts100/.settings/language.settings.xml workspace/ts100/.cproject TS100/KiCad/TS100.bak +Logo GUI/TS100 Logo Editor/TS100 Logo Editor/obj/ +Logo GUI/TS100 Logo Editor/TS100 Logo Editor/bin/
\ No newline at end of file diff --git a/Logo GUI/TS100 Logo Editor/.vs/TS100 Logo Editor/v15/.suo b/Logo GUI/TS100 Logo Editor/.vs/TS100 Logo Editor/v15/.suo Binary files differnew file mode 100644 index 00000000..a6a468db --- /dev/null +++ b/Logo GUI/TS100 Logo Editor/.vs/TS100 Logo Editor/v15/.suo diff --git a/Logo GUI/TS100 Logo Editor/TS100 Logo Editor.sln b/Logo GUI/TS100 Logo Editor/TS100 Logo Editor.sln new file mode 100644 index 00000000..ae3cea0a --- /dev/null +++ b/Logo GUI/TS100 Logo Editor/TS100 Logo Editor.sln @@ -0,0 +1,22 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.15 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TS100 Logo Editor", "TS100 Logo Editor\TS100 Logo Editor.csproj", "{206C8AEF-3BE6-44E9-A1B0-25BF3805F1CB}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {206C8AEF-3BE6-44E9-A1B0-25BF3805F1CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {206C8AEF-3BE6-44E9-A1B0-25BF3805F1CB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {206C8AEF-3BE6-44E9-A1B0-25BF3805F1CB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {206C8AEF-3BE6-44E9-A1B0-25BF3805F1CB}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/App.config b/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/App.config new file mode 100644 index 00000000..74ade9db --- /dev/null +++ b/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/App.config @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<configuration> + <startup> + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/> + </startup> +</configuration> diff --git a/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Form1.Designer.cs b/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Form1.Designer.cs new file mode 100644 index 00000000..f067f2c4 --- /dev/null +++ b/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Form1.Designer.cs @@ -0,0 +1,209 @@ +namespace TS100_Logo_Editor +{ + partial class Form1 + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.btnLoadImage = new System.Windows.Forms.Button(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.cbInvertImage = new System.Windows.Forms.CheckBox(); + this.gbScaling = new System.Windows.Forms.GroupBox(); + this.rbScaleStretch = new System.Windows.Forms.RadioButton(); + this.rbScaleFit = new System.Windows.Forms.RadioButton(); + this.pbImage = new System.Windows.Forms.PictureBox(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.btnSaveHex = new System.Windows.Forms.Button(); + this.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.gbScaling.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pbImage)).BeginInit(); + this.groupBox3.SuspendLayout(); + this.SuspendLayout(); + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.btnLoadImage); + this.groupBox1.Location = new System.Drawing.Point(20, 20); + this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBox1.Size = new System.Drawing.Size(300, 217); + this.groupBox1.TabIndex = 0; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "1. Load source Image"; + // + // btnLoadImage + // + this.btnLoadImage.Location = new System.Drawing.Point(10, 31); + this.btnLoadImage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btnLoadImage.Name = "btnLoadImage"; + this.btnLoadImage.Size = new System.Drawing.Size(280, 35); + this.btnLoadImage.TabIndex = 0; + this.btnLoadImage.Text = "Load Image"; + this.btnLoadImage.UseVisualStyleBackColor = true; + this.btnLoadImage.Click += new System.EventHandler(this.btnLoadImage_Click); + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.cbInvertImage); + this.groupBox2.Controls.Add(this.gbScaling); + this.groupBox2.Controls.Add(this.pbImage); + this.groupBox2.Location = new System.Drawing.Point(330, 20); + this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBox2.Size = new System.Drawing.Size(300, 217); + this.groupBox2.TabIndex = 1; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "2. Adjust image"; + // + // cbInvertImage + // + this.cbInvertImage.AutoSize = true; + this.cbInvertImage.Location = new System.Drawing.Point(138, 122); + this.cbInvertImage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.cbInvertImage.Name = "cbInvertImage"; + this.cbInvertImage.Size = new System.Drawing.Size(75, 24); + this.cbInvertImage.TabIndex = 2; + this.cbInvertImage.Text = "Invert"; + this.cbInvertImage.UseVisualStyleBackColor = true; + this.cbInvertImage.CheckedChanged += new System.EventHandler(this.cbInvertImage_CheckedChanged); + // + // gbScaling + // + this.gbScaling.Controls.Add(this.rbScaleStretch); + this.gbScaling.Controls.Add(this.rbScaleFit); + this.gbScaling.Location = new System.Drawing.Point(9, 91); + this.gbScaling.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.gbScaling.Name = "gbScaling"; + this.gbScaling.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.gbScaling.Size = new System.Drawing.Size(120, 117); + this.gbScaling.TabIndex = 1; + this.gbScaling.TabStop = false; + this.gbScaling.Text = "Scaling"; + // + // rbScaleStretch + // + this.rbScaleStretch.AutoSize = true; + this.rbScaleStretch.Location = new System.Drawing.Point(10, 68); + this.rbScaleStretch.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.rbScaleStretch.Name = "rbScaleStretch"; + this.rbScaleStretch.Size = new System.Drawing.Size(86, 24); + this.rbScaleStretch.TabIndex = 1; + this.rbScaleStretch.Text = "Stretch"; + this.rbScaleStretch.UseVisualStyleBackColor = true; + this.rbScaleStretch.CheckedChanged += new System.EventHandler(this.rbScaleStretch_CheckedChanged); + // + // rbScaleFit + // + this.rbScaleFit.AutoSize = true; + this.rbScaleFit.Checked = true; + this.rbScaleFit.Location = new System.Drawing.Point(10, 31); + this.rbScaleFit.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.rbScaleFit.Name = "rbScaleFit"; + this.rbScaleFit.Size = new System.Drawing.Size(52, 24); + this.rbScaleFit.TabIndex = 0; + this.rbScaleFit.TabStop = true; + this.rbScaleFit.Text = "Fit"; + this.rbScaleFit.UseVisualStyleBackColor = true; + this.rbScaleFit.CheckedChanged += new System.EventHandler(this.rbScaleFit_CheckedChanged); + // + // pbImage + // + this.pbImage.BackColor = System.Drawing.Color.Black; + this.pbImage.Location = new System.Drawing.Point(4, 31); + this.pbImage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.pbImage.Name = "pbImage"; + this.pbImage.Size = new System.Drawing.Size(192, 32); + this.pbImage.TabIndex = 0; + this.pbImage.TabStop = false; + // + // groupBox3 + // + this.groupBox3.Controls.Add(this.btnSaveHex); + this.groupBox3.Location = new System.Drawing.Point(640, 20); + this.groupBox3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBox3.Size = new System.Drawing.Size(300, 217); + this.groupBox3.TabIndex = 2; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "3. Export"; + // + // btnSaveHex + // + this.btnSaveHex.Location = new System.Drawing.Point(8, 91); + this.btnSaveHex.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btnSaveHex.Name = "btnSaveHex"; + this.btnSaveHex.Size = new System.Drawing.Size(280, 35); + this.btnSaveHex.TabIndex = 0; + this.btnSaveHex.Text = "Save DFU File"; + this.btnSaveHex.UseVisualStyleBackColor = true; + this.btnSaveHex.Click += new System.EventHandler(this.btnSaveHex_Click); + // + // Form1 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(963, 265); + this.Controls.Add(this.groupBox3); + this.Controls.Add(this.groupBox2); + this.Controls.Add(this.groupBox1); + this.DoubleBuffered = true; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.Name = "Form1"; + this.ShowIcon = false; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "TS100 Custom Logo editor"; + this.groupBox1.ResumeLayout(false); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); + this.gbScaling.ResumeLayout(false); + this.gbScaling.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pbImage)).EndInit(); + this.groupBox3.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.Button btnLoadImage; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.CheckBox cbInvertImage; + private System.Windows.Forms.GroupBox gbScaling; + private System.Windows.Forms.RadioButton rbScaleStretch; + private System.Windows.Forms.RadioButton rbScaleFit; + private System.Windows.Forms.PictureBox pbImage; + private System.Windows.Forms.GroupBox groupBox3; + private System.Windows.Forms.Button btnSaveHex; + } +} + diff --git a/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Form1.cs b/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Form1.cs new file mode 100644 index 00000000..5067c509 --- /dev/null +++ b/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Form1.cs @@ -0,0 +1,169 @@ + +using System; +using System.Drawing; +using System.Windows.Forms; + +namespace TS100_Logo_Editor +{ + public partial class Form1 : Form + { + public Form1() + { + InitializeComponent(); + } + Image sourceImage; + const int LCDWidth = 96; + Bitmap PureBMP; + private void btnLoadImage_Click(object sender, EventArgs e) + { + //load in an image + OpenFileDialog dlg = new OpenFileDialog(); + dlg.Title = "Select Image"; + dlg.Filter = "Image files (*.jpg, *.jpeg, *.bmp, *.png) | *.jpg; *.jpeg; *.bmp; *.png"; + if (dlg.ShowDialog() == DialogResult.OK) + { + //user has selected an image + string filename = dlg.FileName; + sourceImage = Image.FromFile(filename); + reDrawPreview(); + } + + } + + private void reDrawPreview() + { + PureBMP = new Bitmap(LCDWidth, 16); + //scale mode + if (rbScaleFit.Checked) + { + //fit + float scalefactor = Math.Min((float)PureBMP.Width / (float)sourceImage.Width, (float)PureBMP.Height / (float)sourceImage.Height); + using (Graphics g = Graphics.FromImage(PureBMP)) + { + g.DrawImage(sourceImage, new RectangleF(0, 0, sourceImage.Width * scalefactor, sourceImage.Height * scalefactor)); + } + } + else + { + //draw image stretched + using (Graphics g = Graphics.FromImage(PureBMP)) + { + g.DrawImage(sourceImage, new RectangleF(0, 0, LCDWidth, 16)); + } + } + //We now have our downsampled colour image + //apply inversion + if (cbInvertImage.Checked) + { + for (int y = 0; (y <= (PureBMP.Height - 1)); y++) + { + for (int x = 0; (x <= (PureBMP.Width - 1)); x++) + { + Color inv = PureBMP.GetPixel(x, y); + inv = Color.FromArgb(255, (255 - inv.R), (255 - inv.G), (255 - inv.B)); + PureBMP.SetPixel(x, y, inv); + } + } + } + + //Threshold image + PureBMP = GrayScale(PureBMP); + //draw image at 2x scale + Bitmap bBig = new Bitmap(pbImage.Width, pbImage.Height); + using (Graphics g = Graphics.FromImage(bBig)) + { + g.DrawImage(PureBMP, new RectangleF(0, 0, pbImage.Width, pbImage.Height)); + } + pbImage.Image = bBig; + } + public Bitmap GrayScale(Bitmap Bmp) + { + int rgb; + Color c; + + for (int y = 0; y < Bmp.Height; y++) + for (int x = 0; x < Bmp.Width; x++) + { + c = Bmp.GetPixel(x, y); + rgb = (int)((c.R + c.G + c.B) / 3); + if (rgb > 128) + rgb = 0xFF; + else + rgb = 0x00; + Bmp.SetPixel(x, y, Color.FromArgb(rgb, rgb, rgb)); + } + return Bmp; + } + + private void rbScaleStretch_CheckedChanged(object sender, EventArgs e) + { + reDrawPreview(); + } + + private void rbScaleFit_CheckedChanged(object sender, EventArgs e) + { + reDrawPreview(); + } + + private void cbInvertImage_CheckedChanged(object sender, EventArgs e) + { + reDrawPreview(); + } + + private void btnSaveHex_Click(object sender, EventArgs e) + { + Bitmap bmp = PureBMP; + //convert image to byte array + byte[] data = new byte[1024]; + data[0] = 0xAA; + data[1] = 0x55; + data[2] = 0xF0; + data[3] = 0x0D; + + for (int i = 0; i < (LCDWidth * 16 / 8); i++) + { + //loop through all the bytes + byte b = 0;//local byte + //i sets the starting column + for (int y = 0; y < 8; y++) + { + var px = bmp.GetPixel(i % LCDWidth, (i / LCDWidth) == 1 ? 8 + y : y); + //we loop down the picture + //LSB is the top, MSB is the bottom + if (px.R >= 128) + { + //pixel is white + b |= (byte)(1 << y); + } + } + data[i + 4] = b; + } + //We should now have the byte array that represents the image in the LCD format. + //We now send this off to be encoded by the Intel Encoder + //Flip all uint16_t pairs + for (int i = 0; i < data.Length; i += 2) + { + //we need to swap each pair + byte temp = data[i]; + data[i] = data[i + 1]; + data[i + 1] = temp; + } + string outputHexFile = IntelHex.IntelHex.encode(data, 0x0800B800, 16, true, true);//16 bytes is the only format the DFU seems to support //0x0800B800 + //^ This string now just needs to be written out to a text file :) + SaveFileDialog dlg = new SaveFileDialog(); + dlg.Title = "Save DFU File"; + dlg.AddExtension = true; + dlg.DefaultExt = ".hex"; + dlg.Filter = "Hex Files(*.hex)|*.hex"; + if (dlg.ShowDialog() == DialogResult.OK) + { + //The user has selected where they want to save the file + using (var fs = new System.IO.StreamWriter(dlg.FileName)) + { + fs.Write(outputHexFile); + } + } + + } + } +} diff --git a/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Form1.resx b/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Form1.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Form1.resx @@ -0,0 +1,120 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root>
\ No newline at end of file diff --git a/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/IntelHex.cs b/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/IntelHex.cs new file mode 100644 index 00000000..f1206cac --- /dev/null +++ b/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/IntelHex.cs @@ -0,0 +1,96 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; + +namespace IntelHex +{ + public class IntelHex + { + public static string encode(byte[] data, UInt32 startingAddress, int bytesPerLine, bool header = true,bool Addbloat=false) + { + //We are taking the byte array and encoding it into the wanted hex file contents (aka string of data). + //First create the starting base address record + //:020000040800F2 + string Output = ""; + if (header) + { + //Set the upper 16 bits of the address space + Output += getHighAddressSetLine((UInt16)(startingAddress >> 16)); + } + + //Now loop through all the data that we were given + for (UInt32 index = 0; index < data.Length; index = (UInt32)(index + bytesPerLine)) + { + //We want to read from data[index] to data[index+bytesPerLine-1] + UInt32 currentAddress = (UInt32)(startingAddress + index); + if ((currentAddress >> 16) != (startingAddress >> 16)) + { + Output += getHighAddressSetLine((UInt16)(currentAddress >> 16)); + //The address has rolled over the 64K boundry, so write a new high address change line + } + //We should now be good for the higher part of the address + Output += encodeDataLine((UInt16)(currentAddress & 0xFFFF), data, index, bytesPerLine); + } + if(Addbloat) + { + //Repeat the instructs a stack of times to get around filesize minimums + for(int x=0;x<3;x++) + { + for (UInt32 index = 0; index < data.Length; index = (UInt32)(index + bytesPerLine)) + { + //We want to read from data[index] to data[index+bytesPerLine-1] + UInt32 currentAddress = (UInt32)(startingAddress + index); + if ((currentAddress >> 16) != (startingAddress >> 16)) + { + Output += getHighAddressSetLine((UInt16)(currentAddress >> 16)); + //The address has rolled over the 64K boundry, so write a new high address change line + } + //We should now be good for the higher part of the address + Output += encodeDataLine((UInt16)(currentAddress & 0xFFFF), data, index, bytesPerLine); + } + } + } + //We have now written out all the data lines + Output += ":00000001FF\r\n";//End of file marker + + return Output; + } + private static string encodeDataLine(UInt16 address, byte[] data, UInt32 startindex, int bytes) + { + string line = ":"; + line += bytes.ToString("X2");//add the marker of line length + line += address.ToString("X4");//write the address + line += "00";//Data line + //Next copy bytes bytes + for (int i = 0; i < bytes; i++) + { + if ((startindex + i) < data.Length) + line += data[startindex + i].ToString("X2"); + else + line += "FF";//pad images out with FF + } + line += checksumLine(line);//Adds checksum and EOL + return line; + } + private static string getHighAddressSetLine(UInt16 HighAddress) + { + string Output = ""; + Output += ":02000004" + (HighAddress).ToString("X4"); + Output += checksumLine(Output); + return Output; + } + private static string checksumLine(string line) + { + //We want to convert the string line to each byte and sum. + byte sum = 0; + for (int i = 1; i < line.Length; i += 2) + { + byte b = byte.Parse((line.Substring(i, 2)), System.Globalization.NumberStyles.HexNumber); + sum += b; + } + byte checksum = (byte)(((byte)0) - sum);//invert + return checksum.ToString("X2") + "\r\n"; + } + } +} diff --git a/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Program.cs b/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Program.cs new file mode 100644 index 00000000..bee62adc --- /dev/null +++ b/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Program.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace TS100_Logo_Editor +{ + static class Program + { + /// <summary> + /// The main entry point for the application. + /// </summary> + [STAThread] + static void Main() + { + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + Application.Run(new Form1()); + } + } +} diff --git a/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Properties/AssemblyInfo.cs b/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..b330f110 --- /dev/null +++ b/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("TS100 Logo Editor")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("TS100 Logo Editor")] +[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("206c8aef-3be6-44e9-a1b0-25bf3805f1cb")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Properties/Resources.Designer.cs b/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Properties/Resources.Designer.cs new file mode 100644 index 00000000..60db1d43 --- /dev/null +++ b/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Properties/Resources.Designer.cs @@ -0,0 +1,63 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// </auto-generated> +//------------------------------------------------------------------------------ + +namespace TS100_Logo_Editor.Properties { + using System; + + + /// <summary> + /// A strongly-typed resource class, for looking up localized strings, etc. + /// </summary> + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// <summary> + /// Returns the cached ResourceManager instance used by this class. + /// </summary> + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TS100_Logo_Editor.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// <summary> + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// </summary> + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } +} diff --git a/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Properties/Resources.resx b/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Properties/Resources.resx new file mode 100644 index 00000000..af7dbebb --- /dev/null +++ b/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Properties/Resources.resx @@ -0,0 +1,117 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root>
\ No newline at end of file diff --git a/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Properties/Settings.Designer.cs b/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Properties/Settings.Designer.cs new file mode 100644 index 00000000..94e873e5 --- /dev/null +++ b/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Properties/Settings.Designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// </auto-generated> +//------------------------------------------------------------------------------ + +namespace TS100_Logo_Editor.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.1.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default { + get { + return defaultInstance; + } + } + } +} diff --git a/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Properties/Settings.settings b/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Properties/Settings.settings new file mode 100644 index 00000000..39645652 --- /dev/null +++ b/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Properties/Settings.settings @@ -0,0 +1,7 @@ +<?xml version='1.0' encoding='utf-8'?> +<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)"> + <Profiles> + <Profile Name="(Default)" /> + </Profiles> + <Settings /> +</SettingsFile> diff --git a/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/TS100 Logo Editor.csproj b/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/TS100 Logo Editor.csproj new file mode 100644 index 00000000..31abe7f4 --- /dev/null +++ b/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/TS100 Logo Editor.csproj @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProjectGuid>{206C8AEF-3BE6-44E9-A1B0-25BF3805F1CB}</ProjectGuid> + <OutputType>WinExe</OutputType> + <RootNamespace>TS100_Logo_Editor</RootNamespace> + <AssemblyName>TS100 Logo Editor</AssemblyName> + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + <TargetFrameworkProfile /> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants> + </DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup> + <StartupObject>TS100_Logo_Editor.Program</StartupObject> + </PropertyGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.Core" /> + <Reference Include="System.Xml.Linq" /> + <Reference Include="System.Data.DataSetExtensions" /> + <Reference Include="Microsoft.CSharp" /> + <Reference Include="System.Data" /> + <Reference Include="System.Deployment" /> + <Reference Include="System.Drawing" /> + <Reference Include="System.Windows.Forms" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup> + <Compile Include="Form1.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="Form1.Designer.cs"> + <DependentUpon>Form1.cs</DependentUpon> + </Compile> + <Compile Include="IntelHex.cs" /> + <Compile Include="Program.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + <EmbeddedResource Include="Form1.resx"> + <DependentUpon>Form1.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="Properties\Resources.resx"> + <Generator>ResXFileCodeGenerator</Generator> + <LastGenOutput>Resources.Designer.cs</LastGenOutput> + <SubType>Designer</SubType> + </EmbeddedResource> + <Compile Include="Properties\Resources.Designer.cs"> + <AutoGen>True</AutoGen> + <DependentUpon>Resources.resx</DependentUpon> + <DesignTime>True</DesignTime> + </Compile> + <None Include="Properties\Settings.settings"> + <Generator>SettingsSingleFileGenerator</Generator> + <LastGenOutput>Settings.Designer.cs</LastGenOutput> + </None> + <Compile Include="Properties\Settings.Designer.cs"> + <AutoGen>True</AutoGen> + <DependentUpon>Settings.settings</DependentUpon> + <DesignTimeSharedInput>True</DesignTimeSharedInput> + </Compile> + </ItemGroup> + <ItemGroup> + <None Include="App.config" /> + </ItemGroup> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> +</Project>
\ No newline at end of file @@ -1,11 +1,12 @@ # TS100 -This is a complete re-write of the open source software for the ts100 soldering iron. +This is a complete re*write of the open source software for the ts100 soldering iron. This project is feature complete for use as a soldering iron, *so please suggest any feature improvements you would like!* This project was started to remove the need for USB for changing system settings. In the latest official firmware they have also added a settings menu system, so it is still worth comparing the two firmwares to select your preferred option. -**Please note that when running the iron off a Lithium battery pack, the Iron is only rated to 24V input. So using a fully charged 6S battery exceeds this rating, and is done so at your own risk. Please calibrate your irons voltage reading when you are using a lithium battery after any firmware upgrades.** +**Please note that when running the iron off a Lithium battery pack, the Iron is only rated to 24V input. So using a fully charged 6S battery exceeds this rating, and is done so at your own risk. +Please calibrate your irons voltage reading when you are using a lithium battery after any firmware upgrades.** ## Features * Soldering / Temperature control @@ -21,10 +22,12 @@ In the latest official firmware they have also added a settings menu system, so * Calibration of the temperature offset * Boost mode lets you temporarily change the temperature when soldering * Battery charge level indicatior if power source set to a lipo cell count. +* Custom bootup logo support # Upgrading your ts100 iron + This is completely safe, if it goes wrong just put the .hex file from the official website onto the unit and your back to the old firmware. Downloads for the hex files to flash are available on the [releases page.](https://github.com/Ralim/ts100/releases) -Officially the bootloader on the iron only works under windows. However, users have reported that it does work under Mac, and can be made to work under Linux. Details over on the [wiki page](https://github.com/Ralim/ts100/wiki/Upgrading-Firmware). +Officially the bootloader on the iron only works under windows. However, users have reported that it does work under Mac, and can be made to work under Linux *sometimes*. Details over on the [wiki page](https://github.com/Ralim/ts100/wiki/Upgrading*Firmware). 1. Hold the button closest to the tip, and plug in the USB to the computer. 2. The unit will appear as a USB drive. @@ -38,17 +41,38 @@ For the more adventurerous out there, you can also load this firmware onto the d On the bottom of the MCU riser pcb, there are 4 pads for programming. There is a complete device flash backup included in this repository. (Note this includes the bootloader, so will need a SWD programmer to load onto the unit). Please do not use the backup of the bootloader for anything malicious, its only saved here for those who are tinkering with their iron and decide to replace it. -# New Menu System +## Setting a custom bootup image + +This firmware uses a different method of updating the bootup image. +This removes the need for emulating a USB drive on the iron just to allow for a bootup image to be setup. +At this point in time you will need a windows machine to make the required .hex file for you image. + +1. On the [releases page](https://github.com/Ralim/ts100/releases) you will need to download the latest copy of the GUI Tool (*TS100 Logo Editor.exe*). +2. Launch the TS100 Logo Editor, you will need to have .NET 4.0 installed on your machine +3. On the tool open the source image that you would like to use as your bootup screen. A resolution of 96x16 is ideal, but you can fill or stretch your logo to fit +4. Colour images are okay, the software will convert them to B&W for you. +5. You can also invert colours if you would prefer. +6. Save the created file as a *.hex* file somewhere. +7. Connect your iron to your computer in DFU mode (same as you would to upgrade firmware). +8. Drag the created .hex file for the logo onto the iron to update it with the file. +9. You should be good to go. +10. The image will stay through future updates, but if it ever wont I will put a warning in the update download on the releases page. + +## New Menu System + This new firmware uses a new menu system to allow access to the settings on the device. When on the main screen, the unit shows prompts for the two most common operations. --> Pressing the button near the tip enters soldering mode --> Pressing the button near the power input enters the settings menu. --> Pressing both buttons together enters the Extras menu +* Pressing the button near the tip enters soldering mode +* Pressing the button near the power input enters the settings menu. +* Pressing both buttons together enters the Extras menu + ## Soldering mode + In this mode the iron works as you would expect, pressing either button will take you to a temperature change screen. Use each button to go up and down in temperature. Pressing both buttons will exit you from the temperature menu (or wait 3 seconds and it will time out). Pressing both buttons will also exit the soldering mode. ## Settings Menu + This menu allows you to cycle through all the options and set their values. The button near the tip cycles through the options, and the one near the usb changes the selected option. Note that settings are not saved until you exit the menu, and some settings such as screen flip do not apply until a power cycle is applied. @@ -58,7 +82,7 @@ If you leave the unit alone (ie don't press any buttons) on a setting, after 3 s * STMP -> The temperature the unit drops to in sleep mode * SLTME -> Sleep time, how long it takes before the unit goes to sleep * SHTME -> Shutdown Time, how long the unit will wait after movement before shutting down completely -* MSENSE -> Motion Sensitivity,0-9,0 means motion sensing is turned off, 9 is most sensitive, 1 is least sensitive (ie takes more movement to trigger) +* MSENSE -> Motion Sensitivity,0*9,0 means motion sensing is turned off, 9 is most sensitive, 1 is least sensitive (ie takes more movement to trigger) * TMPUNIT -> Temperature unit, C or F * TMPRND -> Temperature Rounding, {1,5,10} * TMPSPD -> How fast the temperature should update in the soldering status screen. @@ -67,13 +91,16 @@ If you leave the unit alone (ie don't press any buttons) on a setting, after 3 s * BTMP -> Set the temperature for the boost mode Temperature rounding means that the unit will round off the temperature before displaying. This can helpt to reduce the flickering of the temperature when the unit oscillates between two temperatures. + ## Extras Menu + This menu defaults to showing the current temperature on the tip. Pressing the button near the iron tip will show the current input voltage. Pressing the other button while this is show will allow you to calibrate the reading if your iron is like mine and is not overly accurate out of the factory. (Press buttons to change measurement up and down, press both to exit and save). Pressing the button near the usb enters the temperature offset setting menu, when the iron is cold, pressing the other button will start the unit calibrating for any offset in the tip temperature. -## Calibrating input voltage +### Calibrating input voltage + Due to the tolerance on the resistors used for the input voltage divider, some irons can be up to 0.6V out on the voltage measurement. Please, Please, calibrate your iron if you have any issues with the cutoff voltage. This is more critical than before with the new cell count based cutout voltage. @@ -95,7 +122,8 @@ To calibrate your Iron: 14. Press both buttons at once to exit back to the idle screen. 15. You're done. Enjoy your iron. -## Calibrating tip offset +### Calibrating tip offset + Some tips will have an offset on their readings, to calibrate this out perform the following steps: 1. Connect power to your iron @@ -110,58 +138,78 @@ Some tips will have an offset on their readings, to calibrate this out perform t 10. Press both buttons at the same time to return to the idle screen. 11. You're done. Enjoy your iorn. -## Boost mode +### Boost mode + This allows you to change the front key (one near the tip) to become a boost button instead of going to temperature editing when in soldering mode. This allows you to set this button to change the soldering temperature for short periods. For example when soldering a big joint and you want to boost the temperature a bit. The boost temperature is set in the settings menu. -# Version Changes: + +## Version Changes + +V1.15 + +* Added support for a custom bootup logo to be programmed via the DFU bootloader. + V1.14 -- Changed input voltage cutoff to be based on cell count rather than voltage. + +* Changed input voltage cutoff to be based on cell count rather than voltage. V1.13 -- Swapped buttons for menu to prevent accidentally changing first menu item -- Added auto key repeat. + +* Swapped buttons for menu to prevent accidentally changing first menu item +* Added auto key repeat. V1.12 -- Increases sensitivity options to be 1-9 with 0 off state -- Fixes issue where going from COOL -> soldering can leave screen off. + +* Increases sensitivity options to be 1*9 with 0 off state +* Fixes issue where going from COOL *> soldering can leave screen off. V1.11 -- Boost mode -- Change sensitivity options to be 1-8 + +* Boost mode +* Change sensitivity options to be 1*8 V1.10 -- Adds help text to settings -- Improves settings for the display update rate + +* Adds help text to settings +* Improves settings for the display update rate V1.09 -- Adds display modes, for slowing down or simplifying the display + +* Adds display modes, for slowing down or simplifying the display V1.08 -- Fix settings menu not showing flip display + +* Fix settings menu not showing flip display V1.07 -- Adds shutdown time to automatically shutdown the iron after inactivity + +* Adds shutdown time to automatically shutdown the iron after inactivity V1.06 -- Changes H and C when the iron is heating to the minidso chevron like images + +* Changes H and C when the iron is heating to the minidso chevron like images V1.05 -- Adds ability to calibrate the input voltage measurement + +* Adds ability to calibrate the input voltage measurement V1.04 -- Increased accuracy of the temperature control -- Improved PID response slightly -- Allows temperature offset calibration -- Nicer idle screen + +* Increased accuracy of the temperature control +* Improved PID response slightly +* Allows temperature offset calibration +* Nicer idle screen V1.03 -- Improved Button handling -- Ability to set motion sensitivity -- DC voltmeter page shows input voltage + +* Improved Button handling +* Ability to set motion sensitivity +* DC voltmeter page shows input voltage V1.02 -- Adds hold both buttons on IDLE to access the therometer mode. -- Changes the exit soldering mode to be holding both buttons (Like original firmware). -If you _really_ loved this firmware and want to continue my caffine addiction, you can do so here (or email me) : https://paypal.me/RalimTek +* Adds hold both buttons on IDLE to access the therometer mode. +* Changes the exit soldering mode to be holding both buttons (Like original firmware). + +If you love this firmware and want to continue my caffine addiction, you can do so here (or email me) : https://paypal.me/RalimTek diff --git a/TS100.png b/TS100.png Binary files differdeleted file mode 100644 index 00b8fcb0..00000000 --- a/TS100.png +++ /dev/null diff --git a/workspace/ts100/LinkerScript.ld b/workspace/ts100/LinkerScript.ld index cc040105..5d43212f 100644 --- a/workspace/ts100/LinkerScript.ld +++ b/workspace/ts100/LinkerScript.ld @@ -62,7 +62,7 @@ _Min_Stack_Size = 0x400; /* required amount of stack */ MEMORY
{
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 20K
- ROM (rx) : ORIGIN = 0x08004000, LENGTH = 47K
+ ROM (rx) : ORIGIN = 0x08004000, LENGTH = 46K
}
/*ROM (rx) : ORIGIN = 0x08004000, LENGTH = 48K*/
diff --git a/workspace/ts100/StdPeriph_Driver/Release_Notes.html b/workspace/ts100/StdPeriph_Driver/Release_Notes.html deleted file mode 100644 index 633e42e3..00000000 --- a/workspace/ts100/StdPeriph_Driver/Release_Notes.html +++ /dev/null @@ -1,342 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-
-
-
-
-
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="File-List" href="Library_files/filelist.xml">
-<link rel="Edit-Time-Data" href="Library_files/editdata.mso"><!--[if !mso]> <style> v\:* {behavior:url(#default#VML);} o\:* {behavior:url(#default#VML);} w\:* {behavior:url(#default#VML);} .shape {behavior:url(#default#VML);} </style> <![endif]--><title>Release Notes for STM32F10x Standard Peripherals Library Drivers</title><!--[if gte mso 9]><xml> <o:DocumentProperties> <o:Author>STMicroelectronics</o:Author> <o:LastAuthor>STMicroelectronics</o:LastAuthor> <o:Revision>37</o:Revision> <o:TotalTime>136</o:TotalTime> <o:Created>2009-02-27T19:26:00Z</o:Created> <o:LastSaved>2009-03-01T17:56:00Z</o:LastSaved> <o:Pages>1</o:Pages> <o:Words>522</o:Words> <o:Characters>2977</o:Characters> <o:Company>STMicroelectronics</o:Company> <o:Lines>24</o:Lines> <o:Paragraphs>6</o:Paragraphs> <o:CharactersWithSpaces>3493</o:CharactersWithSpaces> <o:Version>11.6568</o:Version> </o:DocumentProperties> </xml><![endif]--><!--[if gte mso 9]><xml> <w:WordDocument> <w:Zoom>110</w:Zoom> <w:ValidateAgainstSchemas/> <w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid> <w:IgnoreMixedContent>false</w:IgnoreMixedContent> <w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText> <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel> </w:WordDocument> </xml><![endif]--><!--[if gte mso 9]><xml> <w:LatentStyles DefLockedState="false" LatentStyleCount="156"> </w:LatentStyles> </xml><![endif]-->
-
-
-
-<style>
-<!--
-/* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-{mso-style-parent:"";
-margin:0in;
-margin-bottom:.0001pt;
-mso-pagination:widow-orphan;
-font-size:12.0pt;
-font-family:"Times New Roman";
-mso-fareast-font-family:"Times New Roman";}
-h2
-{mso-style-next:Normal;
-margin-top:12.0pt;
-margin-right:0in;
-margin-bottom:3.0pt;
-margin-left:0in;
-mso-pagination:widow-orphan;
-page-break-after:avoid;
-mso-outline-level:2;
-font-size:14.0pt;
-font-family:Arial;
-font-weight:bold;
-font-style:italic;}
-a:link, span.MsoHyperlink
-{color:blue;
-text-decoration:underline;
-text-underline:single;}
-a:visited, span.MsoHyperlinkFollowed
-{color:blue;
-text-decoration:underline;
-text-underline:single;}
-p
-{mso-margin-top-alt:auto;
-margin-right:0in;
-mso-margin-bottom-alt:auto;
-margin-left:0in;
-mso-pagination:widow-orphan;
-font-size:12.0pt;
-font-family:"Times New Roman";
-mso-fareast-font-family:"Times New Roman";}
-@page Section1
-{size:8.5in 11.0in;
-margin:1.0in 1.25in 1.0in 1.25in;
-mso-header-margin:.5in;
-mso-footer-margin:.5in;
-mso-paper-source:0;}
-div.Section1
-{page:Section1;}
--->
-</style><!--[if gte mso 10]> <style> /* Style Definitions */ table.MsoNormalTable {mso-style-name:"Table Normal"; mso-tstyle-rowband-size:0; mso-tstyle-colband-size:0; mso-style-noshow:yes; mso-style-parent:""; mso-padding-alt:0in 5.4pt 0in 5.4pt; mso-para-margin:0in; mso-para-margin-bottom:.0001pt; mso-pagination:widow-orphan; font-size:10.0pt; font-family:"Times New Roman"; mso-ansi-language:#0400; mso-fareast-language:#0400; mso-bidi-language:#0400;} </style> <![endif]--><!--[if gte mso 9]><xml> <o:shapedefaults v:ext="edit" spidmax="5122"/> </xml><![endif]--><!--[if gte mso 9]><xml> <o:shapelayout v:ext="edit"> <o:idmap v:ext="edit" data="1"/> </o:shapelayout></xml><![endif]--></head>
-<body lang="EN-US" link="blue" vlink="blue">
-<div class="Section1">
-<p class="MsoNormal"><span style="font-family: Arial;"><o:p><br>
-</o:p></span></p>
-<div align="center">
-<table class="MsoNormalTable" style="width: 675pt;" border="0" cellpadding="0" cellspacing="0" width="900">
-<tbody>
-<tr style="">
-<td style="padding: 0cm;" valign="top">
-<table class="MsoNormalTable" style="width: 675pt;" border="0" cellpadding="0" cellspacing="0" width="900">
-<tbody>
- <tr>
- <td style="vertical-align: top;"><span style="font-size: 8pt; font-family: Arial; color: blue;"><a href="../../Release_Notes.html">Back to Release page</a></span></td>
- </tr>
-<tr style="">
-<td style="padding: 1.5pt;">
-<h1 style="margin-bottom: 18pt; text-align: center;" align="center"><span style="font-size: 20pt; font-family: Verdana; color: rgb(51, 102, 255);">Release
-Notes for STM32F10x Standard Peripherals Library Drivers
-(StdPeriph_Driver)</span><span style="font-size: 20pt; font-family: Verdana;"><o:p></o:p></span></h1>
-<p class="MsoNormal" style="text-align: center;" align="center"><span style="font-size: 10pt; font-family: Arial; color: black;">Copyright 2011 STMicroelectronics</span><span style="color: black;"><u1:p></u1:p><o:p></o:p></span></p>
-<p class="MsoNormal" style="text-align: center;" align="center"><span style="font-size: 10pt; font-family: Arial; color: black;"><img alt="" id="_x0000_i1025" src="../../_htmresc/logo.bmp" style="border: 0px solid ; width: 86px; height: 65px;"></span><span style="font-size: 10pt;"><o:p></o:p></span></p>
-</td>
-</tr>
-</tbody>
-</table>
-<p class="MsoNormal"><span style="font-family: Arial; display: none;"><o:p> </o:p></span></p>
-<table class="MsoNormalTable" style="width: 675pt;" border="0" cellpadding="0" width="900">
-<tbody>
-<tr>
-<td style="padding: 0cm;" valign="top">
-<h2 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;"><span style="font-size: 12pt; color: white;">Contents<o:p></o:p></span></h2>
-<ol style="margin-top: 0cm;" start="1" type="1">
-<li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;"><a href="#History">STM32F10x Standard Peripherals Library
-Drivers update History</a><o:p></o:p></span></li>
-<li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;"><a href="#License">License</a><o:p></o:p></span></li>
-</ol>
-<span style="font-family: "Times New Roman";">
-</span>
-<h2 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;"><a name="History"></a><span style="font-size: 12pt; color: white;">STM32F10x Standard
-Peripherals Library Drivers update History</span></h2><br>
- <h3 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; margin-right: 500pt; width: 167px;"><span style="font-size: 10pt; font-family: Arial; color: white;">V3.5.0 / 11-March-2011<o:p></o:p></span></h3>
- <p class="MsoNormal" style="margin: 4.5pt 0cm 4.5pt 18pt;"><b style=""><u><span style="font-size: 10pt; font-family: Verdana; color: black;">Main
-Changes<o:p></o:p></span></u></b></p>
-
- <ul style="margin-top: 0cm;" type="square">
-<li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_can.h/.c files:</span></li>
- <ul>
- <li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;">Add 5 new functions</span></li>
- <ul>
- <li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;">3
-new functions controlling the counter errors: CAN_GetLastErrorCode(),
-CAN_GetReceiveErrorCounter() and CAN_GetLSBTransmitErrorCounter().</span></li>
- </ul>
- <ul>
- <li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;">1 new function to select the CAN operating mode: CAN_OperatingModeRequest().</span></li>
- </ul>
- <ul>
- <li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;">1 new function to support CAN TT mode: CAN_TTComModeCmd().</span><span style="font-size: 10pt; font-family: Verdana;"><br>
- </span></li>
- </ul>
- <li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;">CAN_TransmitStatus() function updated to support all CAN transmit intermediate states<br>
- </span></li>
- </ul>
- <li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_i2c.h/.c files:</span></li>
- <ul>
- <li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;">Add 1 new function:</span></li>
- <ul>
- <li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;">I2C_NACKPositionConfig():
-This function configures the same bit (POS) as I2C_PECPositionConfig()
-but is intended to be used in I2C mode while I2C_PECPositionConfig() is
-intended to used in SMBUS mode.</span></li>
- </ul>
- </ul>
- <li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_tim.h/.c files:</span></li>
- <ul>
- <li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;">Change the <span style="font-style: italic;">TIM_DMABurstLength_xBytes</span> definitions to <span style="font-style: italic;">TIM_DMABurstLength_xTansfers</span><br>
- </span></li>
- </ul>
-
-
- </ul>
-
- <h3 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; margin-right: 558.05pt;"><span style="font-size: 10pt; font-family: Arial; color: white;">3.4.0
-- 10/15/2010</span></h3>
-
- <ol style="margin-top: 0in;" start="1" type="1">
-<li class="MsoNormal" style=""><b><i><span style="font-size: 10pt; font-family: Verdana;">General</span></i></b><i><span style="font-size: 10pt; font-family: Verdana;"> </span></i><i><span style="font-size: 10pt;"><o:p></o:p></span></i></li>
- </ol>
-
- <ul style="margin-top: 0in;" type="disc">
-<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Add support for <span style="font-weight: bold;">STM32F10x High-density value line </span>devices.</span></li>
- </ul>
-
- <ol style="margin-top: 0in;" start="2" type="1">
-<li class="MsoNormal" style=""><b><i><span style="font-size: 10pt; font-family: Verdana;">STM32F10x_StdPeriph_Driver</span></i></b><b><i><span style="font-size: 10pt;"><o:p></o:p></span></i></b></li>
- </ol>
-
-
- <ul style="margin-top: 0in;" type="disc">
-
- <li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_bkp.h/.c</span></li>
- <ul>
-<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">Delete BKP registers definition from stm32f10x_bkp.c and use defines within stm32f10x.h file. </span></span></li>
- </ul>
- <li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_can.h/.c</span></li>
- <ul>
-<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">Delete CAN registers definition from stm32f10x_can.c and use defines within stm32f10x.h file.<br>
-</span></span></li>
- <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">Update the wording of some defines and Asserts macro. <br>
- </span></span></li>
- <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">CAN_GetFlagStatus()
-and CAN_ClearFlag() functions: updated to support new flags (were not
-supported in previous version). These flags are: CAN_FLAG_RQCP0,
-CAN_FLAG_RQCP1, CAN_FLAG_RQCP2, CAN_FLAG_FMP1, CAN_FLAG_FF1,
-CAN_FLAG_FOV1, CAN_FLAG_FMP0, CAN_FLAG_FF0, CAN_FLAG_FOV0,
-CAN_FLAG_WKU, CAN_FLAG_SLAK and CAN_FLAG_LEC. <br>
- </span></span></li>
- <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">CAN_GetITStatus()
-function: add a check of the interrupt enable bit before getting the
-status of corresponding interrupt pending bit. <br>
- </span></span></li>
- <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">CAN_ClearITPendingBit() function: correct the procedure to clear the interrupt pending bit. <br>
- </span></span></li>
- </ul>
- <li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_crc.h/.c</span></li>
- <ul>
-<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">Delete CRC registers definition from stm32f10x_crc.c and use defines within stm32f10x.h file.</span></span></li>
- </ul>
- <li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_dac.h/.c</span></li>
- <ul>
-<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">Delete DAC registers definition from stm32f10x_dac.c and use defines within stm32f10x.h file. </span></span></li>
- </ul>
- <li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_dbgmcu.h/.c</span></li>
- <ul>
-<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">Delete DBGMCU registers definition from stm32f10x_dbgmcu.c and use defines within stm32f10x.h file. </span></span></li>
- </ul>
- <li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_dma.h/.c</span></li>
- <ul>
-<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">Delete DMA registers definition from stm32f10x_dma.c and use defines within stm32f10x.h file.</span></span></li>
- <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">Add new function "void DMA_SetCurrDataCounter(DMA_Channel_TypeDef* DMAy_Channelx, uint16_t DataNumber);"<br>
- </span></span></li>
- </ul>
- <li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_flash.h/.c</span></li>
- <ul>
-<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">FLASH functions (Erase and Program) updated to always clear the "PG", "MER" and "PER" bits even in case of TimeOut Error.</span><span style="font-style: italic;"></span></span></li>
- </ul>
- <li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_fsmc.h/.c</span></li>
- <ul>
-<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">Add new member "FSMC_AsynchronousWait" in "FSMC_NORSRAMInitTypeDef" structure.</span><span style="font-style: italic;"></span></span></li>
- </ul>
- <li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_gpio.h/.c</span></li>
- <ul>
-<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">GPIO_PinRemapConfig()</span> function: add new values for <span style="font-style: italic;">GPIO_Remap</span> parameter, to support new <span style="font-style: italic;">remap for TIM6, TIM7 and DAC DMA requests, TIM12 and DAC Triggers / DMA2_Channel5 Interrupt mapping.</span></span></li>
- </ul>
- <li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_pwr.h/.c</span></li>
- <ul>
-<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">Delete PWR registers definition from stm32f10x_pwr.c and use defines within stm32f10x.h and core_cm3.h files.</span></span></li>
- </ul>
- <li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_rtc.h/.c</span></li>
- <ul>
-<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">Delete RTC registers definition from stm32f10x_rtc.c and use defines within stm32f10x.h file.</span></span></li>
- </ul>
- <li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_spi.h/.c</span></li>
- <ul>
-<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">Add new definition for I2S Audio Clock frequencies "I2S_AudioFreq_192k".</span></span></li>
- </ul>
- <li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_tim.h/.c</span></li>
-<ul><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">Add new definition for TIM Input Capture Polarity "TIM_ICPolarity_BothEdge".</span></span></li></ul>
-
- </ul>
-
- <h3 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; margin-right: 558.05pt;"><span style="font-size: 10pt; font-family: Arial; color: white;">3.3.0
-- 04/16/2010</span></h3>
-
-<ol style="margin-top: 0in;" start="1" type="1"><li class="MsoNormal" style=""><b><i><span style="font-size: 10pt; font-family: Verdana;">General</span></i></b><i><span style="font-size: 10pt; font-family: Verdana;"> </span></i><i><span style="font-size: 10pt;"><o:p></o:p></span></i></li></ol>
-<ul style="margin-top: 0in;" type="disc"><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Add support for <span style="font-weight: bold;">STM32F10x XL-density </span>devices.</span></li><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">I2C driver: events description and management enhancement.</span></li></ul>
-<ol style="margin-top: 0in;" start="2" type="1"><li class="MsoNormal" style=""><b><i><span style="font-size: 10pt; font-family: Verdana;">STM32F10x_StdPeriph_Driver</span></i></b><b><i><span style="font-size: 10pt;"><o:p></o:p></span></i></b></li></ol>
-<ul style="margin-top: 0in;" type="disc"><li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_dbgmcu.h/.c</span></li><ul><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">DBGMCU_Config()</span> function: add new values <span style="font-style: italic;">DBGMCU_TIMx_STOP</span> (x: 9..14) for <span style="font-style: italic;">DBGMCU_Periph</span> parameter.</span></li></ul><li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_flash.h/.c:
-updated to support Bank2 of XL-density devices (up to 1MByte of Flash
-memory). For more details, refer to the description provided within
-stm32f10x_flash.c file.</span></li><li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_gpio.h/.c</span></li><ul><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">GPIO_PinRemapConfig()</span> function: add new values for <span style="font-style: italic;">GPIO_Remap</span> parameter, to support new <span style="font-style: italic;">remap for FSMC_NADV pin and TIM9..11,13,14.</span></span></li></ul><li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_i2c.h/.c: I2C events description and management enhancement. <br></span></li><ul><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">I2C_CheckEvent()</span>
-function: updated to check whether the last event contains the
-I2C_EVENT (instead of check whether the last event is equal to
-I2C_EVENT)<br></span></li></ul><ul><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Add
-detailed description of I2C events and how to manage them using the
-functions provided by this driver. For more information, refer to
-stm32f10x_i2c.h and stm32f10x_i2c.c files.</span></li></ul><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_rcc.h/.c: updated to support TIM9..TIM14 APB clock and reset configuration</span></li><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_tim.h/.c: updated to support new Timers TIM9..TIM14.</span></li><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_sdio.h: </span></li><ul><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">SDIO_SetSDIOReadWaitMode() function: correct values of SDIO_ReadWaitMode parameter<br>change <br>
-#define
-SDIO_ReadWaitMode_CLK
- ((uint32_t)0x00000000)<br> #define
-SDIO_ReadWaitMode_DATA2
-((uint32_t)0x00000001)<br>by<br> #define
-SDIO_ReadWaitMode_CLK
- ((uint32_t)0x00000001)<br> #define
-SDIO_ReadWaitMode_DATA2
-((uint32_t)0x00000000)</span></li></ul></ul>
-<h3 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; margin-right: 558.05pt;"><span style="font-size: 10pt; font-family: Arial; color: white;">3.2.0
-- 03/01/2010</span></h3>
-<ol style="margin-top: 0in;" start="1" type="1">
-<li class="MsoNormal" style=""><b><i><span style="font-size: 10pt; font-family: Verdana;">General</span></i></b><i><span style="font-size: 10pt; font-family: Verdana;"> </span></i><i><span style="font-size: 10pt;"><o:p></o:p></span></i></li>
-</ol>
-<ul style="margin-top: 0in;" type="disc">
-
-<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Add support
-for <b>STM32 Low-density Value line (STM32F100x4/6) and
-Medium-density Value line (STM32F100x8/B) devices</b>.</span></li>
- <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Almost
-peripherals drivers were updated to support Value
-line devices features</span></li>
- <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Drivers limitations fix and enhancements. </span><span style="font-size: 10pt;"><o:p></o:p></span></li>
-
-</ul>
-<ol style="margin-top: 0in;" start="2" type="1">
-<li class="MsoNormal" style=""><b><i><span style="font-size: 10pt; font-family: Verdana;">STM32F10x_StdPeriph_Driver</span></i></b><b><i><span style="font-size: 10pt;"><o:p></o:p></span></i></b></li>
-</ol>
-<ul style="margin-top: 0in;" type="disc">
-<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Add new
-firmware driver for CEC peripheral: stm32f10x_cec.h and stm32f10x_cec.c</span></li>
- <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Timers drivers stm32f10x_tim.h/.c: add support for new General Purpose Timers: TIM15, TIM16 and TIM17.</span></li>
- <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">RCC driver: add support for new Value peripherals: HDMI-CEC, TIM15, TIM16 and TIM17.</span></li>
- <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">GPIO driver: add new remap parameters for TIM1, TIM15, TIM16, TIM17 and HDMI-CEC: </span><span style="font-size: 10pt; font-family: Verdana;">GPIO_Remap_TIM1_DMA, </span><span style="font-size: 10pt; font-family: Verdana;">GPIO_Remap_TIM15, GPIO_Remap_TIM16, GPIO_Remap_TIM17, GPIO_Remap_CEC.</span></li>
- <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">USART
-driver: add support for Oversampling by 8 mode and onebit method. 2
-functions has been added: USART_OverSampling8Cmd() and
-USART_OneBitMethodCmd().<br>
- </span></li>
- <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">DAC
-driver: add new functions handling the DAC under run feature:
-DAC_ITConfig(), DAC_GetFlagStatus(), DAC_ClearFlag(), DAC_GetITStatus()
-and DAC_ClearITPendingBit().</span></li>
- <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">DBGMCU driver: add new parameters for TIM15, TIM16 and TIM17: DBGMCU_TIM15_STOP, DBGMCU_TIM16_STOP, DBGMCU_TIM17_STOP.<br>
- </span></li>
- <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">FLASH
-driver: the FLASH_EraseOptionBytes() function updated. This is now just
-erasing the option bytes without modifying the RDP status either
-enabled or disabled.</span></li>
- <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">PWR
-driver: the PWR_EnterSTOPMode() function updated. When woken up from
-STOP mode, this function resets again the SLEEPDEEP bit in the
-Cortex-M3 System Control register to allow Sleep mode entering.</span></li>
-
-
-</ul>
-<h2 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;"><a name="License"></a><span style="font-size: 12pt; color: white;">License<o:p></o:p></span></h2>
-<p class="MsoNormal" style="margin: 4.5pt 0cm;"><span style="font-size: 10pt; font-family: Verdana; color: black;">The
-enclosed firmware and all the related documentation are not covered by
-a License Agreement, if you need such License you can contact your
-local STMicroelectronics office.<u1:p></u1:p><o:p></o:p></span></p>
-<p class="MsoNormal"><b style=""><span style="font-size: 10pt; font-family: Verdana; color: black;">THE
-PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO
-SAVE TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR
-ANY DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY
-CLAIMS ARISING FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY
-CUSTOMERS OF THE CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH
-THEIR PRODUCTS. <o:p></o:p></span></b></p>
-<p class="MsoNormal"><span style="color: black;"><o:p> </o:p></span></p>
-<div class="MsoNormal" style="text-align: center;" align="center"><span style="color: black;">
-<hr align="center" size="2" width="100%"></span></div>
-<p class="MsoNormal" style="margin: 4.5pt 0cm 4.5pt 18pt; text-align: center;" align="center"><span style="font-size: 10pt; font-family: Verdana; color: black;">For
-complete documentation on </span><span style="font-size: 10pt; font-family: Verdana;">STM32(<span style="color: black;">CORTEX M3) 32-Bit Microcontrollers
-visit </span><u><span style="color: blue;"><a href="http://www.st.com/stm32" target="_blank">www.st.com/STM32</a></span></u></span><span style="color: black;"><o:p></o:p></span></p>
-</td>
-</tr>
-</tbody>
-</table>
-<p class="MsoNormal"><span style="font-size: 10pt;"><o:p></o:p></span></p>
-</td>
-</tr>
-</tbody>
-</table>
-</div>
-<p class="MsoNormal"><o:p> </o:p></p>
-</div>
-</body></html>
\ No newline at end of file diff --git a/workspace/ts100/inc/Oled.h b/workspace/ts100/inc/Oled.h index 664e933b..4bee73aa 100644 --- a/workspace/ts100/inc/Oled.h +++ b/workspace/ts100/inc/Oled.h @@ -2,7 +2,7 @@ * Oled.h
* Functions for writing to the OLED screen
* Basically wraps drawing text and numbers to the OLED
- * Uses font.h -> 14 pixel wide fixed width
+ * Uses font.h -> 12 pixel wide fixed width
*/
#ifndef _OLED_SSD1306_H
#define _OLED_SSD1306_H
diff --git a/workspace/ts100/inc/Settings.h b/workspace/ts100/inc/Settings.h index 3c16125b..e85301e5 100644 --- a/workspace/ts100/inc/Settings.h +++ b/workspace/ts100/inc/Settings.h @@ -46,4 +46,5 @@ void saveSettings(); void restoreSettings(); uint8_t lookupVoltageLevel(uint8_t level); void resetSettings(); +void showBootLogoIfavailable(); #endif /* SETTINGS_H_ */ diff --git a/workspace/ts100/src/Main.c b/workspace/ts100/src/Main.c index 87ac5567..c5563b8f 100644 --- a/workspace/ts100/src/Main.c +++ b/workspace/ts100/src/Main.c @@ -9,6 +9,7 @@ #include "Oled.h"
#include "Settings.h"
#include "I2C.h"
+
void setup();
int main(void) {
@@ -18,28 +19,29 @@ int main(void) { ProcessUI();
DrawUI();
delayMs(50); //Slow the system down a little bit
- if(GPIO_ReadInputDataBit(GPIOB,GPIO_Pin_5)==Bit_RESET)
- {
+ if (GPIO_ReadInputDataBit(GPIOB, GPIO_Pin_5) == Bit_RESET) {
lastMovement = millis();
+ //This is a workaround for the line staying low as the user is still moving. (ie sensitivity is too high for their amount of movement)
}
}
}
void setup() {
RCC_Config(); //setup system clock
- NVIC_Config(0x4000); //this shifts the NVIC table to be offset, for the usb bootloader's size
- GPIO_Config(); //setup all the GPIO pins
+ NVIC_Config(0x4000); //this shifts the NVIC table to be offset, for the usb bootloader's size
+ GPIO_Config(); //setup all the GPIO pins
Init_EXTI(); //Init the EXTI inputs
- Init_Timer3(); //Used for the soldering iron tip
+ Init_Timer3(); //Used for the soldering iron tip
Adc_Init(); //Init adc and DMA
I2C_Configuration(); //Start the I2C hardware
- GPIO_Init_OLED(); //Init the GPIO ports for the OLED
+ GPIO_Init_OLED(); //Init the GPIO ports for the OLED
restoreSettings(); //Load settings
- StartUp_Accelerometer(systemSettings.sensitivity); //Start the accelerometer
+ StartUp_Accelerometer(systemSettings.sensitivity); //Start the accelerometer
setupPID(); //Init the PID values
- readIronTemp(systemSettings.tempCalibration, 0,0); //load the default calibration value
+ readIronTemp(systemSettings.tempCalibration, 0, 0); //load the default calibration value
Init_Oled(systemSettings.flipDisplay); //Init the OLED display
- OLED_DrawString("VER 1.14", 8); //Version Number
- delayMs(500); //Pause to show version number
- Start_Watchdog(1000); //start the system watch dog as 1 second timeout
+ OLED_DrawString("VER 1.15", 8); //Version Number
+ delayMs(300); //Pause to show version number
+ showBootLogoIfavailable();
+ Start_Watchdog(1000); //start the system watch dog as 1 second timeout
}
diff --git a/workspace/ts100/src/Settings.c b/workspace/ts100/src/Settings.c index d08bf121..473704ef 100644 --- a/workspace/ts100/src/Settings.c +++ b/workspace/ts100/src/Settings.c @@ -8,7 +8,8 @@ */ #include "Settings.h" -#define FLASH_ADDR (0x8000000|48896)/*Flash start OR'ed with the maximum amount of flash - 256 bytes*/ +#define FLASH_ADDR (0x8000000|0xBC00)/*Flash start OR'ed with the maximum amount of flash - 1024 bytes*/ +#define FLASH_LOGOADDR (0x8000000|0xB800) /*second last page of flash set aside for logo image*/ void saveSettings() { //First we erase the flash FLASH_Unlock(); //unlock flash writing @@ -71,3 +72,42 @@ void resetSettings() { systemSettings.BoostTemp = 4000; //default to 400C } +void showBootLogoIfavailable() { + //check if the header is there (0xAA,0x55,0xF0,0x0D) + //If so display logo + uint16_t temp[98]; + + for (uint8_t i = 0; i < (98); i++) { + temp[i] = *(uint16_t *) (FLASH_LOGOADDR + (i * 2)); + } + uint8_t temp8[98 * 2]; + for (uint8_t i = 0; i < 98; i++) { + temp8[i * 2] = temp[i] >> 8; + temp8[i * 2 + 1] = temp[i] & 0xFF; + + } + /*char hex[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', + 'C', 'D', 'E', 'F' }; + + OLED_DrawChar(hex[(temp8[0] >> 4) & 0x0F], 0); + OLED_DrawChar(hex[(temp8[0] >> 0) & 0x0F], 1); + OLED_DrawChar(hex[(temp8[1] >> 4) & 0x0F], 2); + OLED_DrawChar(hex[(temp8[1] >> 0) & 0x0F], 3); + OLED_DrawChar(hex[(temp8[2] >> 4) & 0x0F], 4); + OLED_DrawChar(hex[(temp8[2] >> 0) & 0x0F], 5); + OLED_DrawChar(hex[(temp8[3] >> 4) & 0x0F], 6); + OLED_DrawChar(hex[(temp8[3] >> 0) & 0x0F], 7);*/ + if (temp8[0] != 0xAA) + return; + if (temp8[1] != 0x55) + return; + if (temp8[2] != 0xF0) + return; + if (temp8[3] != 0x0D) + return; + + + Oled_DrawArea(0, 0, 96, 16, (uint8_t*) (temp8 + 4)); + + delayMs(1000); +} |
