Merge branch 'master' into UpdatingDocs

Bootup Logo/python_logo_converter/img2ts100.py

@@ -8,7 +8,7 @@ import sys
 try:
     from PIL import Image, ImageOps
 except ImportError as error:
-    raise ImportError("{}: {} requres Python Imaging Library (PIL). " 
+    raise ImportError("{}: {} requres Python Imaging Library (PIL). "
                       "Install with `pip` or OS-specific package "
                       "management tool."
                       .format(error, sys.argv[0]))
@@ -32,29 +32,32 @@ def split16(word):
     return (word >> 8) & 0xff, word & 0xff
 
 
-def intel_hex_line(file, record_type, offset, data):
+def intel_hex_line(record_type, offset, data):
-    """write a line of data in Intel hex format"""
+    """generate a line of data in Intel hex format"""
     # length, address offset, record type
     record_length = len(data)
-    file.write(':{:02X}{:04X}{:02X}'.format(record_length, offset, record_type))
+    yield ':{:02X}{:04X}{:02X}'.format(record_length, offset, record_type)
 
     # data
-    map(lambda byte: file.write("{:02X}".format(byte)), data)
+    for byte in data:
+        yield "{:02X}".format(byte)
 
     # compute and write checksum (with DOS line ending for compatibility/safety)
-    file.write("{:02X}\r\n"
+    yield "{:02X}\r\n".format((((sum(data,                   # sum data ...
-               .format((((sum(data,                   # sum data ...
+                                     record_length           # ... and other ...
-                              record_length           # ... and other ...
+                                     + sum(split16(offset))  # ... fields ...
-                              + sum(split16(offset))  # ... fields ...
+                                     + record_type)          # ... on line
-                              + record_type)          # ... on line
+                                 & 0xff)                     # low 8 bits
-                          & 0xff)                     # low 8 bits
+                                ^ 0xff)                      # two's ...
-                         ^ 0xff)                      # two's ...
+                               + 1)                          # ... complement
-                        + 1)                          # ... complement
+                              & 0xff)                        # low 8 bits
-                       & 0xff))                       # low 8 bits
 
 
 def intel_hex(file, bytes_, start_address=0x0):
     """write block of data in Intel hex format"""
+    def write(generator):
+        file.write(''.join(generator))
+
     if len(bytes_) % INTELHEX_BYTES_PER_LINE != 0:
         raise ValueError("Program error: Size of LCD data is not evenly divisible by {}"
                          .format(INTELHEX_BYTES_PER_LINE))
@@ -62,25 +65,21 @@ def intel_hex(file, bytes_, start_address=0x0):
     address_lo =  start_address        & 0xffff
     address_hi = (start_address >> 16) & 0xffff
 
-    intel_hex_line(file,
+    write(intel_hex_line(INTELHEX_EXTENDED_LINEAR_ADDRESS_RECORD, 0,
-                   INTELHEX_EXTENDED_LINEAR_ADDRESS_RECORD,
+                               split16(address_hi)))
-                   0,
-                   split16(address_hi))
 
     size_written = 0
     while size_written < INTELHEX_MINIMUM_SIZE:
         offset = address_lo
         for line_start in range(0, len(bytes_), INTELHEX_BYTES_PER_LINE):
-            intel_hex_line(file,
+            write(intel_hex_line(INTELHEX_DATA_RECORD, offset,
-                           INTELHEX_DATA_RECORD,
+                                 bytes_[line_start:line_start + INTELHEX_BYTES_PER_LINE]))
-                           offset,
-                           bytes_[line_start:line_start + INTELHEX_BYTES_PER_LINE])
             size_written += INTELHEX_BYTES_PER_LINE
             if size_written >= INTELHEX_MINIMUM_SIZE:
                 break
             offset += INTELHEX_BYTES_PER_LINE
 
-    intel_hex_line(file, INTELHEX_END_OF_FILE_RECORD, 0, ())
+    write(intel_hex_line(INTELHEX_END_OF_FILE_RECORD, 0, ()))
 
 
 def img2hex(input_filename,

README.md

@@ -38,7 +38,7 @@ This project is considered feature complete for use as a soldering iron, *so ple
 
 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) The file you want is called *(MODEL)_EN.hex* unless you want the translations, they are (MODEL)_*language short name*.hex. Where (MODEL) is either TS100 or TS80.
 
-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).
+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.
@@ -51,6 +51,7 @@ Officially the bootloader on the iron only works under windows. However, users h
 8. Disconnect the USB and power up the iron. You're good to go.
 ```
 
+
 For the more adventurous out there, you can also load this firmware onto the device using a SWD programmer.
 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).
@@ -77,6 +78,7 @@ More details are over in the [Menu information.](menu.md)
 
 ## Thanks
 
+
 If you love this firmware and want to continue my caffeine addiction, you can do so here (or email me for other options) : https://paypal.me/RalimTek
 I also want to should out to all of the [Fantastic Contributors](https://github.com/Ralim/ts100/graphs/contributors).
 

Translation Editor/TranslationEditor.html

@@ -48,6 +48,9 @@
 			} else if (id == "current-lang-file") {
 				if (checkTranslationFile(file.name)) {
 					app.current = json;
+					if (!app.current.cyrillicGlyphs){
+						app.current.cyrillicGlyphs = false;
+					}
 					app.meta.currentLoaded = true;
 				}
 			} 		
@@ -238,6 +241,15 @@
 					<td class="label">Local Language Name</td>
 					<td class="value"><input type="text" v-model="current.languageLocalName" class="short"></td>
 				</tr>
+				<tr v-if="meta.currentLoaded">
+					<td class="label">Font table to use</td>
+					<td class="value">
+						<select v-model="current.cyrillicGlyphs" v-on:change="current.cyrillicGlyphs = current.cyrillicGlyphs=='true'">
+							<option value="false">Latin Extended</option>
+							<option value="true">Cyrillic Glyphs</option>
+						</select>
+					</td>
+				</tr>
 			</table>
 			
 			<div v-if="def.messages && referent.messages && current.messages">

Translation Editor/TranslationsParser.html

@@ -84,6 +84,7 @@
 				if (!isDefined(lang)) {
 					lang = {
 						languageCode: langCode,
+						cyrillicGlyphs: false,
 						messages: {},
 						characters: {},
 						menuDouble : false,
@@ -97,6 +98,13 @@
 				continue;
 			}
 
+			// Use Cyrillic glyphs
+			if (startsWith(line, "#define CYRILLIC_GLYPHS")) {
+				lang.cyrillicGlyphs = true;
+				entryIndex = 0;
+				continue;
+			}
+
 			// Menu type
 			reMenuMode.lastIndex = 0;
 			match = reMenuMode.exec(line);

Translation Editor/make_translation.py

@@ -51,7 +51,7 @@ def readTranslations(jsonDir):
                 langCodeFromJson = lang['languageCode']
             except KeyError:
                 langCodeFromJson = "(missing)"
-                
+
             # ...cause they should be the same!
             if langCode != langCodeFromJson:
                 raise ValueError("Invalid languageCode " + langCodeFromJson + " in file " + fileName)
@@ -87,6 +87,14 @@ def writeLanguage(languageCode, defs, f):
          
     f.write(to_unicode("// ---- " + langName + " ----\n\n"))
 
+    try:
+        cyrillic = lang['cyrillicGlyphs']
+    except KeyError:
+        cyrillic = False
+
+    if cyrillic :
+        f.write(to_unicode("#define CYRILLIC_GLYPHS\n\n"))
+        
     # ----- Writing SettingsDescriptions
     obj = lang['menuOptions']
     f.write(to_unicode("const char* SettingsDescriptions[] = {\n"))

Translation Editor/translation_bg.json

@@ -1,5 +1,7 @@
 {
 	"languageCode": "BG",
+	"languageLocalName": "Български",
+	"cyrillicGlyphs": true,
 	"messages": {
 		"SettingsCalibrationDone": "Calibration done!",
 		"SettingsCalibrationWarning": "Уверете се, че човката на поялника е със стайна температура преди да продължите!",
@@ -218,7 +220,14 @@
 				"Calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
+		},
+		"PowerInput": {
+			"text": "PWRW",
+			"text2": [
+				"Power",
+				"Wattage"
+			],
+			"desc": "Power Wattage of the power adapter used"
 		}
-	},
+	}
-	"languageLocalName": "български"
 }

Translation Editor/translation_cs.json

@@ -1,5 +1,7 @@
 {
-	"languageCode": "CS_CZ",
+	"languageCode": "CS",
+	"languageLocalName": "Český",
+	"cyrillicGlyphs": false,
 	"messages": {
 		"SettingsCalibrationDone": "Calibration done!",
 		"SettingsCalibrationWarning": "Ujistěte se, že hrot má pokojovou teplotu!",
@@ -218,7 +220,14 @@
 				"Calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
+		},
+		"PowerInput": {
+			"text": "PWRW",
+			"text2": [
+				"Power",
+				"Wattage"
+			],
+			"desc": "Power Wattage of the power adapter used"
 		}
-	},
+	}
-	"languageLocalName": "Český"
 }

Translation Editor/translation_da.json

@@ -1,5 +1,7 @@
 {
-	"languageCode": "DK",
+	"languageCode": "DA",
+	"languageLocalName": "Dansk",
+	"cyrillicGlyphs": false,
 	"messages": {
 		"SettingsCalibrationDone": "Calibration done!",
 		"SettingsCalibrationWarning": "Sørg for at loddespidsen er ved stuetemperatur, inden du fortsætter!",
@@ -218,7 +220,14 @@
 				"Calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
+		},
+		"PowerInput": {
+			"text": "PWRW",
+			"text2": [
+				"Power",
+				"Wattage"
+			],
+			"desc": "Power Wattage of the power adapter used"
 		}
-	},
+	}
-	"languageLocalName": "Dansk"
 }

Translation Editor/translation_de.json

@@ -1,9 +1,11 @@
 {
 	"languageCode": "DE",
+	"languageLocalName": "Deutsch",
+	"cyrillicGlyphs": false,
 	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
+		"SettingsCalibrationDone": "Kalibrierung abgeschlossen!",
 		"SettingsCalibrationWarning": "Vor dem Fortfahren muss die Lötspitze vollständig abgekühlt sein!",
-		"SettingsResetWarning": "Sind Sie sicher, dass Sie alle Werte Zurücksetzen wollen?",
+		"SettingsResetWarning": "Sind Sie sicher, dass Sie alle Werte zurücksetzen wollen?",
 		"UVLOWarningString": "V niedr.",
 		"UndervoltageString": "Unterspannung",
 		"InputVoltageString": "V Eingang: ",
@@ -18,7 +20,7 @@
 		"IdleSetString": " Soll:",
 		"TipDisconnectedString": "Spitze fehlt",
 		"SolderingAdvancedPowerPrompt": "Leistung: ",
-		"OffString": "Off"
+		"OffString": "Aus"
 	},
 	"characters": {
 		"SettingRightChar": "R",
@@ -198,27 +200,34 @@
 		"TipModel": {
 			"text": "TIPMO",
 			"text2": [
-				"Tip",
+				"Löt-",
-				"Model"
+				"spitze"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Auswahl der Lötspitze"
 		},
 		"SimpleCalibrationMode": {
 			"text": "SMPCAL",
 			"text2": [
-				"Simple",
+				"Einfache",
-				"Calibration"
+				"Kalibrierung"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Einfache Kalibrierung mittels heißem Wasser"
 		},
 		"AdvancedCalibrationMode": {
 			"text": "ADVCAL",
 			"text2": [
-				"Advanced",
+				"Erweiterte",
-				"Calibration"
+				"Kalibrierung"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Erweiterte Kalibrierung mittels eines Thermoelements an der Lötspitze"
+		},
+		"PowerInput": {
+			"text": "PWRW",
+			"text2": [
+				"Leistungs-",
+				"aufnahme"
+			],
+			"desc": "Leistungsaufnahme der verwendeten Spannungsversorgung"
 		}
-	},
+	}
-	"languageLocalName": "Deutsch"
 }

Translation Editor/translation_en.json

@@ -1,6 +1,7 @@
 {
 	"languageCode": "EN",
 	"languageLocalName": "English",
+	"cyrillicGlyphs": false,
 	"messages": {
 		"SettingsCalibrationDone": "Calibration done!",
 		"SettingsCalibrationWarning": "Please ensure the tip is at room temperature before continuing!",
@@ -28,6 +29,7 @@
 		"SettingFastChar": "F",
 		"SettingSlowChar": "S"
 	},
+	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -58,7 +60,6 @@
 			"desc": "Advanced options"
 		}
 	},
-	"menuDouble": true,
 	"menuOptions": {
 		"PowerSource": {
 			"text": "PWRSC",
@@ -219,7 +220,7 @@
 				"Calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
-		}
+		},
 		"PowerInput": {
 			"text": "PWRW",
 			"text2": [
@@ -227,6 +228,6 @@
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
-		},
+		}
 	}
 }

Translation Editor/translation_es.json

@@ -1,5 +1,7 @@
 {
 	"languageCode": "ES",
+	"languageLocalName": "Español",
+	"cyrillicGlyphs": false,
 	"messages": {
 		"SettingsCalibrationDone": "Calibration done!",
 		"SettingsCalibrationWarning": "¡Asegúrese que la punta esté a temperatura ambiente antes de proceder!",
@@ -218,7 +220,14 @@
 				"Calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
+		},
+		"PowerInput": {
+			"text": "PWRW",
+			"text2": [
+				"Power",
+				"Wattage"
+			],
+			"desc": "Power Wattage of the power adapter used"
 		}
-	},
+	}
-	"languageLocalName": "Español"
 }

Translation Editor/translation_fi.json

@@ -1,6 +1,7 @@
 {
 	"languageCode": "FI",
 	"languageLocalName": "Suomi",
+	"cyrillicGlyphs": false,
 	"messages": {
 		"SettingsCalibrationDone": "Calibration done!",
 		"SettingsCalibrationWarning": "Varmista että kärki on huoneenlämpöinen ennen jatkamista!",
@@ -28,6 +29,7 @@
 		"SettingFastChar": "N",
 		"SettingSlowChar": "H"
 	},
+	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -58,7 +60,6 @@
 			"desc": "Lisäasetukset"
 		}
 	},
-	"menuDouble": true,
 	"menuOptions": {
 		"PowerSource": {
 			"text": "",
@@ -219,6 +220,14 @@
 				"Calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
+		},
+		"PowerInput": {
+			"text": "PWRW",
+			"text2": [
+				"Power",
+				"Wattage"
+			],
+			"desc": "Power Wattage of the power adapter used"
 		}
 	}
 }

Translation Editor/translation_fr.json

@@ -1,22 +1,24 @@
 {
 	"languageCode": "FR",
+	"languageLocalName": "Français",
+	"cyrillicGlyphs": false,
 	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
+		"SettingsCalibrationDone": "Calibration effectuée!",
 		"SettingsCalibrationWarning": "Assurez-vous que la panne soit à température ambiante avant de continuer!",
 		"SettingsResetWarning": "Voulez-vous vraiment réinitialiser les paramètres aux valeurs d'usine?",
-		"UVLOWarningString": "DC FAIBLE",
+		"UVLOWarningString": "DC FAIBL",
 		"UndervoltageString": "Sous-tension",
-		"InputVoltageString": "V d'entrée: ",
+		"InputVoltageString": "V d'entrée:",
-		"WarningTipTempString": "Temp. Panne: ",
+		"WarningTipTempString": "Temp. Panne:",
 		"BadTipString": "PANNE HS",
 		"SleepingSimpleString": "Zzzz",
 		"SleepingAdvancedString": "En veille...",
 		"WarningSimpleString": "HOT!",
 		"WarningAdvancedString": "ATTENTION! CHAUD",
-		"SleepingTipAdvancedString": "PANNE:",
+		"SleepingTipAdvancedString": "Panne:",
-		"IdleTipString": "PANNE:",
+		"IdleTipString": "Tip:",
 		"IdleSetString": " Set:",
-		"TipDisconnectedString": "PANNE DEBRANCH",
+		"TipDisconnectedString": "PANNE DÉBRANCHÉE",
 		"SolderingAdvancedPowerPrompt": "Puissance: ",
 		"OffString": "Off"
 	},
@@ -24,36 +26,36 @@
 		"SettingRightChar": "D",
 		"SettingLeftChar": "G",
 		"SettingAutoChar": "A",
-		"SettingFastChar": "F",
+		"SettingFastChar": "R",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "L"
 	},
 	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
-				"Soudure",
+				"Paramètres",
-				"Paramètres"
+				"de soudure"
 			],
-			"desc": "Paramètres de soudage"
+			"desc": "Paramètres de soudure"
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Mode",
-				"Veille"
+				"veille"
 			],
 			"desc": "Paramètres d'économie d'énergie"
 		},
 		"UIMenu": {
 			"text2": [
 				"Interface",
-				"Utilisateur"
+				"utilisateur"
 			],
 			"desc": "Paramètres de l'interface utilisateur"
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Options",
-				"Advanced"
+				"avancées"
 			],
 			"desc": "Options avancées"
 		}
@@ -110,7 +112,7 @@
 		"AdvancedIdle": {
 			"text": "",
 			"text2": [
-				"Ecran veille",
+				"Écran veille",
 				"détaillé"
 			],
 			"desc": "Afficher des informations détaillées lors de la veille."
@@ -151,17 +153,17 @@
 			"text": "",
 			"text2": [
 				"Refroidir en",
-				"clignottant"
+				"clignotant"
 			],
 			"desc": "Faire clignoter la température lors du refroidissement tant que la panne est chaude."
 		},
 		"TemperatureCalibration": {
 			"text": "",
 			"text2": [
-				"Etalonner",
+				"Étalonner",
 				"température"
 			],
-			"desc": "Etalonner température de la panne."
+			"desc": "Étalonner température de la panne."
 		},
 		"SettingsReset": {
 			"text": "",
@@ -174,15 +176,15 @@
 		"VoltageCalibration": {
 			"text": "",
 			"text2": [
-				"Etalonner",
+				"Étalonner",
 				"tension d'entrée"
 			],
-			"desc": "Etalonner tension d'entrée. Boutons pour ajuster, appui long pour quitter"
+			"desc": "Étalonner tension d'entrée. Boutons pour ajuster, appui long pour quitter"
 		},
 		"AdvancedSoldering": {
 			"text": "",
 			"text2": [
-				"Ecran soudure",
+				"Écran soudure",
 				"détaillé"
 			],
 			"desc": "Afficher des informations détaillées pendant la soudure"
@@ -198,27 +200,34 @@
 		"TipModel": {
 			"text": "TIPMO",
 			"text2": [
-				"Tip",
+				"Panne",
-				"Model"
+				"Modèle"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Sélection du modèle de la panne"
 		},
 		"SimpleCalibrationMode": {
 			"text": "SMPCAL",
 			"text2": [
-				"Simple",
+				"Calibration",
-				"Calibration"
+				"simple"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Calibration simple à l'aide d'eau chaude"
 		},
 		"AdvancedCalibrationMode": {
 			"text": "ADVCAL",
 			"text2": [
-				"Advanced",
+				"Calibration",
-				"Calibration"
+				"avancées"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Calibration avancées à l'aide d'un thermocouple sur la panne"
+		},
+		"PowerInput": {
+			"text": "PWRW",
+			"text2": [
+				"Puissance de",
+				"l'alimentation"
+			],
+			"desc": "Puissance de l'alimentation utilisée"
 		}
-	},
+	}
-	"languageLocalName": "Français"
+}
-}

Translation Editor/translation_hr.json

@@ -1,8 +1,10 @@
 {
 	"languageCode": "HR",
 	"languageLocalName": "Hrvatski",
+	"cyrillicGlyphs": false,
 	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
+		"SettingsCalibrationDone": "Kalibracija gotova!",
+		"SettingsCalibrationWarning": "Provjerite da je vršak ohlađen na sobnu temperaturu prije nego što nastavite!",
 		"SettingsResetWarning": "Jeste li sigurni da želite sve postavke vratiti na tvorničke vrijednosti?",
 		"UVLOWarningString": "BATERIJA",
 		"UndervoltageString": "PRENIZAK NAPON",
@@ -18,7 +20,6 @@
 		"IdleSetString": " / ",
 		"TipDisconnectedString": "VRH NIJE SPOJEN!",
 		"SolderingAdvancedPowerPrompt": "Snaga: ",
-		"SettingsCalibrationWarning": "Provjerite da je vršak ohlađen na sobnu temperaturu prije nego što nastavite!",
 		"OffString": "Off"
 	},
 	"characters": {
@@ -28,6 +29,7 @@
 		"SettingFastChar": "B",
 		"SettingSlowChar": "S"
 	},
+	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -58,7 +60,6 @@
 			"desc": "Upravljanje naprednim opcijama"
 		}
 	},
-	"menuDouble": true,
 	"menuOptions": {
 		"PowerSource": {
 			"text": "PWRSC",
@@ -199,26 +200,34 @@
 		"TipModel": {
 			"text": "TIPMO",
 			"text2": [
-				"Tip",
+				"Model",
-				"Model"
+				"Vrha"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Odabir modela lemnog vrha"
 		},
 		"SimpleCalibrationMode": {
 			"text": "SMPCAL",
 			"text2": [
-				"Simple",
+				"Jednostavna",
-				"Calibration"
+				"kalibracija"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Kalibracija kipućom vodom"
 		},
 		"AdvancedCalibrationMode": {
 			"text": "ADVCAL",
 			"text2": [
-				"Advanced",
+				"Napredna",
-				"Calibration"
+				"kalibracija"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Kalibracija korištenjem termo-elementa"
+		},
+		"PowerInput": {
+			"text": "PWRW",
+			"text2": [
+				"Snaga",
+				"napajanja"
+			],
+			"desc": "Snaga modula za napajanje"
 		}
 	}
-}
+}

Translation Editor/translation_hu.json

@@ -1,45 +1,47 @@
 {
 	"languageCode": "HU",
+	"languageLocalName": "Magyar",
+	"cyrillicGlyphs": false,
 	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
+		"SettingsCalibrationDone": "Kalibráció befejezve!",
-		"SettingsCalibrationWarning": "Folytatás előtt győződj meg róla, hogy a hegy szobahőmérsékletű!",
+		"SettingsCalibrationWarning": "Folytatás előtt győződjön meg róla, hogy a hegy szobahőmérsékletű!",
 		"SettingsResetWarning": "Biztosan visszaállítja a beállításokat az alapértelmezett értékekre?",
-		"UVLOWarningString": "DC LOW",
+		"UVLOWarningString": "DC KEVÉS",
-		"UndervoltageString": "Undervoltage",
+		"UndervoltageString": "Alulfeszültség",
-		"InputVoltageString": "Input V: ",
+		"InputVoltageString": "Bemenet V: ",
-		"WarningTipTempString": "Tip Temp: ",
+		"WarningTipTempString": "Hegy hő: ",
-		"BadTipString": "HEGY",
+		"BadTipString": "HEGY HIB",
 		"SleepingSimpleString": "Zzzz",
 		"SleepingAdvancedString": "Alvás...",
-		"WarningSimpleString": "HOT!",
+		"WarningSimpleString": "FORR",
 		"WarningAdvancedString": "!! FORRÓ HEGY !!",
-		"SleepingTipAdvancedString": "Tip:",
+		"SleepingTipAdvancedString": "Hegy:",
-		"IdleTipString": "Tip:",
+		"IdleTipString": "Hegy:",
-		"IdleSetString": " Set:",
+		"IdleSetString": " Cél:",
-		"TipDisconnectedString": "TIP DISCONNECTED",
+		"TipDisconnectedString": "HEGY LEVÉVE",
-		"SolderingAdvancedPowerPrompt": "Power: ",
+		"SolderingAdvancedPowerPrompt": "Telj: ",
-		"OffString": "Off"
+		"OffString": "Ki"
 	},
 	"characters": {
-		"SettingRightChar": "R",
+		"SettingRightChar": "J",
-		"SettingLeftChar": "L",
+		"SettingLeftChar": "B",
 		"SettingAutoChar": "A",
-		"SettingFastChar": "F",
+		"SettingFastChar": "G",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "L"
 	},
 	"menuDouble": false,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
-				"Forrasztás",
+				"Forrasztási",
-				"Beállítások"
+				"beállítások"
 			],
 			"desc": "Forrasztási beállítások"
 		},
 		"PowerSavingMenu": {
 			"text2": [
-				"Alvás",
+				"Alvási",
-				"Módok"
+				"módok"
 			],
 			"desc": "Energiatakarékossági beállítások"
 		},
@@ -52,173 +54,180 @@
 		},
 		"AdvancedMenu": {
 			"text2": [
-				"Speciális",
+				"Haladó",
 				"beállítások"
 			],
-			"desc": "Speciális beállítások"
+			"desc": "Haladó beállítások"
 		}
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "PWRSC",
+			"text": "ÁRAMF",
 			"text2": [
-				"",
+				"Áram",
-				""
+				"forrás"
 			],
 			"desc": "Áramforrás. Beállítja a lekapcsolási feszültséget. <DC 10V> <S 3.3V cellánként>"
 		},
 		"SleepTemperature": {
-			"text": "STMP",
+			"text": "AHŐM",
 			"text2": [
-				"",
+				"Alvási",
-				""
+				"hőfok"
 			],
 			"desc": "Alvási hőmérséklet <C>"
 		},
 		"SleepTimeout": {
-			"text": "STME",
+			"text": "AIDŐ",
 			"text2": [
-				"",
+				"Alvás",
-				""
+				"időzítő"
 			],
-			"desc": "Elalvási időzítő <Perc/Másodperc>"
+			"desc": "Alvás időzítő <perc/másodperc>"
 		},
 		"ShutdownTimeout": {
-			"text": "SHTME",
+			"text": "KIIDŐ",
 			"text2": [
-				"",
+				"Kikapcsolás",
-				""
+				"időzítő"
 			],
-			"desc": "Kikapcsolási időzítő <Minutes>"
+			"desc": "Kikapcsolási időzítő <perc>"
 		},
 		"MotionSensitivity": {
-			"text": "MSENSE",
+			"text": "MOZGÉR",
 			"text2": [
-				"",
+				"Mozgás",
-				""
+				"érzékenység"
 			],
-			"desc": "Mozgás érzékenység beállítása. <0.Ki 1.kevésbé érzékeny 9.legérzékenyebb>"
+			"desc": "Mozgás érzékenység beállítása. <0.kikapcsolva 1.legkevésbé érzékeny 9.legérzékenyebb>"
 		},
 		"TemperatureUnit": {
-			"text": "TMPUNT",
+			"text": "HŐEGYS",
 			"text2": [
-				"",
+				"Hőmérséklet",
-				""
+				"mértékegysége"
 			],
-			"desc": "Hőmérsékleti egység <C=Celsius F=Fahrenheit>"
+			"desc": "Hőmérséklet mértékegysége <C=Celsius F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "ADVIDL",
+			"text": "RÉSZLI",
 			"text2": [
-				"",
+				"Részletes",
-				""
+				"készenlét"
 			],
 			"desc": "Részletes információ megjelenítése kisebb betűméretben a készenléti képernyőn."
 		},
 		"DisplayRotation": {
-			"text": "DSPROT",
+			"text": "KIJTÁJ",
 			"text2": [
-				"",
+				"Kijelző",
-				""
+				"tájolása"
 			],
-			"desc": "Megjelenítési tájolás <A. Automatikus L. Balkezes R. Jobbkezes>"
+			"desc": "Kijelző tájolása <A. automatikus B. balkezes J. jobbkezes>"
 		},
 		"BoostEnabled": {
 			"text": "BOOST",
 			"text2": [
-				"",
+				"Boost",
-				""
+				"mód"
 			],
-			"desc": "Elülső gombbal lépjen boost módba, 450C forrasztás közben"
+			"desc": "Elülső gombbal boost módba (450C) lép forrasztás közben"
 		},
 		"BoostTemperature": {
-			"text": "BTMP",
+			"text": "BHŐ",
 			"text2": [
-				"",
+				"Boost",
-				""
+				"hőfok"
 			],
 			"desc": "Hőmérséklet \"boost\" módban"
 		},
 		"AutoStart": {
 			"text": "ASTART",
 			"text2": [
-				"",
+				"Automatikus",
-				""
+				"indítás"
 			],
-			"desc": "Bekapcsolás után automatikusan lépjen forrasztás módba. T=Forrasztás, S=Alvó mód,F=Ki"
+			"desc": "Bekapcsolás után automatikusan lépjen forrasztás módba. T=forrasztás, S=alvó mód, F=ki"
 		},
 		"CooldownBlink": {
-			"text": "CLBLNK",
+			"text": "HŰLÉSV",
 			"text2": [
-				"",
+				"Villogás",
-				""
+				"hűléskor"
 			],
 			"desc": "Villogjon a hőmérséklet hűlés közben, amíg a hegy forró."
 		},
 		"TemperatureCalibration": {
-			"text": "TMP CAL?",
+			"text": "HŐM KAL?",
 			"text2": [
-				"",
+				"Hőmérséklet",
-				""
+				"kalibrálása?"
 			],
-			"desc": "Hegy hőmérsékletének kalibrálása"
+			"desc": "Hegy hőmérséklet-különbségének kalibrálása."
 		},
 		"SettingsReset": {
 			"text": "RESET?",
 			"text2": [
-				"",
+				"Gyári",
-				""
+				"beállítások?"
 			],
 			"desc": "Beállítások alaphelyzetbe állítása"
 		},
 		"VoltageCalibration": {
-			"text": "CAL VIN?",
+			"text": "VIN KAL?",
 			"text2": [
-				"",
+				"Bemeneti fesz",
-				""
+				"kalibrálása?"
 			],
-			"desc": "A bemeneti feszültség kalibrálása. Röviden megnyomva állítsa be, hosszan nyomja meg a kilépéshez."
+			"desc": "Bemeneti feszültség kalibrálása. Röviden megnyomva módosítás, hosszan megnyomva kilépés"
 		},
 		"AdvancedSoldering": {
-			"text": "ADVSLD",
+			"text": "HALKÉP",
 			"text2": [
-				"",
+				"Részletes",
-				""
+				"forr. kép."
 			],
 			"desc": "Részletes információk megjelenítése forrasztás közben"
 		},
 		"ScrollingSpeed": {
-			"text": "DESCSP",
+			"text": "GÖRGS",
 			"text2": [
-				"",
+				"Görgetés",
-				""
+				"sebessége"
 			],
-			"desc": "Szöveg görgetésének gyorsítása"
+			"desc": "Szöveggörgetés sebessége"
 		},
 		"TipModel": {
-			"text": "TIPMO",
+			"text": "HEGYMOD",
 			"text2": [
-				"Tip",
+				"Forrasztóhegy",
-				"Model"
+				"modell"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Forrasztóhegy modell kiválasztása"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
+			"text": "EGYSZKAL",
 			"text2": [
-				"Simple",
+				"Egyszerű",
-				"Calibration"
+				"kalibráció"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Egyszerű kalibrálás forró víz segítségével"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
+			"text": "HALKAL",
 			"text2": [
-				"Advanced",
+				"Haladó",
-				"Calibration"
+				"Kalibráció"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Haladó kalibrálás hegyre helyezett hőelem segítségével"
+		},
+		"PowerInput": {
+			"text": "TELJW",
+			"text2": [
+				"Bemeneti",
+				"teljesítmény"
+			],
+			"desc": "A tápegység által leadott teljesítmény"
 		}
-	},
+	}
-	"languageLocalName": "Magyar"
+}
-}

Translation Editor/translation_it.json

@@ -1,5 +1,7 @@
 {
 	"languageCode": "IT",
+	"languageLocalName": "Italiano",
+	"cyrillicGlyphs": false,
 	"messages": {
 		"SettingsCalibrationDone": "Calibrazione effettuata",
 		"SettingsCalibrationWarning": "Assicurati che la punta si trovi a temperatura ambiente prima di continuare!",
@@ -14,10 +16,10 @@
 		"WarningSimpleString": "HOT!",
 		"WarningAdvancedString": "PUNTA CALDA!",
 		"SleepingTipAdvancedString": "Punta:",
-		"IdleTipString": "Punta:",
+		"IdleTipString": "T punta:",
 		"IdleSetString": "/",
 		"TipDisconnectedString": "PUNTA ASSENTE",
-		"SolderingAdvancedPowerPrompt": "Potenza:",
+		"SolderingAdvancedPowerPrompt": "Potenz:",
 		"OffString": "OFF"
 	},
 	"characters": {
@@ -110,10 +112,10 @@
 		"AdvancedIdle": {
 			"text": "",
 			"text2": [
-				"Mostra",
+				"Interfaccia",
-				"dettagli"
+				"testuale"
 			],
-			"desc": "Mostra informazioni dettagliate con un carattere più piccolo all'interno della schermata principale"
+			"desc": "Mostra informazioni dettagliate all'interno della schermata principale"
 		},
 		"DisplayRotation": {
 			"text": "",
@@ -129,7 +131,7 @@
 				"Funzione",
 				"«Turbo»"
 			],
-			"desc": "Il tasto superiore attiva la funzione «Turbo» durante la modalità Saldatura"
+			"desc": "Attiva la funzione «Turbo», durante la modalità Saldatura, tenendo premuto il tasto superiore"
 		},
 		"BoostTemperature": {
 			"text": "",
@@ -199,7 +201,7 @@
 			"text": "TIPMO",
 			"text2": [
 				"Modello",
-				"della punta"
+				"punta"
 			],
 			"desc": "Seleziona il modello della punta in uso"
 		},
@@ -218,7 +220,14 @@
 				"avanzata"
 			],
 			"desc": "Calibra le rilevazioni di temperatura attraverso la termocoppia presente nella punta"
+		},
+		"PowerInput": {
+			"text": "PWRW",
+			"text2": [
+				"Potenza",
+				"alimentaz"
+			],
+			"desc": "Imposta la potenza massima erogabile dall'alimentatore in uso"
 		}
-	},
+	}
-	"languageLocalName": "Italiano"
 }

Translation Editor/translation_lt.json

@@ -1,6 +1,7 @@
 {
 	"languageCode": "LT",
 	"languageLocalName": "Lietuvių",
+	"cyrillicGlyphs": false,
 	"messages": {
 		"SettingsCalibrationDone": "Kalibracija atlikta!",
 		"SettingsCalibrationWarning": "Prieš tęsdami įsitikinkite, kad antgalis yra kambario temperatūros!",
@@ -219,6 +220,14 @@
 				"kalibracija"
 			],
 			"desc": "Išplėstinė kalibracija naudojant termoelementą"
+		},
+		"PowerInput": {
+			"text": "PWRW",
+			"text2": [
+				"Galia",
+				"vatais"
+			],
+			"desc": "Maitinimo bloko galia vatais"
 		}
 	}
 }

Translation Editor/translation_nl.json

@@ -1,6 +1,7 @@
 {
 	"languageCode": "NL",
 	"languageLocalName": "Nederlands",
+	"cyrillicGlyphs": false,
 	"messages": {
 		"SettingsCalibrationDone": "Calibration done!",
 		"SettingsCalibrationWarning": "Zorg ervoor dat de soldeerpunt op kamertemperatuur is voor je verdergaat!",
@@ -28,6 +29,7 @@
 		"SettingFastChar": "F",
 		"SettingSlowChar": "S"
 	},
+	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -58,7 +60,6 @@
 			"desc": "geavanceerde Instellingen"
 		}
 	},
-	"menuDouble": true,
 	"menuOptions": {
 		"PowerSource": {
 			"text": "",
@@ -219,6 +220,14 @@
 				"Calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
+		},
+		"PowerInput": {
+			"text": "PWRW",
+			"text2": [
+				"Power",
+				"Wattage"
+			],
+			"desc": "Power Wattage of the power adapter used"
 		}
 	}
 }

Translation Editor/translation_nl_be.json

@@ -0,0 +1,233 @@
+{
+	"languageCode": "NL_BE",
+	"languageLocalName": "Vlaams",
+	"cyrillicGlyphs": false,
+	"messages": {
+		"SettingsCalibrationDone": "Gecalibreerd!",
+		"SettingsCalibrationWarning": "Zorg vooraf dat de punt op kamertemperatuur is!",
+		"SettingsResetWarning": "Ben je zeker dat je alle standaardwaarden wil resetten?",
+		"UVLOWarningString": "Voedingsspanning LAAG",
+		"UndervoltageString": "Onderspanning",
+		"InputVoltageString": "Voedingsspanning: ",
+		"WarningTipTempString": "Punt Temp: ",
+		"BadTipString": "DEFECT",
+		"SleepingSimpleString": "Zzz ",
+		"SleepingAdvancedString": "Slaapstand...",
+		"WarningSimpleString": "HEET",
+		"WarningAdvancedString": "!!! PUNT HEET !!!",
+		"SleepingTipAdvancedString": "Punt:",
+		"IdleTipString": "Punt:",
+		"IdleSetString": "Stel in:",
+		"TipDisconnectedString": "Punt ONTKOPPELD",
+		"SolderingAdvancedPowerPrompt": "Vermogen: ",
+		"OffString": "Uit"
+	},
+	"characters": {
+		"SettingRightChar": "R",
+		"SettingLeftChar": "L",
+		"SettingAutoChar": "A",
+		"SettingFastChar": "S",
+		"SettingSlowChar": "T"
+	},
+	"menuDouble": true,
+	"menuGroups": {
+		"SolderingMenu": {
+			"text2": [
+				"Soldeer",
+				"Instellingen"
+			],
+			"desc": "Soldeerinstellingen"
+		},
+		"PowerSavingMenu": {
+			"text2": [
+				"Slaap",
+				"standen"
+			],
+			"desc": "Batterijspaarstanden"
+		},
+		"UIMenu": {
+			"text2": [
+				"Gebruikers-",
+				"Interface"
+			],
+			"desc": "Gebruikersinterface Instellingen"
+		},
+		"AdvancedMenu": {
+			"text2": [
+				"Gevorderde",
+				"Instellingen"
+			],
+			"desc": "Gevorderde Instellingen"
+		}
+	},
+	"menuOptions": {
+		"PowerSource": {
+			"text": "",
+			"text2": [
+				"Spannings-",
+				"bron"
+			],
+			"desc": "Spanningsbron. Stelt minimumspanning in. <DC 10V> <S 3.3V per cel>"
+		},
+		"SleepTemperature": {
+			"text": "",
+			"text2": [
+				"Slaap",
+				"temp"
+			],
+			"desc": "Temperatuur in slaapstand <°C>"
+		},
+		"SleepTimeout": {
+			"text": "",
+			"text2": [
+				"Slaap",
+				"time-out"
+			],
+			"desc": "Slaapstand time-out <Minuten/Seconden>"
+		},
+		"ShutdownTimeout": {
+			"text": "",
+			"text2": [
+				"Uitschakel",
+				"time-out"
+			],
+			"desc": "Automatisch afsluiten time-out <Minuten>"
+		},
+		"MotionSensitivity": {
+			"text": "",
+			"text2": [
+				"Bewegings-",
+				"gevoeligheid"
+			],
+			"desc": "Bewegingsgevoeligheid <0.uit 1.minst gevoelig 9.meest gevoelig>"
+		},
+		"TemperatureUnit": {
+			"text": "",
+			"text2": [
+				"Temperatuur",
+				"schaal"
+			],
+			"desc": "Temperatuurschaal <°C=Celsius °F=Fahrenheit>"
+		},
+		"AdvancedIdle": {
+			"text": "",
+			"text2": [
+				"Gedetailleerd",
+				"slaapscherm"
+			],
+			"desc": "Gedetailleerde informatie in een kleiner lettertype in het slaapscherm."
+		},
+		"DisplayRotation": {
+			"text": "",
+			"text2": [
+				"Scherm-",
+				"oriëntatie"
+			],
+			"desc": "Schermoriëntatie <A. Automatisch L. Linkshandig R. Rechtshandig>"
+		},
+		"BoostEnabled": {
+			"text": "",
+			"text2": [
+				"Temperatuurverhoging",
+				"ingeschakeld?"
+			],
+			"desc": "Temperatuur verhoogt als voorste knop is ingedrukt"
+		},
+		"BoostTemperature": {
+			"text": "",
+			"text2": [
+				"Verhogings",
+				"temp"
+			],
+			"desc": "Verhogingstemperatuur"
+		},
+		"AutoStart": {
+			"text": "",
+			"text2": [
+				"Auto",
+				"start"
+			],
+			"desc": "Breng de soldeerbout op temperatuur bij het opstarten. T=Soldeertemperatuur, S=Slaapstand-temperatuur, F=Uit"
+		},
+		"CooldownBlink": {
+			"text": "",
+			"text2": [
+				"Afkoel",
+				"knipper"
+			],
+			"desc": "Temperatuur knippert in hoofdmenu tijdens afkoeling."
+		},
+		"TemperatureCalibration": {
+			"text": "",
+			"text2": [
+				"Calibreer",
+				"temperatuur?"
+			],
+			"desc": "Temperatuur van de punt calibreren."
+		},
+		"SettingsReset": {
+			"text": "",
+			"text2": [
+				"Instellingen",
+				"resetten?"
+			],
+			"desc": "Alle instellingen resetten."
+		},
+		"VoltageCalibration": {
+			"text": "",
+			"text2": [
+				"Calibreer",
+				"voedingsspanning?"
+			],
+			"desc": "VIN Calibreren. Bevestigen door knoppen lang in te drukken."
+		},
+		"AdvancedSoldering": {
+			"text": "",
+			"text2": [
+				"Gedetailleerd",
+				"soldeerscherm"
+			],
+			"desc": "Gedetailleerde informatie in kleiner lettertype in soldeerscherm."
+		},
+		"ScrollingSpeed": {
+			"text": "",
+			"text2": [
+				"Scrol",
+				"snelheid"
+			],
+			"desc": "Scrolsnelheid van de tekst."
+		},
+		"TipModel": {
+			"text": "PUNTMO",
+			"text2": [
+				"Punt",
+				"Model"
+			],
+			"desc": "Gekozen punt"
+		},
+		"SimpleCalibrationMode": {
+			"text": "SMPCAL",
+			"text2": [
+				"Eenvoudige",
+				"Calibrering"
+			],
+			"desc": "Calibrering met heet water"
+		},
+		"AdvancedCalibrationMode": {
+			"text": "ADVCAL",
+			"text2": [
+				"Gevorderde",
+				"Calibrering"
+			],
+			"desc": "Calibrering met thermokoppel"
+		},
+		"PowerInput": {
+			"text": "PWRW",
+			"text2": [
+				"Vermogen",
+				"Watt"
+			],
+			"desc": "Vermogen van de adapter"
+		}
+	}
+}

Translation Editor/translation_no.json

@@ -1,6 +1,7 @@
 {
 	"languageCode": "NO",
 	"languageLocalName": "Norsk",
+	"cyrillicGlyphs": false,
 	"messages": {
 		"SettingsCalibrationDone": "Calibration done!",
 		"SettingsCalibrationWarning": "Sørg for at loddespissen har romtemperatur før du fortsetter!",
@@ -28,6 +29,7 @@
 		"SettingFastChar": "H",
 		"SettingSlowChar": "L"
 	},
+	"menuDouble": false,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -58,7 +60,6 @@
 			"desc": "Avanserte valg"
 		}
 	},
-	"menuDouble": false,
 	"menuOptions": {
 		"PowerSource": {
 			"text": "Kilde",
@@ -219,6 +220,14 @@
 				"Calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
+		},
+		"PowerInput": {
+			"text": "PWRW",
+			"text2": [
+				"Power",
+				"Wattage"
+			],
+			"desc": "Power Wattage of the power adapter used"
 		}
 	}
 }

Translation Editor/translation_pl.json

@@ -1,24 +1,26 @@
 {
 	"languageCode": "PL",
+	"languageLocalName": "Polski",
+	"cyrillicGlyphs": false,
 	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
+		"SettingsCalibrationDone": "Kalibracja udana!",
 		"SettingsCalibrationWarning": "Przed kontynuowaniem upewnij się, że końcówka osiągnela temperature pokojowa!",
-		"SettingsResetWarning": "Are you sure to reset settings to default values?",
+		"SettingsResetWarning": "Czy na pewno chcesz przywrócić ustawienia fabryczne?",
-		"UVLOWarningString": "DC LOW",
+		"UVLOWarningString": "NISKIE DC",
-		"UndervoltageString": "Undervoltage",
+		"UndervoltageString": "Pod napięciem",
-		"InputVoltageString": "Input V: ",
+		"InputVoltageString": "Wejściowe V: ",
-		"WarningTipTempString": "Tip Temp: ",
+		"WarningTipTempString": "Temperatura grota: ",
-		"BadTipString": "BAD TIP",
+		"BadTipString": "ZŁY GROT",
 		"SleepingSimpleString": "Zzz!",
 		"SleepingAdvancedString": "Uspienie...",
 		"WarningSimpleString": "HOT!",
 		"WarningAdvancedString": "GORĄCA KOŃCÓWKA!",
-		"SleepingTipAdvancedString": "Tip:",
+		"SleepingTipAdvancedString": "Grot:",
-		"IdleTipString": "Tip:",
+		"IdleTipString": "Grot:",
-		"IdleSetString": " Set:",
+		"IdleSetString": " Ustaw:",
-		"TipDisconnectedString": "TIP DISCONNECTED",
+		"TipDisconnectedString": "GROT ODŁĄCZONY",
 		"SolderingAdvancedPowerPrompt": "Power: ",
-		"OffString": "Off"
+		"OffString": "Wyłącz"
 	},
 	"characters": {
 		"SettingRightChar": "P",
@@ -31,95 +33,95 @@
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
-				"Soldering",
+				"Lutowanie",
-				"Settings"
+				"Ustawienia"
 			],
-			"desc": "Soldering settings"
+			"desc": "Ustawienia lutownicy"
 		},
 		"PowerSavingMenu": {
 			"text2": [
-				"Sleep",
+				"Uśpienie",
-				"Modes"
+				"Tryby"
 			],
-			"desc": "Power Saving Settings"
+			"desc": "Ustawienia oszczędzania energii"
 		},
 		"UIMenu": {
 			"text2": [
-				"User",
+				"Użytkownik",
-				"Interface"
+				"Interfejs"
 			],
-			"desc": "User Interface settings"
+			"desc": "Ustawienia interfejsu użytkownika"
 		},
 		"AdvancedMenu": {
 			"text2": [
-				"Advanced",
+				"Zaawansowane",
-				"Options"
+				"Opcje"
 			],
-			"desc": "Advanced options"
+			"desc": "Opcje zaawansowane"
 		}
 	},
 	"menuOptions": {
 		"PowerSource": {
 			"text": "PWRSC",
 			"text2": [
-				"",
+				"Źródło",
-				""
+				"zasilania"
 			],
 			"desc": "Źródło zasilania. Ustaw napięcie odcięcia. <DC 10V> <S 3.3V dla ogniw Li>"
 		},
 		"SleepTemperature": {
 			"text": "STMP",
 			"text2": [
-				"",
+				"Temperatura",
-				""
+				"uśpienia"
 			],
 			"desc": "Temperatura uśpienia <°C>"
 		},
 		"SleepTimeout": {
 			"text": "STME",
 			"text2": [
-				"",
+				"Czas",
-				""
+				"uśpienia"
 			],
 			"desc": "Czas uśpienia <Minuty/Sekundy>"
 		},
 		"ShutdownTimeout": {
 			"text": "SHTME",
 			"text2": [
-				"",
+				"Czas",
-				""
+				"wyłączenia"
 			],
 			"desc": "Czas wyłączenia <Minuty>"
 		},
 		"MotionSensitivity": {
 			"text": "MSENSE",
 			"text2": [
-				"",
+				"Czułość",
-				""
+				"ruchu"
 			],
 			"desc": "Czułość ruchu <0.Wyłączona 1.minimalna 9.maksymalna>"
 		},
 		"TemperatureUnit": {
 			"text": "TMPUNT",
 			"text2": [
-				"",
+				"Jednostka",
-				""
+				"temperatury"
 			],
 			"desc": "Jednostka temperatury <C=Celsius F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
 			"text": "ADVIDL",
 			"text2": [
-				"",
+				"Mniejsza",
-				""
+				"czcionka"
 			],
 			"desc": "Wyświetla szczegółowe informacje za pomocą mniejszej czcionki na ekranie bezczynnośći <T = wł., N = wył.>"
 		},
 		"DisplayRotation": {
 			"text": "DSPROT",
 			"text2": [
-				"",
+				"Orientacja",
-				""
+				"wyświetlacza"
 			],
 			"desc": "Orientacja wyświetlacza <A. Automatyczna L. Leworęczna P. Praworęczna>"
 		},
@@ -134,32 +136,32 @@
 		"BoostTemperature": {
 			"text": "BTMP",
 			"text2": [
-				"",
+				"Temperatura",
-				""
+				"w trybie boost"
 			],
 			"desc": "Temperatura w trybie \"boost\" "
 		},
 		"AutoStart": {
 			"text": "ASTART",
 			"text2": [
-				"",
+				"Automatyczne",
-				""
+				"uruchamianie"
 			],
 			"desc": "Automatyczne uruchamianie trybu lutowania po włączeniu zasilania. T=Lutowanie, S= Tryb Uspienia ,N=Wyłącz"
 		},
 		"CooldownBlink": {
 			"text": "CLBLNK",
 			"text2": [
-				"",
+				"Migająca",
-				""
+				"temperatura"
 			],
 			"desc": "Temperatura na ekranie miga, gdy grot jest jeszcze gorący. <T = wł., N = wył.>"
 		},
 		"TemperatureCalibration": {
 			"text": "TMP CAL?",
 			"text2": [
-				"",
+				"Kalibracja",
-				""
+				"temp. grota"
 			],
 			"desc": "Kalibracja temperatury grota lutownicy"
 		},
@@ -174,51 +176,58 @@
 		"VoltageCalibration": {
 			"text": "CAL VIN?",
 			"text2": [
-				"",
+				"Kalibracja",
-				""
+				"napięcia"
 			],
 			"desc": "Kalibracja napięcia wejściowego. Krótkie naciśnięcie, aby ustawić, długie naciśnięcie, aby wyjść."
 		},
 		"AdvancedSoldering": {
 			"text": "ADVSLD",
 			"text2": [
-				"",
+				"Szczegółowe",
-				""
+				"informacje"
 			],
 			"desc": "Wyświetl szczegółowe informacje podczas lutowania <T = wł., N = wył.>"
 		},
 		"ScrollingSpeed": {
 			"text": "DESCSP",
 			"text2": [
-				"",
+				"Szybkość",
-				""
+				"tekstu"
 			],
-			"desc": "Speed this text scrolls past at"
+			"desc": "Szybkość przewijania tekstu"
 		},
 		"TipModel": {
 			"text": "TIPMO",
 			"text2": [
-				"Tip",
+				"Model",
-				"Model"
+				"grota"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Wybór grotu"
 		},
 		"SimpleCalibrationMode": {
 			"text": "SMPCAL",
 			"text2": [
-				"Simple",
+				"Prosta",
-				"Calibration"
+				"Kalibracja"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Prosta kalibracja używając gorącej wody"
 		},
 		"AdvancedCalibrationMode": {
 			"text": "ADVCAL",
 			"text2": [
-				"Advanced",
+				"Zaawansowana",
-				"Calibration"
+				"Kalibracja"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Zaawansowana kalibracja za pomocy termopoary na grocie"
+		},
+		"PowerInput": {
+			"text": "PWRW",
+			"text2": [
+				"Moc",
+				"Wattach"
+			],
+			"desc": "Moc używanego zasilacza w Watach"
 		}
-	},
+	}
-	"languageLocalName": "Polski"
 }

Translation Editor/translation_pt.json

@@ -1,9 +1,11 @@
 {
 	"languageCode": "PT",
+	"languageLocalName": "Português",
+	"cyrillicGlyphs": false,
 	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
+		"SettingsCalibrationDone": "Calibração terminada!",
-		"SettingsCalibrationWarning": "A ponta deve estar em temperatura ambiente antes de continuar!",
+		"SettingsCalibrationWarning": "A ponta deve estar à temperatura ambiente antes de continuar!",
-		"SettingsResetWarning": "Resetar para ajustes de fábrica?",
+		"SettingsResetWarning": "Definições de fábrica?",
 		"UVLOWarningString": "DC BAIXO",
 		"UndervoltageString": "Subtensão",
 		"InputVoltageString": "Tensão ",
@@ -46,9 +48,9 @@
 		"UIMenu": {
 			"text2": [
 				"Interface",
-				"Usuário"
+				"Utilizador"
 			],
-			"desc": "Configurações da interface do usuário"
+			"desc": "Configurações do interface do utilizador"
 		},
 		"AdvancedMenu": {
 			"text2": [
@@ -65,7 +67,7 @@
 				"Fonte",
 				"alimentação"
 			],
-			"desc": "nte de alimentação. Define a tensão de corte. <DC=10V> <S=3.3V/célula>"
+			"desc": "Fonte de alimentação. Define a tensão de corte. <DC=10V> <S=3.3V/célula>"
 		},
 		"SleepTemperature": {
 			"text": "TMPE",
@@ -108,12 +110,12 @@
 			"desc": "Unidade de temperatura <C=Celsius F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "OCIOSO",
+			"text": "EM ESPERA",
 			"text2": [
 				"Tela repouso",
 				"avançada"
 			],
-			"desc": "Exibe informações avançadas quando ocioso"
+			"desc": "Exibe informações avançadas quando em espera"
 		},
 		"DisplayRotation": {
 			"text": "ORIENT",
@@ -127,9 +129,9 @@
 			"text": "TURBO",
 			"text2": [
 				"Modo turbo",
-				"ativado"
+				"activado"
 			],
-			"desc": "Tecla frontal ativa modo \"turbo\""
+			"desc": "Tecla frontal activa modo \"turbo\""
 		},
 		"BoostTemperature": {
 			"text": "TTMP",
@@ -151,9 +153,9 @@
 			"text": "RESFRI",
 			"text2": [
 				"Piscar ao",
-				"resfriar"
+				"arrefecer"
 			],
-			"desc": "Faz o valor da temperatura piscar durante o resfriamento"
+			"desc": "Faz o valor da temperatura piscar durante o arrefecimento"
 		},
 		"TemperatureCalibration": {
 			"text": "CAL.TEMP",
@@ -164,7 +166,7 @@
 			"desc": "Calibra a temperatura"
 		},
 		"SettingsReset": {
-			"text": "RESETAR",
+			"text": "RESET",
 			"text2": [
 				"Reset de",
 				"fábrica?"
@@ -177,7 +179,7 @@
 				"Calibrar",
 				"tensão"
 			],
-			"desc": "Calibra a tensão de alimentação. Use os botões para ajustar o valor. Mantenha presionado para sair"
+			"desc": "Calibra a tensão de alimentação. Use os botões para ajustar o valor. Mantenha pressionado para sair"
 		},
 		"AdvancedSoldering": {
 			"text": "AVNCAD",
@@ -193,32 +195,39 @@
 				"Velocidade",
 				"texto ajuda"
 			],
-			"desc": "Velocidade que esse texto é exibido"
+			"desc": "Velocidade a que o texto é exibido"
 		},
 		"TipModel": {
-			"text": "TIPMO",
+			"text": "MODPNT",
 			"text2": [
-				"Tip",
+				"Ponta",
-				"Model"
+				"Modelo"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Selecção de modelo de ponta"
 		},
 		"SimpleCalibrationMode": {
 			"text": "SMPCAL",
 			"text2": [
-				"Simple",
+				"Calibração",
-				"Calibration"
+				"Simples"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Calibração simples com água quente"
 		},
 		"AdvancedCalibrationMode": {
 			"text": "ADVCAL",
 			"text2": [
-				"Advanced",
+				"Calibração",
-				"Calibration"
+				"Avançada"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Calibração avançada com um termopar na ponta"
+		},
+		"PowerInput": {
+			"text": "PWRW",
+			"text2": [
+				"Potência",
+				"Fonte"
+			],
+			"desc": "Potência da fonte usada (Watt)"
 		}
-	},
+	}
-	"languageLocalName": "Portugues"
 }

Translation Editor/translation_ru.json

@@ -1,7 +1,9 @@
 {
 	"languageCode": "RU",
+	"languageLocalName": "Русский",
+	"cyrillicGlyphs": true,
 	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
+		"SettingsCalibrationDone": "Калибровка выполнена!",
 		"SettingsCalibrationWarning": "Убедитесь, что жало остыло до комнатной температуры, прежде чем продолжать!",
 		"SettingsResetWarning": "Вы действительно хотите сбросить настройки до значений по умолчанию?",
 		"UVLOWarningString": "АККУМ--",
@@ -198,27 +200,34 @@
 		"TipModel": {
 			"text": "TIPMO",
 			"text2": [
-				"Tip",
+				"Модель",
-				"Model"
+				"жало"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Выбор модели жало"
 		},
 		"SimpleCalibrationMode": {
 			"text": "SMPCAL",
 			"text2": [
-				"Simple",
+				"Простая",
-				"Calibration"
+				"калибровка"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Простая калибровка с использованием горячей воды"
 		},
 		"AdvancedCalibrationMode": {
 			"text": "ADVCAL",
 			"text2": [
-				"Advanced",
+				"Подробная",
-				"Calibration"
+				"калибровка"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Калибровка с помощью термопары"
+		},
+		"PowerInput": {
+			"text": "PWRW",
+			"text2": [
+				"Power",
+				"Wattage"
+			],
+			"desc": "Power Wattage of the power adapter used"
 		}
-	},
+	}
-	"languageLocalName": "Русский"
+}
-}

Translation Editor/translation_sk.json

@@ -1,5 +1,7 @@
 {
 	"languageCode": "SK",
+	"languageLocalName": "Slovenský",
+	"cyrillicGlyphs": false,
 	"messages": {
 		"SettingsCalibrationDone": "Calibration done!",
 		"SettingsCalibrationWarning": "Najprv sa prosim uistite, ze hrot ma izbovu teplotu!",
@@ -218,6 +220,14 @@
 				"Calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
+		},
+		"PowerInput": {
+			"text": "PWRW",
+			"text2": [
+				"Power",
+				"Wattage"
+			],
+			"desc": "Power Wattage of the power adapter used"
 		}
 	}
 }

Translation Editor/translation_sr.json

@@ -1,224 +0,0 @@
-{
-	"languageCode": "SR",
-	"languageLocalName": "Srpski",
-	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
-		"SettingsCalibrationWarning": "Proverite da li je vrh ohlađen na sobnu temperaturu pre nego što nastavite!",
-		"SettingsResetWarning": "Jeste li sigurni da želite da vratite sva podešavanja na fabričke vrednosti?",
-		"UVLOWarningString": "BATERIJA",
-		"UndervoltageString": "PRENIZAK NAPON",
-		"InputVoltageString": "Napajanje: ",
-		"WarningTipTempString": "Temp vrha: ",
-		"BadTipString": "LOŠ VRH",
-		"SleepingSimpleString": "Zzz ",
-		"SleepingAdvancedString": "SPAVANJE...",
-		"WarningSimpleString": "VRUĆ",
-		"WarningAdvancedString": "OPREZ, VRUĆE!",
-		"SleepingTipAdvancedString": "Vrh:",
-		"IdleTipString": "Vrh:",
-		"IdleSetString": " / ",
-		"TipDisconnectedString": "VRH NIJE SPOJEN!",
-		"SolderingAdvancedPowerPrompt": "Snaga: ",
-		"OffString": "Off"
-	},
-	"characters": {
-		"SettingRightChar": "D",
-		"SettingLeftChar": "L",
-		"SettingAutoChar": "A",
-		"SettingFastChar": "B",
-		"SettingSlowChar": "S"
-	},
-	"menuGroups": {
-		"SolderingMenu": {
-			"text2": [
-				"Postavke",
-				"lemljenja"
-			],
-			"desc": "Postavke pri lemljenju"
-		},
-		"PowerSavingMenu": {
-			"text2": [
-				"Ušteda",
-				"energije"
-			],
-			"desc": "Postavke spavanja i štednje energije"
-		},
-		"UIMenu": {
-			"text2": [
-				"Korisničke",
-				"opcije"
-			],
-			"desc": "Postavke korisničkih opcija"
-		},
-		"AdvancedMenu": {
-			"text2": [
-				"Napredne",
-				"opcije"
-			],
-			"desc": "Upravljanje naprednim opcijama"
-		}
-	},
-	"menuDouble": true,
-	"menuOptions": {
-		"PowerSource": {
-			"text": "",
-			"text2": [
-				"Izvor",
-				"napajanja"
-			],
-			"desc": "Izvor napajanja. Postavlja napon isključivanja. <DC 10V> <S 3.3V po ćeliji>"
-		},
-		"SleepTemperature": {
-			"text": "",
-			"text2": [
-				"Temp",
-				"spavanja"
-			],
-			"desc": "Temperatura na koju se spušta lemilica nakon određenog vremena mirovanja. <C/F>"
-		},
-		"SleepTimeout": {
-			"text": "",
-			"text2": [
-				"Vreme",
-				"spavanja"
-			],
-			"desc": "Vreme mirovanja nakon koga lemilica spušta temperaturu. <Minute/Sekunde>"
-		},
-		"ShutdownTimeout": {
-			"text": "",
-			"text2": [
-				"Vreme",
-				"gašenja"
-			],
-			"desc": "Vreme mirovanja nakon koga će se lemilica ugasiti."
-		},
-		"MotionSensitivity": {
-			"text": "",
-			"text2": [
-				"Osetljivost",
-				"pokreta"
-			],
-			"desc": "Osetljivost prepoznavanja pokreta. <0=Ugašeno, 1=Najmanje osetljivo, 9=Najosjetljivije>"
-		},
-		"TemperatureUnit": {
-			"text": "",
-			"text2": [
-				"Jedinica",
-				"temperature"
-			],
-			"desc": "Jedinica temperature. <C=Celzijus, F=Fahrenheit>"
-		},
-		"AdvancedIdle": {
-			"text": "",
-			"text2": [
-				"Detalji",
-				"pri čekanju"
-			],
-			"desc": "Prikazivanje detaljnih informacija manjim fontom tokom čekanja."
-		},
-		"DisplayRotation": {
-			"text": "",
-			"text2": [
-				"Rotacija",
-				"ekrana"
-			],
-			"desc": "Orijentacija ekrana. <A=Automatski, L=Levoruki, D=Desnoruki>"
-		},
-		"BoostEnabled": {
-			"text": "",
-			"text2": [
-				"Boost",
-				"način"
-			],
-			"desc": "Držanjem prednjeg dugmeta prilikom lemljenja aktivira se pojačani (Boost) način."
-		},
-		"BoostTemperature": {
-			"text": "",
-			"text2": [
-				"Boost",
-				"temp"
-			],
-			"desc": "Temperatura u pojačanom (Boost) načinu."
-		},
-		"AutoStart": {
-			"text": "",
-			"text2": [
-				"Auto",
-				"start"
-			],
-			"desc": "Ako je aktivno, lemilica po uključivanju napajanja odmah počinje grejati."
-		},
-		"CooldownBlink": {
-			"text": "",
-			"text2": [
-				"Upozorenje",
-				"pri hlađenju"
-			],
-			"desc": "Blinkanje temperature prilikom hlađenja, ako je lemilica vruća."
-		},
-		"TemperatureCalibration": {
-			"text": "",
-			"text2": [
-				"Kalibracija",
-				"temperature"
-			],
-			"desc": "Kalibrisanje temperature meri razliku temperatura vrha i drške, dok je lemilica hladna."
-		},
-		"SettingsReset": {
-			"text": "",
-			"text2": [
-				"Fabričke",
-				"postavke"
-			],
-			"desc": "Vraćanje svih podešavanja na fabričke vrednosti."
-		},
-		"VoltageCalibration": {
-			"text": "",
-			"text2": [
-				"Kalibracija",
-				"napona napajanja"
-			],
-			"desc": "Kalibracija ulaznog napona. Podešavanje tastera, dugački pritisak za kraj."
-		},
-		"AdvancedSoldering": {
-			"text": "",
-			"text2": [
-				"Detalji",
-				"pri lemljenju"
-			],
-			"desc": "Prikazivanje detaljnih informacija tokom lemljenja."
-		},
-		"ScrollingSpeed": {
-			"text": "",
-			"text2": [
-				"Brzina",
-				"poruka"
-			],
-			"desc": "Brzina kretanja dugačkih poruka <B=brzo, S=sporo>"
-		},
-		"TipModel": {
-			"text": "TIPMO",
-			"text2": [
-				"Tip",
-				"Model"
-			],
-			"desc": "Tip Model selection"
-		},
-		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
-			"text2": [
-				"Simple",
-				"Calibration"
-			],
-			"desc": "Simple Calibration using Hot water"
-		},
-		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
-			"text2": [
-				"Advanced",
-				"Calibration"
-			],
-			"desc": "Advanced calibration using thermocouple on the tip"
-		}
-	}
-}

Translation Editor/translation_sr_cyrl.json

@@ -0,0 +1,233 @@
+{
+	"languageCode": "SR_CYRL",
+	"languageLocalName": "Српски",
+	"cyrillicGlyphs": true,
+	"messages": {
+		"SettingsCalibrationDone": "Калибрација готова",
+		"SettingsCalibrationWarning": "Проверите да ли је врх охлађен на собну температуру пре него што наставите",
+		"SettingsResetWarning": "Да ли заиста желите да вратите поставке на фабричке вредности?",
+		"UVLOWarningString": "НИЗ.НАП.",
+		"UndervoltageString": "ПРЕНИЗАК НАПОН",
+		"InputVoltageString": "Ул. напон: ",
+		"WarningTipTempString": "Темп. врха: ",
+		"BadTipString": "ЛОШ ВРХ",
+		"SleepingSimpleString": "Сан",
+		"SleepingAdvancedString": "Спавање...",
+		"WarningSimpleString": "ВРУЋ",
+		"WarningAdvancedString": "! ОПРЕЗ, ВРУЋЕ !",
+		"SleepingTipAdvancedString": "Врх:",
+		"IdleTipString": "Врх:",
+		"IdleSetString": " / ",
+		"TipDisconnectedString": "ВРХ НИЈЕ СПОЈЕН",
+		"SolderingAdvancedPowerPrompt": "Снага: ",
+		"OffString": "Иск"
+	},
+	"characters": {
+		"SettingRightChar": "Д",
+		"SettingLeftChar": "Л",
+		"SettingAutoChar": "А",
+		"SettingFastChar": "Б",
+		"SettingSlowChar": "С"
+	},
+	"menuDouble": true,
+	"menuGroups": {
+		"SolderingMenu": {
+			"text2": [
+				"Поставке",
+				"лемљења"
+			],
+			"desc": "Поставке режима лемљења."
+		},
+		"PowerSavingMenu": {
+			"text2": [
+				"Уштеда",
+				"енергије"
+			],
+			"desc": "Поставке режима мировања."
+		},
+		"UIMenu": {
+			"text2": [
+				"Корисничко",
+				"сучеље"
+			],
+			"desc": "Поставке корисничког сучеља."
+		},
+		"AdvancedMenu": {
+			"text2": [
+				"Напредне",
+				"поставке"
+			],
+			"desc": "Напредне поставке."
+		}
+	},
+	"menuOptions": {
+		"PowerSource": {
+			"text": "Нпјње",
+			"text2": [
+				"Врста",
+				"напајања"
+			],
+			"desc": "Тип напајања; одређује најнижи радни напон. <DC=адаптер (10V), S=батерија (3,3V по ћелији)>"
+		},
+		"SleepTemperature": {
+			"text": "ТСпв",
+			"text2": [
+				"Темп.",
+				"спавања"
+			],
+			"desc": "Температура на коју се спушта лемилица након одређеног времена мировања. <C/F>"
+		},
+		"SleepTimeout": {
+			"text": "ВСпв",
+			"text2": [
+				"Време до",
+				"спавања"
+			],
+			"desc": "Време мировања након кога лемилица спушта температуру. <M=минути, S=секунде>"
+		},
+		"ShutdownTimeout": {
+			"text": "ВГшњ",
+			"text2": [
+				"Време до",
+				"гашења"
+			],
+			"desc": "Време мировања након кога се лемилица гаси. <M=минути>"
+		},
+		"MotionSensitivity": {
+			"text": "ОстПкр",
+			"text2": [
+				"Осетљивост",
+				"на покрет"
+			],
+			"desc": "Осетљивост сензора покрета. <0=искључено, 1=најмање осетљиво, 9=најосетљивије>"
+		},
+		"TemperatureUnit": {
+			"text": "ЈедТмп",
+			"text2": [
+				"Јединица",
+				"температуре"
+			],
+			"desc": "Јединице у којима се приказује температура. <C=целзијус, F=фаренхајт>"
+		},
+		"AdvancedIdle": {
+			"text": "ДтљМир",
+			"text2": [
+				"Детаљи током",
+				"мировања"
+			],
+			"desc": "Приказивање детаљних информација на екрану током мировања."
+		},
+		"DisplayRotation": {
+			"text": "ОрјЕкр",
+			"text2": [
+				"Оријентација",
+				"екрана"
+			],
+			"desc": "Како је окренут екран. <А=аутоматски, Л=за леворуке, Д=за десноруке>"
+		},
+		"BoostEnabled": {
+			"text": "Пјчње",
+			"text2": [
+				"Појачање",
+				"омогућено"
+			],
+			"desc": "Држање предњег тастера током лемљења додатно појачава температуру врха."
+		},
+		"BoostTemperature": {
+			"text": "ТПјч",
+			"text2": [
+				"Темп.",
+				"појачања"
+			],
+			"desc": "Температура врха лемилице у току појачања."
+		},
+		"AutoStart": {
+			"text": "ВрћСта",
+			"text2": [
+				"Врући",
+				"старт"
+			],
+			"desc": "Лемилица одмах по покретању прелази у режим лемљења и греје се."
+		},
+		"CooldownBlink": {
+			"text": "УпзХла",
+			"text2": [
+				"Упозорење",
+				"при хлађењу"
+			],
+			"desc": "Приказ температуре трепће приликом хлађења докле год је врх и даље врућ."
+		},
+		"TemperatureCalibration": {
+			"text": "КалбрТмп",
+			"text2": [
+				"Калибрација",
+				"температуре"
+			],
+			"desc": "Калибрисање одступања температуре врха у односу на дршку."
+		},
+		"SettingsReset": {
+			"text": "ФабрПост",
+			"text2": [
+				"Фабричке",
+				"поставке"
+			],
+			"desc": "Враћање свих поставки на фабричке вредности."
+		},
+		"VoltageCalibration": {
+			"text": "КалбрНап",
+			"text2": [
+				"Калибрација",
+				"улазног напона"
+			],
+			"desc": "Калибрисање улазног напона. Подешава се на тастере; дуги притисак за крај."
+		},
+		"AdvancedSoldering": {
+			"text": "ДтљЛем",
+			"text2": [
+				"Детаљи током",
+				"лемљења"
+			],
+			"desc": "Приказивање детаљних информација на екрану током лемљења."
+		},
+		"ScrollingSpeed": {
+			"text": "БрзПор",
+			"text2": [
+				"Брзина",
+				"порука"
+			],
+			"desc": "Брзина кретања описних порука попут ове. <С=споро, Б=брзо>"
+		},
+		"TipModel": {
+			"text": "МоделВрх",
+			"text2": [
+				"Модел",
+				"врха"
+			],
+			"desc": "Одабир модела лемног врха."
+		},
+		"SimpleCalibrationMode": {
+			"text": "ЈедКалбр",
+			"text2": [
+				"Једноставна",
+				"калибрација"
+			],
+			"desc": "Једноставна калибрација кипућом водом."
+		},
+		"AdvancedCalibrationMode": {
+			"text": "НапКалбр",
+			"text2": [
+				"Напредна",
+				"калибрација"
+			],
+			"desc": "Напредна калибрација помоћу термопара."
+		},
+		"PowerInput": {
+			"text": "УлазСнаг",
+			"text2": [
+				"Улазна",
+				"снага"
+			],
+			"desc": "Снага напајања у ватима."
+		}
+	}
+}

Translation Editor/translation_sr_latn.json

@@ -0,0 +1,233 @@
+{
+	"languageCode": "SR_LATN",
+	"languageLocalName": "Srpski",
+	"cyrillicGlyphs": false,
+	"messages": {
+		"SettingsCalibrationDone": "Kalibracija gotova",
+		"SettingsCalibrationWarning": "Proverite da li je vrh ohlađen na sobnu temperaturu pre nego što nastavite",
+		"SettingsResetWarning": "Da li zaista želite da vratite postavke na fabričke vrednosti?",
+		"UVLOWarningString": "NIZ.NAP.",
+		"UndervoltageString": "PRENIZAK NAPON",
+		"InputVoltageString": "Ul. napon: ",
+		"WarningTipTempString": "Temp. vrha: ",
+		"BadTipString": "LOŠ VRH",
+		"SleepingSimpleString": "Zzz",
+		"SleepingAdvancedString": "Spavanje...",
+		"WarningSimpleString": "VRUĆ",
+		"WarningAdvancedString": "! OPREZ, VRUĆE !",
+		"SleepingTipAdvancedString": "Vrh:",
+		"IdleTipString": "Vrh:",
+		"IdleSetString": " / ",
+		"TipDisconnectedString": "VRH NIJE SPOJEN",
+		"SolderingAdvancedPowerPrompt": "Snaga: ",
+		"OffString": "Isk"
+	},
+	"characters": {
+		"SettingRightChar": "D",
+		"SettingLeftChar": "L",
+		"SettingAutoChar": "A",
+		"SettingFastChar": "B",
+		"SettingSlowChar": "S"
+	},
+	"menuDouble": true,
+	"menuGroups": {
+		"SolderingMenu": {
+			"text2": [
+				"Postavke",
+				"lemljenja"
+			],
+			"desc": "Postavke režima lemljenja."
+		},
+		"PowerSavingMenu": {
+			"text2": [
+				"Ušteda",
+				"energije"
+			],
+			"desc": "Postavke režima mirovanja."
+		},
+		"UIMenu": {
+			"text2": [
+				"Korisničko",
+				"sučelje"
+			],
+			"desc": "Postavke korisničkog sučelja."
+		},
+		"AdvancedMenu": {
+			"text2": [
+				"Napredne",
+				"postavke"
+			],
+			"desc": "Napredne postavke."
+		}
+	},
+	"menuOptions": {
+		"PowerSource": {
+			"text": "Npjnj",
+			"text2": [
+				"Vrsta",
+				"napajanja"
+			],
+			"desc": "Tip napajanja; određuje najniži radni napon. <DC=adapter (10V), S=baterija (3,3V po ćeliji)>"
+		},
+		"SleepTemperature": {
+			"text": "TSpv",
+			"text2": [
+				"Temp.",
+				"spavanja"
+			],
+			"desc": "Temperatura na koju se spušta lemilica nakon određenog vremena mirovanja. <C/F>"
+		},
+		"SleepTimeout": {
+			"text": "VSpv",
+			"text2": [
+				"Vreme do",
+				"spavanja"
+			],
+			"desc": "Vreme mirovanja nakon koga lemilica spušta temperaturu. <M=minuti, S=sekunde>"
+		},
+		"ShutdownTimeout": {
+			"text": "VGšnj",
+			"text2": [
+				"Vreme do",
+				"gašenja"
+			],
+			"desc": "Vreme mirovanja nakon koga se lemilica gasi. <M=minuti>"
+		},
+		"MotionSensitivity": {
+			"text": "OstPkr",
+			"text2": [
+				"Osetljivost",
+				"na pokret"
+			],
+			"desc": "Osetljivost senzora pokreta. <0=isključeno, 1=najmanje osetljivo, 9=najosetljivije>"
+		},
+		"TemperatureUnit": {
+			"text": "JedTmp",
+			"text2": [
+				"Jedinica",
+				"temperature"
+			],
+			"desc": "Jedinice u kojima se prikazuje temperatura. <C=celzijus, F=farenhajt>"
+		},
+		"AdvancedIdle": {
+			"text": "DtlMir",
+			"text2": [
+				"Detalji tokom",
+				"mirovanja"
+			],
+			"desc": "Prikazivanje detaljnih informacija na ekranu tokom mirovanja."
+		},
+		"DisplayRotation": {
+			"text": "OrjEkr",
+			"text2": [
+				"Orijentacija",
+				"ekrana"
+			],
+			"desc": "Kako je okrenut ekran. <A=automatski, L=za levoruke, D=za desnoruke>"
+		},
+		"BoostEnabled": {
+			"text": "Pjčnj",
+			"text2": [
+				"Pojačanje",
+				"omogućeno"
+			],
+			"desc": "Držanje prednjeg tastera tokom lemljenja dodatno pojačava temperaturu vrha."
+		},
+		"BoostTemperature": {
+			"text": "TPjč",
+			"text2": [
+				"Temp.",
+				"pojačanja"
+			],
+			"desc": "Temperatura vrha lemilice u toku pojačanja."
+		},
+		"AutoStart": {
+			"text": "VrćSta",
+			"text2": [
+				"Vrući",
+				"start"
+			],
+			"desc": "Lemilica odmah po pokretanju prelazi u režim lemljenja i greje se."
+		},
+		"CooldownBlink": {
+			"text": "UpzHla",
+			"text2": [
+				"Upozorenje",
+				"pri hlađenju"
+			],
+			"desc": "Prikaz temperature trepće prilikom hlađenja dokle god je vrh i dalje vruć."
+		},
+		"TemperatureCalibration": {
+			"text": "KalbrTmp",
+			"text2": [
+				"Kalibracija",
+				"temperature"
+			],
+			"desc": "Kalibrisanje odstupanja temperature vrha u odnosu na dršku."
+		},
+		"SettingsReset": {
+			"text": "FabrPost",
+			"text2": [
+				"Fabričke",
+				"postavke"
+			],
+			"desc": "Vraćanje svih postavki na fabričke vrednosti."
+		},
+		"VoltageCalibration": {
+			"text": "KalbrNap",
+			"text2": [
+				"Kalibracija",
+				"ulaznog napona"
+			],
+			"desc": "Kalibrisanje ulaznog napona. Podešava se na tastere; dugi pritisak za kraj."
+		},
+		"AdvancedSoldering": {
+			"text": "DtlLem",
+			"text2": [
+				"Detalji tokom",
+				"lemljenja"
+			],
+			"desc": "Prikazivanje detaljnih informacija na ekranu tokom lemljenja."
+		},
+		"ScrollingSpeed": {
+			"text": "BrzPor",
+			"text2": [
+				"Brzina",
+				"poruka"
+			],
+			"desc": "Brzina kretanja opisnih poruka poput ove. <S=sporo, B=brzo>"
+		},
+		"TipModel": {
+			"text": "ModelVrh",
+			"text2": [
+				"Model",
+				"vrha"
+			],
+			"desc": "Odabir modela lemnog vrha."
+		},
+		"SimpleCalibrationMode": {
+			"text": "JedKalbr",
+			"text2": [
+				"Jednostavna",
+				"kalibracija"
+			],
+			"desc": "Jednostavna kalibracija kipućom vodom."
+		},
+		"AdvancedCalibrationMode": {
+			"text": "NapKalbr",
+			"text2": [
+				"Napredna",
+				"kalibracija"
+			],
+			"desc": "Napredna kalibracija pomoću termopara."
+		},
+		"PowerInput": {
+			"text": "UlazSnag",
+			"text2": [
+				"Ulazna",
+				"snaga"
+			],
+			"desc": "Snaga napajanja u vatima."
+		}
+	}
+}

Translation Editor/translation_sv.json

@@ -1,6 +1,7 @@
 {
 	"languageCode": "SV",
 	"languageLocalName": "Svenska",
+	"cyrillicGlyphs": false,
 	"messages": {
 		"SettingsCalibrationDone": "Calibration done!",
 		"SettingsCalibrationWarning": "Please ensure the tip is at room temperature before continuing!",
@@ -28,6 +29,7 @@
 		"SettingFastChar": "S",
 		"SettingSlowChar": "L"
 	},
+	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -58,7 +60,6 @@
 			"desc": "Avancerade alternativ"
 		}
 	},
-	"menuDouble": true,
 	"menuOptions": {
 		"PowerSource": {
 			"text": "",
@@ -219,6 +220,14 @@
 				"Calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
+		},
+		"PowerInput": {
+			"text": "PWRW",
+			"text2": [
+				"Power",
+				"Wattage"
+			],
+			"desc": "Power Wattage of the power adapter used"
 		}
 	}
 }

Translation Editor/translation_tr.json

@@ -1,5 +1,7 @@
 {
 	"languageCode": "TR",
+	"languageLocalName": "Türk",
+	"cyrillicGlyphs": false,
 	"messages": {
 		"SettingsCalibrationDone": "Calibration done!",
 		"SettingsCalibrationWarning": "Lütfen devam etmeden önce ucun oda sıcaklığında olduğunu garantiye alın!",
@@ -218,7 +220,14 @@
 				"Calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
+		},
+		"PowerInput": {
+			"text": "PWRW",
+			"text2": [
+				"Power",
+				"Wattage"
+			],
+			"desc": "Power Wattage of the power adapter used"
 		}
-	},
+	}
-	"languageLocalName": "Türk"
 }

Translation Editor/translation_uk.json

@@ -1,6 +1,7 @@
 {
-	"languageCode": "UA",
+	"languageCode": "UK",
 	"languageLocalName": "Українська",
+	"cyrillicGlyphs": true,
 	"messages": {
 		"SettingsCalibrationDone": "Calibration done!",
 		"SettingsCalibrationWarning": "Переконайтеся, що жало охололо до кімнатної температури, перш ніж продовжувати!",
@@ -28,6 +29,7 @@
 		"SettingFastChar": "+",
 		"SettingSlowChar": "-"
 	},
+	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -58,7 +60,6 @@
 			"desc": "Розширені налаштування. Додаткові зручності."
 		}
 	},
-	"menuDouble": true,
 	"menuOptions": {
 		"PowerSource": {
 			"text": "",
@@ -219,6 +220,14 @@
 				"Calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
+		},
+		"PowerInput": {
+			"text": "PWRW",
+			"text2": [
+				"Power",
+				"Wattage"
+			],
+			"desc": "Power Wattage of the power adapter used"
 		}
 	}
 }

Translation.md

@@ -1,5 +1,6 @@
 # Translation
-If you would like to contribute a translation, look at the file `translation.c` in the source code.
+If you would like to contribute a translation, use the [Translation Editor](http://htmlpreview.github.io/?https://github.com/Ralim/ts100/blob/master/Translation%20Editor/TranslationEditor.html).
-Currently translations are compiled in at compile time with #defines (nothing complex).
+
-So all you need to do is add another section formatted like the english one that is there and either create a pull request or a github issue for inclusion.
+[Open a reference language file and optionally a target language file](https://github.com/Ralim/ts100/tree/master/Translation%20Editor).
-If the glyphs required already exist in the fonts then support should be quick. Otherwise it may take longer for the fonts to be created.
+
+You can create an issue with your updated json translation, or make your own pull request. If you make a pull request, also run `python3 make_translation.py` to regenerate the source file.

workspace/TS100/.cproject

@@ -36,6 +36,7 @@
 								</option>
 								<option id="gnu.c.compiler.option.preprocessor.def.symbols.2127531885" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="STM32F103T8Ux"/>
+									<listOptionValue builtIn="false" value="MODEL_TS100"/>
 									<listOptionValue builtIn="false" value="STM32F1"/>
 									<listOptionValue builtIn="false" value="STM32"/>
 									<listOptionValue builtIn="false" value="DEBUG"/>
@@ -44,7 +45,7 @@
 									<listOptionValue builtIn="false" value="USE_RTOS_SYSTICK"/>
 								</option>
 								<option id="gnu.c.compiler.option.dialect.std.565083189" name="Language standard" superClass="gnu.c.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.c.compiler.dialect.default" valueType="enumerated"/>
-								<option id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.fdata.338139343" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.fdata" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<option id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.fdata.338139343" name="Place the data in their own section (-fdata-sections)" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.fdata" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 								<inputType id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.c.176392389" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.c"/>
 								<inputType id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.s.893418158" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.s"/>
 							</tool>
@@ -63,6 +64,7 @@
 								</option>
 								<option id="gnu.cpp.compiler.option.preprocessor.def.766879664" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="STM32F103T8Ux"/>
+									<listOptionValue builtIn="false" value="MODEL_TS100"/>
 									<listOptionValue builtIn="false" value="STM32F1"/>
 									<listOptionValue builtIn="false" value="STM32"/>
 									<listOptionValue builtIn="false" value="DEBUG"/>
@@ -71,7 +73,7 @@
 									<listOptionValue builtIn="false" value="USE_RTOS_SYSTICK"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.dialect.std.1681974405" name="Language standard" superClass="gnu.cpp.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.cpp.compiler.dialect.default" valueType="enumerated"/>
-								<option id="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.fdata.1463726438" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.fdata" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<option id="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.fdata.1463726438" name="Place the data in their own section (-fdata-sections)" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.fdata" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 								<inputType id="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.input.cpp.149685854" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.input.cpp"/>
 								<inputType id="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.input.s.1092052043" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.input.s"/>
 							</tool>
@@ -99,6 +101,7 @@
 							</tool>
 						</toolChain>
 					</folderInfo>
+					<fileInfo id="fr.ac6.managedbuild.config.gnu.cross.exe.debug.1352500998.1352310611" name="LIS2DH12.hpp" rcbsApplicability="disable" resourcePath="inc/LIS2DH12.hpp" toolsToInvoke=""/>
 					<sourceEntries>
 						<entry excluding="Src/stm32f1xx_hal_timebase_tim_template.c|Src/stm32f1xx_hal_timebase_rtc_wakeup_template.c|Src/stm32f1xx_hal_timebase_rtc_alarm_template.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="HAL_Driver"/>
 						<entry excluding="Third_Party/FreeRTOS/Source/portable/MemMang/heap_1.c|Third_Party/FreeRTOS/Source/portable/MemMang/heap_2.c|Third_Party/FreeRTOS/Source/portable/MemMang/heap_3.c|Third_Party/FreeRTOS/Source/portable/MemMang/heap_5.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Middlewares"/>

workspace/TS100/HAL_Driver/Inc/stm32_assert_template.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32_assert.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   STM32 assert template file.
   *          This file should be copied to the application folder and renamed
   *          to stm32_assert.h.
@@ -42,7 +40,7 @@
 #define __STM32_ASSERT_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Exported types ------------------------------------------------------------*/
@@ -58,11 +56,11 @@
   *         If expr is true, it returns no value.
   * @retval None
   */
-  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+#define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
 /* Exported functions ------------------------------------------------------- */
-  void assert_failed(uint8_t* file, uint32_t line);
+void assert_failed(uint8_t *file, uint32_t line);
 #else
-  #define assert_param(expr) ((void)0U)
+#define assert_param(expr) ((void)0U)
 #endif /* USE_FULL_ASSERT */
 
 #ifdef __cplusplus

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal.h

@@ -2,9 +2,7 @@
   ******************************************************************************
   * @file    stm32f1xx_hal.h
   * @author  MCD Application Team
-  * @version V1.1.1
+  * @brief   This file contains all the functions prototypes for the HAL
-  * @date    12-May-2017
-  * @brief   This file contains all the functions prototypes for the HAL 
   *          module driver.
   ******************************************************************************
   * @attention
@@ -34,14 +32,14 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   *
   ******************************************************************************
-  */ 
+  */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32F1xx_HAL_H
 #define __STM32F1xx_HAL_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -53,44 +51,67 @@
 
 /** @addtogroup HAL
   * @{
-  */ 
+  */
 
-/* Exported types ------------------------------------------------------------*/
 /* Exported constants --------------------------------------------------------*/
 
+/** @defgroup HAL_Exported_Constants HAL Exported Constants
+  * @{
+  */
+
+/** @defgroup HAL_TICK_FREQ Tick Frequency
+  * @{
+  */
+typedef enum
+{
+  HAL_TICK_FREQ_10HZ         = 100U,
+  HAL_TICK_FREQ_100HZ        = 10U,
+  HAL_TICK_FREQ_1KHZ         = 1U,
+  HAL_TICK_FREQ_DEFAULT      = HAL_TICK_FREQ_1KHZ
+} HAL_TickFreqTypeDef;
+/**
+  * @}
+  */
+/* Exported types ------------------------------------------------------------*/
+extern uint32_t uwTickPrio;
+extern HAL_TickFreqTypeDef uwTickFreq;
+
+/**
+  * @}
+  */
 /* Exported macro ------------------------------------------------------------*/
 /** @defgroup HAL_Exported_Macros HAL Exported Macros
   * @{
   */
 
 /** @defgroup DBGMCU_Freeze_Unfreeze Freeze Unfreeze Peripherals in Debug mode
-  * @brief   Freeze/Unfreeze Peripherals in Debug mode 
+  * @brief   Freeze/Unfreeze Peripherals in Debug mode
   * Note: On devices STM32F10xx8 and STM32F10xxB,
   *                  STM32F101xC/D/E and STM32F103xC/D/E,
   *                  STM32F101xF/G and STM32F103xF/G
   *                  STM32F10xx4 and STM32F10xx6
-  *       Debug registers DBGMCU_IDCODE and DBGMCU_CR are accessible only in 
+  *       Debug registers DBGMCU_IDCODE and DBGMCU_CR are accessible only in
   *       debug mode (not accessible by the user software in normal mode).
   *       Refer to errata sheet of these devices for more details.
   * @{
   */
-   
+
 /* Peripherals on APB1 */
 /**
-  * @brief  TIM2 Peripherals Debug mode 
+  * @brief  TIM2 Peripherals Debug mode
   */
 #define __HAL_DBGMCU_FREEZE_TIM2()            SET_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM2_STOP)
 #define __HAL_DBGMCU_UNFREEZE_TIM2()          CLEAR_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM2_STOP)
 
 /**
-  * @brief  TIM3 Peripherals Debug mode 
+  * @brief  TIM3 Peripherals Debug mode
   */
 #define __HAL_DBGMCU_FREEZE_TIM3()            SET_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM3_STOP)
 #define __HAL_DBGMCU_UNFREEZE_TIM3()          CLEAR_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM3_STOP)
 
 #if defined (DBGMCU_CR_DBG_TIM4_STOP)
 /**
-  * @brief  TIM4 Peripherals Debug mode 
+  * @brief  TIM4 Peripherals Debug mode
   */
 #define __HAL_DBGMCU_FREEZE_TIM4()            SET_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM4_STOP)
 #define __HAL_DBGMCU_UNFREEZE_TIM4()          CLEAR_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM4_STOP)
@@ -98,7 +119,7 @@
 
 #if defined (DBGMCU_CR_DBG_TIM5_STOP)
 /**
-  * @brief  TIM5 Peripherals Debug mode 
+  * @brief  TIM5 Peripherals Debug mode
   */
 #define __HAL_DBGMCU_FREEZE_TIM5()            SET_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM5_STOP)
 #define __HAL_DBGMCU_UNFREEZE_TIM5()          CLEAR_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM5_STOP)
@@ -106,7 +127,7 @@
 
 #if defined (DBGMCU_CR_DBG_TIM6_STOP)
 /**
-  * @brief  TIM6 Peripherals Debug mode 
+  * @brief  TIM6 Peripherals Debug mode
   */
 #define __HAL_DBGMCU_FREEZE_TIM6()            SET_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM6_STOP)
 #define __HAL_DBGMCU_UNFREEZE_TIM6()          CLEAR_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM6_STOP)
@@ -114,7 +135,7 @@
 
 #if defined (DBGMCU_CR_DBG_TIM7_STOP)
 /**
-  * @brief  TIM7 Peripherals Debug mode 
+  * @brief  TIM7 Peripherals Debug mode
   */
 #define __HAL_DBGMCU_FREEZE_TIM7()            SET_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM7_STOP)
 #define __HAL_DBGMCU_UNFREEZE_TIM7()          CLEAR_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM7_STOP)
@@ -122,7 +143,7 @@
 
 #if defined (DBGMCU_CR_DBG_TIM12_STOP)
 /**
-  * @brief  TIM12 Peripherals Debug mode 
+  * @brief  TIM12 Peripherals Debug mode
   */
 #define __HAL_DBGMCU_FREEZE_TIM12()            SET_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM12_STOP)
 #define __HAL_DBGMCU_UNFREEZE_TIM12()          CLEAR_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM12_STOP)
@@ -130,7 +151,7 @@
 
 #if defined (DBGMCU_CR_DBG_TIM13_STOP)
 /**
-  * @brief  TIM13 Peripherals Debug mode 
+  * @brief  TIM13 Peripherals Debug mode
   */
 #define __HAL_DBGMCU_FREEZE_TIM13()            SET_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM13_STOP)
 #define __HAL_DBGMCU_UNFREEZE_TIM13()          CLEAR_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM13_STOP)
@@ -138,33 +159,33 @@
 
 #if defined (DBGMCU_CR_DBG_TIM14_STOP)
 /**
-  * @brief  TIM14 Peripherals Debug mode 
+  * @brief  TIM14 Peripherals Debug mode
   */
 #define __HAL_DBGMCU_FREEZE_TIM14()            SET_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM14_STOP)
 #define __HAL_DBGMCU_UNFREEZE_TIM14()          CLEAR_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM14_STOP)
 #endif
 
 /**
-  * @brief  WWDG Peripherals Debug mode 
+  * @brief  WWDG Peripherals Debug mode
   */
 #define __HAL_DBGMCU_FREEZE_WWDG()            SET_BIT(DBGMCU->CR, DBGMCU_CR_DBG_WWDG_STOP)
 #define __HAL_DBGMCU_UNFREEZE_WWDG()          CLEAR_BIT(DBGMCU->CR, DBGMCU_CR_DBG_WWDG_STOP)
 
 /**
-  * @brief  IWDG Peripherals Debug mode 
+  * @brief  IWDG Peripherals Debug mode
   */
 #define __HAL_DBGMCU_FREEZE_IWDG()            SET_BIT(DBGMCU->CR, DBGMCU_CR_DBG_IWDG_STOP)
 #define __HAL_DBGMCU_UNFREEZE_IWDG()          CLEAR_BIT(DBGMCU->CR, DBGMCU_CR_DBG_IWDG_STOP)
 
 /**
-  * @brief  I2C1 Peripherals Debug mode 
+  * @brief  I2C1 Peripherals Debug mode
   */
 #define __HAL_DBGMCU_FREEZE_I2C1_TIMEOUT()    SET_BIT(DBGMCU->CR, DBGMCU_CR_DBG_I2C1_SMBUS_TIMEOUT)
 #define __HAL_DBGMCU_UNFREEZE_I2C1_TIMEOUT()  CLEAR_BIT(DBGMCU->CR, DBGMCU_CR_DBG_I2C1_SMBUS_TIMEOUT)
 
 #if defined (DBGMCU_CR_DBG_I2C2_SMBUS_TIMEOUT)
 /**
-  * @brief  I2C2 Peripherals Debug mode 
+  * @brief  I2C2 Peripherals Debug mode
   */
 #define __HAL_DBGMCU_FREEZE_I2C2_TIMEOUT()    SET_BIT(DBGMCU->CR, DBGMCU_CR_DBG_I2C2_SMBUS_TIMEOUT)
 #define __HAL_DBGMCU_UNFREEZE_I2C2_TIMEOUT()  CLEAR_BIT(DBGMCU->CR, DBGMCU_CR_DBG_I2C2_SMBUS_TIMEOUT)
@@ -172,7 +193,7 @@
 
 #if defined (DBGMCU_CR_DBG_CAN1_STOP)
 /**
-  * @brief  CAN1 Peripherals Debug mode 
+  * @brief  CAN1 Peripherals Debug mode
   */
 #define __HAL_DBGMCU_FREEZE_CAN1()            SET_BIT(DBGMCU->CR, DBGMCU_CR_DBG_CAN1_STOP)
 #define __HAL_DBGMCU_UNFREEZE_CAN1()          CLEAR_BIT(DBGMCU->CR, DBGMCU_CR_DBG_CAN1_STOP)
@@ -180,16 +201,16 @@
 
 #if defined (DBGMCU_CR_DBG_CAN2_STOP)
 /**
-  * @brief  CAN2 Peripherals Debug mode 
+  * @brief  CAN2 Peripherals Debug mode
   */
 #define __HAL_DBGMCU_FREEZE_CAN2()            SET_BIT(DBGMCU->CR, DBGMCU_CR_DBG_CAN2_STOP)
 #define __HAL_DBGMCU_UNFREEZE_CAN2()          CLEAR_BIT(DBGMCU->CR, DBGMCU_CR_DBG_CAN2_STOP)
-#endif   
+#endif
-   
+
 /* Peripherals on APB2 */
 #if defined (DBGMCU_CR_DBG_TIM1_STOP)
 /**
-  * @brief  TIM1 Peripherals Debug mode 
+  * @brief  TIM1 Peripherals Debug mode
   */
 #define __HAL_DBGMCU_FREEZE_TIM1()            SET_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM1_STOP)
 #define __HAL_DBGMCU_UNFREEZE_TIM1()          CLEAR_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM1_STOP)
@@ -197,7 +218,7 @@
 
 #if defined (DBGMCU_CR_DBG_TIM8_STOP)
 /**
-  * @brief  TIM8 Peripherals Debug mode 
+  * @brief  TIM8 Peripherals Debug mode
   */
 #define __HAL_DBGMCU_FREEZE_TIM8()            SET_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM8_STOP)
 #define __HAL_DBGMCU_UNFREEZE_TIM8()          CLEAR_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM8_STOP)
@@ -205,7 +226,7 @@
 
 #if defined (DBGMCU_CR_DBG_TIM9_STOP)
 /**
-  * @brief  TIM9 Peripherals Debug mode 
+  * @brief  TIM9 Peripherals Debug mode
   */
 #define __HAL_DBGMCU_FREEZE_TIM9()            SET_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM9_STOP)
 #define __HAL_DBGMCU_UNFREEZE_TIM9()          CLEAR_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM9_STOP)
@@ -213,7 +234,7 @@
 
 #if defined (DBGMCU_CR_DBG_TIM10_STOP)
 /**
-  * @brief  TIM10 Peripherals Debug mode 
+  * @brief  TIM10 Peripherals Debug mode
   */
 #define __HAL_DBGMCU_FREEZE_TIM10()            SET_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM10_STOP)
 #define __HAL_DBGMCU_UNFREEZE_TIM10()          CLEAR_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM10_STOP)
@@ -221,7 +242,7 @@
 
 #if defined (DBGMCU_CR_DBG_TIM11_STOP)
 /**
-  * @brief  TIM11 Peripherals Debug mode 
+  * @brief  TIM11 Peripherals Debug mode
   */
 #define __HAL_DBGMCU_FREEZE_TIM11()            SET_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM11_STOP)
 #define __HAL_DBGMCU_UNFREEZE_TIM11()          CLEAR_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM11_STOP)
@@ -230,7 +251,7 @@
 
 #if defined (DBGMCU_CR_DBG_TIM15_STOP)
 /**
-  * @brief  TIM15 Peripherals Debug mode 
+  * @brief  TIM15 Peripherals Debug mode
   */
 #define __HAL_DBGMCU_FREEZE_TIM15()            SET_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM15_STOP)
 #define __HAL_DBGMCU_UNFREEZE_TIM15()          CLEAR_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM15_STOP)
@@ -238,7 +259,7 @@
 
 #if defined (DBGMCU_CR_DBG_TIM16_STOP)
 /**
-  * @brief  TIM16 Peripherals Debug mode 
+  * @brief  TIM16 Peripherals Debug mode
   */
 #define __HAL_DBGMCU_FREEZE_TIM16()            SET_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM16_STOP)
 #define __HAL_DBGMCU_UNFREEZE_TIM16()          CLEAR_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM16_STOP)
@@ -246,7 +267,7 @@
 
 #if defined (DBGMCU_CR_DBG_TIM17_STOP)
 /**
-  * @brief  TIM17 Peripherals Debug mode 
+  * @brief  TIM17 Peripherals Debug mode
   */
 #define __HAL_DBGMCU_FREEZE_TIM17()            SET_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM17_STOP)
 #define __HAL_DBGMCU_UNFREEZE_TIM17()          CLEAR_BIT(DBGMCU->CR, DBGMCU_CR_DBG_TIM17_STOP)
@@ -256,6 +277,12 @@
   * @}
   */
 
+/** @defgroup HAL_Private_Macros HAL Private Macros
+  * @{
+  */
+#define IS_TICKFREQ(FREQ) (((FREQ) == HAL_TICK_FREQ_10HZ)  || \
+                           ((FREQ) == HAL_TICK_FREQ_100HZ) || \
+                           ((FREQ) == HAL_TICK_FREQ_1KHZ))
 /**
   * @}
   */
@@ -272,7 +299,7 @@ HAL_StatusTypeDef HAL_Init(void);
 HAL_StatusTypeDef HAL_DeInit(void);
 void HAL_MspInit(void);
 void HAL_MspDeInit(void);
-HAL_StatusTypeDef HAL_InitTick (uint32_t TickPriority);
+HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority);
 /**
   * @}
   */
@@ -282,8 +309,11 @@ HAL_StatusTypeDef HAL_InitTick (uint32_t TickPriority);
   */
 /* Peripheral Control functions  ************************************************/
 void HAL_IncTick(void);
-void HAL_Delay(__IO uint32_t Delay);
+void HAL_Delay(uint32_t Delay);
 uint32_t HAL_GetTick(void);
+uint32_t HAL_GetTickPrio(void);
+HAL_StatusTypeDef HAL_SetTickFreq(HAL_TickFreqTypeDef Freq);
+HAL_TickFreqTypeDef HAL_GetTickFreq(void);
 void HAL_SuspendTick(void);
 void HAL_ResumeTick(void);
 uint32_t HAL_GetHalVersion(void);
@@ -326,8 +356,8 @@ void HAL_GetUID(uint32_t *UID);
 
 /**
   * @}
-  */ 
+  */
-  
+
 #ifdef __cplusplus
 }
 #endif

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_adc.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_adc.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file containing functions prototypes of ADC HAL library.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_adc_ex.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_adc_ex.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of ADC HAL extension module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_cec.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_cec.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of CEC HAL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_conf_template.h

@@ -0,0 +1,386 @@
+/**
+  ******************************************************************************
+  * @file    stm32f1xx_hal_conf.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration template file.
+  *          This file should be copied to the application folder and renamed
+  *          to stm32f1xx_hal_conf.h.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; COPYRIGHT(c) 2017 STMicroelectronics</center></h2>
+  *
+  * Redistribution and use in source and binary forms, with or without modification,
+  * are permitted provided that the following conditions are met:
+  *   1. Redistributions of source code must retain the above copyright notice,
+  *      this list of conditions and the following disclaimer.
+  *   2. Redistributions in binary form must reproduce the above copyright notice,
+  *      this list of conditions and the following disclaimer in the documentation
+  *      and/or other materials provided with the distribution.
+  *   3. Neither the name of STMicroelectronics nor the names of its contributors
+  *      may be used to endorse or promote products derived from this software
+  *      without specific prior written permission.
+  *
+  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __STM32F1xx_HAL_CONF_H
+#define __STM32F1xx_HAL_CONF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+#define HAL_ADC_MODULE_ENABLED
+#define HAL_CAN_MODULE_ENABLED
+/* #define HAL_CAN_LEGACY_MODULE_ENABLED */
+#define HAL_CEC_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+#define HAL_CRC_MODULE_ENABLED
+#define HAL_DAC_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_ETH_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_HCD_MODULE_ENABLED
+#define HAL_I2C_MODULE_ENABLED
+#define HAL_I2S_MODULE_ENABLED
+#define HAL_IRDA_MODULE_ENABLED
+#define HAL_IWDG_MODULE_ENABLED
+#define HAL_NAND_MODULE_ENABLED
+#define HAL_NOR_MODULE_ENABLED
+#define HAL_PCCARD_MODULE_ENABLED
+#define HAL_PCD_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+#define HAL_RTC_MODULE_ENABLED
+#define HAL_SD_MODULE_ENABLED
+#define HAL_SMARTCARD_MODULE_ENABLED
+#define HAL_SPI_MODULE_ENABLED
+#define HAL_SRAM_MODULE_ENABLED
+#define HAL_TIM_MODULE_ENABLED
+#define HAL_UART_MODULE_ENABLED
+#define HAL_USART_MODULE_ENABLED
+#define HAL_WWDG_MODULE_ENABLED
+#define HAL_MMC_MODULE_ENABLED
+
+/* ########################## Oscillator Values adaptation ####################*/
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSE_VALUE)
+#if defined(USE_STM3210C_EVAL)
+#define HSE_VALUE    25000000U /*!< Value of the External oscillator in Hz */
+#else
+#define HSE_VALUE    8000000U /*!< Value of the External oscillator in Hz */
+#endif
+#endif /* HSE_VALUE */
+
+#if !defined  (HSE_STARTUP_TIMEOUT)
+#define HSE_STARTUP_TIMEOUT    100U      /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSI_VALUE)
+#define HSI_VALUE              8000000U  /*!< Value of the Internal oscillator in Hz */
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined  (LSI_VALUE)
+#define LSI_VALUE               32000U     /*!< LSI Typical Value in Hz */
+#endif /* LSI_VALUE */                     /*!< Value of the Internal Low Speed oscillator in Hz
+                                                The real value may vary depending on the variations
+                                                in voltage and temperature. */
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  *        This value is used by the UART, RTC HAL module to compute the system frequency
+  */
+#if !defined  (LSE_VALUE)
+#define LSE_VALUE               32768U    /*!< Value of the External Low Speed oscillator in Hz */
+#endif /* LSE_VALUE */
+
+#if !defined  (LSE_STARTUP_TIMEOUT)
+#define LSE_STARTUP_TIMEOUT    5000U     /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE                    3300U /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY            0x0FU /*!< tick interrupt priority */
+#define  USE_RTOS                     0U
+#define  PREFETCH_ENABLE              1U
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1U */
+
+/* ################## Ethernet peripheral configuration ##################### */
+
+/* Section 1 : Ethernet peripheral configuration */
+
+/* MAC ADDRESS: MAC_ADDR0:MAC_ADDR1:MAC_ADDR2:MAC_ADDR3:MAC_ADDR4:MAC_ADDR5 */
+#define MAC_ADDR0   2U
+#define MAC_ADDR1   0U
+#define MAC_ADDR2   0U
+#define MAC_ADDR3   0U
+#define MAC_ADDR4   0U
+#define MAC_ADDR5   0U
+
+/* Definition of the Ethernet driver buffers size and count */
+#define ETH_RX_BUF_SIZE                ETH_MAX_PACKET_SIZE /* buffer size for receive               */
+#define ETH_TX_BUF_SIZE                ETH_MAX_PACKET_SIZE /* buffer size for transmit              */
+#define ETH_RXBUFNB                    8U                  /* 8 Rx buffers of size ETH_RX_BUF_SIZE  */
+#define ETH_TXBUFNB                    4U                  /* 4 Tx buffers of size ETH_TX_BUF_SIZE  */
+
+/* Section 2: PHY configuration section */
+
+/* DP83848 PHY Address*/
+#define DP83848_PHY_ADDRESS             0x01U
+/* PHY Reset delay these values are based on a 1 ms Systick interrupt*/
+#define PHY_RESET_DELAY                 0x000000FFU
+/* PHY Configuration delay */
+#define PHY_CONFIG_DELAY                0x00000FFFU
+
+#define PHY_READ_TO                     0x0000FFFFU
+#define PHY_WRITE_TO                    0x0000FFFFU
+
+/* Section 3: Common PHY Registers */
+
+#define PHY_BCR                         ((uint16_t)0x0000)  /*!< Transceiver Basic Control Register   */
+#define PHY_BSR                         ((uint16_t)0x0001)  /*!< Transceiver Basic Status Register    */
+
+#define PHY_RESET                       ((uint16_t)0x8000)  /*!< PHY Reset */
+#define PHY_LOOPBACK                    ((uint16_t)0x4000)  /*!< Select loop-back mode */
+#define PHY_FULLDUPLEX_100M             ((uint16_t)0x2100)  /*!< Set the full-duplex mode at 100 Mb/s */
+#define PHY_HALFDUPLEX_100M             ((uint16_t)0x2000)  /*!< Set the half-duplex mode at 100 Mb/s */
+#define PHY_FULLDUPLEX_10M              ((uint16_t)0x0100)  /*!< Set the full-duplex mode at 10 Mb/s  */
+#define PHY_HALFDUPLEX_10M              ((uint16_t)0x0000)  /*!< Set the half-duplex mode at 10 Mb/s  */
+#define PHY_AUTONEGOTIATION             ((uint16_t)0x1000)  /*!< Enable auto-negotiation function     */
+#define PHY_RESTART_AUTONEGOTIATION     ((uint16_t)0x0200)  /*!< Restart auto-negotiation function    */
+#define PHY_POWERDOWN                   ((uint16_t)0x0800)  /*!< Select the power down mode           */
+#define PHY_ISOLATE                     ((uint16_t)0x0400)  /*!< Isolate PHY from MII                 */
+
+#define PHY_AUTONEGO_COMPLETE           ((uint16_t)0x0020)  /*!< Auto-Negotiation process completed   */
+#define PHY_LINKED_STATUS               ((uint16_t)0x0004)  /*!< Valid link established               */
+#define PHY_JABBER_DETECTION            ((uint16_t)0x0002)  /*!< Jabber condition detected            */
+
+/* Section 4: Extended PHY Registers */
+
+#define PHY_SR                          ((uint16_t)0x0010)  /*!< PHY status register Offset                      */
+#define PHY_MICR                        ((uint16_t)0x0011)  /*!< MII Interrupt Control Register                  */
+#define PHY_MISR                        ((uint16_t)0x0012)  /*!< MII Interrupt Status and Misc. Control Register */
+
+#define PHY_LINK_STATUS                 ((uint16_t)0x0001)  /*!< PHY Link mask                                   */
+#define PHY_SPEED_STATUS                ((uint16_t)0x0002)  /*!< PHY Speed mask                                  */
+#define PHY_DUPLEX_STATUS               ((uint16_t)0x0004)  /*!< PHY Duplex mask                                 */
+
+#define PHY_MICR_INT_EN                 ((uint16_t)0x0002)  /*!< PHY Enable interrupts                           */
+#define PHY_MICR_INT_OE                 ((uint16_t)0x0001)  /*!< PHY Enable output interrupt events              */
+
+#define PHY_MISR_LINK_INT_EN            ((uint16_t)0x0020)  /*!< Enable Interrupt on change of link status       */
+#define PHY_LINK_INTERRUPT              ((uint16_t)0x2000)  /*!< PHY link status interrupt mask                  */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+* Activated: CRC code is present inside driver
+* Deactivated: CRC code cleaned from driver
+*/
+
+#define USE_SPI_CRC                     1U
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+#include "stm32f1xx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+#include "stm32f1xx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_DMA_MODULE_ENABLED
+#include "stm32f1xx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_ETH_MODULE_ENABLED
+#include "stm32f1xx_hal_eth.h"
+#endif /* HAL_ETH_MODULE_ENABLED */
+
+#ifdef HAL_CAN_MODULE_ENABLED
+#include "stm32f1xx_hal_can.h"
+#endif /* HAL_CAN_MODULE_ENABLED */
+
+#ifdef HAL_CAN_LEGACY_MODULE_ENABLED
+  #include "Legacy/stm32f1xx_hal_can_legacy.h"
+#endif /* HAL_CAN_LEGACY_MODULE_ENABLED */
+
+#ifdef HAL_CEC_MODULE_ENABLED
+#include "stm32f1xx_hal_cec.h"
+#endif /* HAL_CEC_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+#include "stm32f1xx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+#include "stm32f1xx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+#include "stm32f1xx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+#include "stm32f1xx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+#include "stm32f1xx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_SRAM_MODULE_ENABLED
+#include "stm32f1xx_hal_sram.h"
+#endif /* HAL_SRAM_MODULE_ENABLED */
+
+#ifdef HAL_NOR_MODULE_ENABLED
+#include "stm32f1xx_hal_nor.h"
+#endif /* HAL_NOR_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+#include "stm32f1xx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+#include "stm32f1xx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+#include "stm32f1xx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+#include "stm32f1xx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+#include "stm32f1xx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_PCCARD_MODULE_ENABLED
+#include "stm32f1xx_hal_pccard.h"
+#endif /* HAL_PCCARD_MODULE_ENABLED */
+
+#ifdef HAL_SD_MODULE_ENABLED
+#include "stm32f1xx_hal_sd.h"
+#endif /* HAL_SD_MODULE_ENABLED */
+
+#ifdef HAL_NAND_MODULE_ENABLED
+#include "stm32f1xx_hal_nand.h"
+#endif /* HAL_NAND_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+#include "stm32f1xx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+#include "stm32f1xx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+#include "stm32f1xx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+#include "stm32f1xx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+#include "stm32f1xx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+#include "stm32f1xx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+#include "stm32f1xx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+#ifdef HAL_PCD_MODULE_ENABLED
+#include "stm32f1xx_hal_pcd.h"
+#endif /* HAL_PCD_MODULE_ENABLED */
+
+#ifdef HAL_HCD_MODULE_ENABLED
+#include "stm32f1xx_hal_hcd.h"
+#endif /* HAL_HCD_MODULE_ENABLED */
+
+#ifdef HAL_MMC_MODULE_ENABLED
+#include "stm32f1xx_hal_mmc.h"
+#endif /* HAL_MMC_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef  USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param  expr: If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+#define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+void assert_failed(uint8_t *file, uint32_t line);
+#else
+#define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __STM32F1xx_HAL_CONF_H */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_cortex.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_cortex.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of CORTEX HAL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_crc.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_crc.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of CRC HAL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_dac.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_dac.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of DAC HAL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_dac_ex.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_dac_ex.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of DAC HAL Extension module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_def.h

@@ -2,10 +2,8 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_def.h
   * @author  MCD Application Team
-  * @version V1.1.1
+  * @brief   This file contains HAL common defines, enumeration, macros and
-  * @date    12-May-2017
+  *          structures definitions.
-  * @brief   This file contains HAL common defines, enumeration, macros and 
-  *          structures definitions. 
   ******************************************************************************
   * @attention
   *
@@ -41,7 +39,7 @@
 #define __STM32F1xx_HAL_DEF
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -53,10 +51,10 @@
 
 /* Exported types ------------------------------------------------------------*/
 
-/** 
+/**
-  * @brief  HAL Status structures definition  
+  * @brief  HAL Status structures definition
-  */  
+  */
-typedef enum 
+typedef enum
 {
   HAL_OK       = 0x00U,
   HAL_ERROR    = 0x01U,
@@ -64,20 +62,20 @@ typedef enum
   HAL_TIMEOUT  = 0x03U
 } HAL_StatusTypeDef;
 
-/** 
+/**
-  * @brief  HAL Lock structures definition  
+  * @brief  HAL Lock structures definition
   */
-typedef enum 
+typedef enum
 {
   HAL_UNLOCKED = 0x00U,
-  HAL_LOCKED   = 0x01U  
+  HAL_LOCKED   = 0x01U
 } HAL_LockTypeDef;
 
 /* Exported macro ------------------------------------------------------------*/
 #define HAL_MAX_DELAY      0xFFFFFFFFU
 
-#define HAL_IS_BIT_SET(REG, BIT)         (((REG) & (BIT)) != RESET)
+#define HAL_IS_BIT_SET(REG, BIT)         (((REG) & (BIT)) != 0U)
-#define HAL_IS_BIT_CLR(REG, BIT)         (((REG) & (BIT)) == RESET)
+#define HAL_IS_BIT_CLR(REG, BIT)         (((REG) & (BIT)) == 0U)
 
 #define __HAL_LINKDMA(__HANDLE__, __PPP_DMA_FIELD__, __DMA_HANDLE__)               \
                         do{                                                      \
@@ -85,15 +83,15 @@ typedef enum
                               (__DMA_HANDLE__).Parent = (__HANDLE__);             \
                           } while(0U)
 
-#define UNUSED(x) ((void)(x))
+#define UNUSED(X) (void)X      /* To avoid gcc/g++ warnings */
 
 /** @brief Reset the Handle's State field.
   * @param __HANDLE__: specifies the Peripheral Handle.
-  * @note  This macro can be used for the following purpose: 
+  * @note  This macro can be used for the following purpose:
   *          - When the Handle is declared as local variable; before passing it as parameter
-  *            to HAL_PPP_Init() for the first time, it is mandatory to use this macro 
+  *            to HAL_PPP_Init() for the first time, it is mandatory to use this macro
   *            to set to 0 the Handle's "State" field.
-  *            Otherwise, "State" field may have any random value and the first time the function 
+  *            Otherwise, "State" field may have any random value and the first time the function
   *            HAL_PPP_Init() is called, the low level hardware initialization will be missed
   *            (i.e. HAL_PPP_MspInit() will not be executed).
   *          - When there is a need to reconfigure the low level hardware: instead of calling
@@ -105,10 +103,10 @@ typedef enum
 #define __HAL_RESET_HANDLE_STATE(__HANDLE__) ((__HANDLE__)->State = 0U)
 
 #if (USE_RTOS == 1U)
-  /* Reserved for future use */
+/* Reserved for future use */
-  #error "USE_RTOS should be 0 in the current HAL release"
+#error "USE_RTOS should be 0 in the current HAL release"
 #else
-  #define __HAL_LOCK(__HANDLE__)                                           \
+#define __HAL_LOCK(__HANDLE__)                                           \
                                 do{                                        \
                                     if((__HANDLE__)->Lock == HAL_LOCKED)   \
                                     {                                      \
@@ -120,82 +118,82 @@ typedef enum
                                     }                                      \
                                   }while (0U)
 
-  #define __HAL_UNLOCK(__HANDLE__)                                          \
+#define __HAL_UNLOCK(__HANDLE__)                                          \
                                   do{                                       \
                                       (__HANDLE__)->Lock = HAL_UNLOCKED;    \
                                     }while (0U)
 #endif /* USE_RTOS */
 
-#if  defined ( __GNUC__ )
+#if defined ( __GNUC__ ) && !defined (__CC_ARM) /* GNU Compiler */
-  #ifndef __weak
+#ifndef __weak
-    #define __weak   __attribute__((weak))
+#define __weak   __attribute__((weak))
-  #endif /* __weak */
+#endif /* __weak */
-  #ifndef __packed
+#ifndef __packed
-    #define __packed __attribute__((__packed__))
+#define __packed __attribute__((__packed__))
-  #endif /* __packed */
+#endif /* __packed */
 #endif /* __GNUC__ */
 
 
 /* Macro to get variable aligned on 4-bytes, for __ICCARM__ the directive "#pragma data_alignment=4" must be used instead */
-#if defined   (__GNUC__)        /* GNU Compiler */
+#if defined ( __GNUC__ ) && !defined (__CC_ARM) /* GNU Compiler */
-  #ifndef __ALIGN_END
+#ifndef __ALIGN_END
-    #define __ALIGN_END    __attribute__ ((aligned (4)))
+#define __ALIGN_END    __attribute__ ((aligned (4)))
-  #endif /* __ALIGN_END */
+#endif /* __ALIGN_END */
-  #ifndef __ALIGN_BEGIN  
+#ifndef __ALIGN_BEGIN
-    #define __ALIGN_BEGIN
+#define __ALIGN_BEGIN
-  #endif /* __ALIGN_BEGIN */
+#endif /* __ALIGN_BEGIN */
 #else
-  #ifndef __ALIGN_END
+#ifndef __ALIGN_END
-    #define __ALIGN_END
+#define __ALIGN_END
-  #endif /* __ALIGN_END */
+#endif /* __ALIGN_END */
-  #ifndef __ALIGN_BEGIN      
+#ifndef __ALIGN_BEGIN
-    #if defined   (__CC_ARM)      /* ARM Compiler */
+#if defined   (__CC_ARM)      /* ARM Compiler */
-      #define __ALIGN_BEGIN    __align(4)
+#define __ALIGN_BEGIN    __align(4)
-    #elif defined (__ICCARM__)    /* IAR Compiler */
+#elif defined (__ICCARM__)    /* IAR Compiler */
-      #define __ALIGN_BEGIN 
+#define __ALIGN_BEGIN
-    #endif /* __CC_ARM */
+#endif /* __CC_ARM */
-  #endif /* __ALIGN_BEGIN */
+#endif /* __ALIGN_BEGIN */
 #endif /* __GNUC__ */
 
 
-/** 
+/**
   * @brief  __RAM_FUNC definition
-  */ 
+  */
 #if defined ( __CC_ARM   )
 /* ARM Compiler
    ------------
-   RAM functions are defined using the toolchain options. 
+   RAM functions are defined using the toolchain options.
    Functions that are executed in RAM should reside in a separate source module.
-   Using the 'Options for File' dialog you can simply change the 'Code / Const' 
+   Using the 'Options for File' dialog you can simply change the 'Code / Const'
    area of a module to a memory space in physical RAM.
    Available memory areas are declared in the 'Target' tab of the 'Options for Target'
-   dialog. 
+   dialog.
 */
-#define __RAM_FUNC HAL_StatusTypeDef 
+#define __RAM_FUNC
 
 #elif defined ( __ICCARM__ )
 /* ICCARM Compiler
    ---------------
-   RAM functions are defined using a specific toolchain keyword "__ramfunc". 
+   RAM functions are defined using a specific toolchain keyword "__ramfunc".
 */
-#define __RAM_FUNC __ramfunc HAL_StatusTypeDef
+#define __RAM_FUNC __ramfunc
 
 #elif defined   (  __GNUC__  )
 /* GNU Compiler
    ------------
-  RAM functions are defined using a specific toolchain attribute 
+  RAM functions are defined using a specific toolchain attribute
    "__attribute__((section(".RamFunc")))".
 */
-#define __RAM_FUNC HAL_StatusTypeDef  __attribute__((section(".RamFunc")))
+#define __RAM_FUNC __attribute__((section(".RamFunc")))
 
 #endif
 
-/** 
+/**
   * @brief  __NOINLINE definition
-  */ 
+  */
 #if defined ( __CC_ARM   ) || defined   (  __GNUC__  )
-/* ARM & GNUCompiler 
+/* ARM & GNUCompiler
-   ---------------- 
+   ----------------
 */
 #define __NOINLINE __attribute__ ( (noinline) )
 

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_dma.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_dma.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of DMA HAL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_dma_ex.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of DMA HAL extension module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_flash.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_flash.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of Flash HAL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_flash_ex.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of Flash HAL Extended module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_gpio.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_gpio.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of GPIO HAL module.
   ******************************************************************************
   * @attention
@@ -33,14 +31,14 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   *
   ******************************************************************************
-  */ 
+  */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32F1xx_HAL_GPIO_H
 #define __STM32F1xx_HAL_GPIO_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -52,16 +50,16 @@
 
 /** @addtogroup GPIO
   * @{
-  */ 
+  */
 
 /* Exported types ------------------------------------------------------------*/
 /** @defgroup GPIO_Exported_Types GPIO Exported Types
   * @{
   */
 
-/** 
+/**
-  * @brief GPIO Init structure definition  
+  * @brief GPIO Init structure definition
-  */ 
+  */
 typedef struct
 {
   uint32_t Pin;       /*!< Specifies the GPIO pins to be configured.
@@ -75,16 +73,16 @@ typedef struct
 
   uint32_t Speed;     /*!< Specifies the speed for the selected pins.
                            This parameter can be a value of @ref GPIO_speed_define */
-}GPIO_InitTypeDef;
+} GPIO_InitTypeDef;
 
-/** 
+/**
-  * @brief  GPIO Bit SET and Bit RESET enumeration 
+  * @brief  GPIO Bit SET and Bit RESET enumeration
   */
 typedef enum
 {
   GPIO_PIN_RESET = 0U,
   GPIO_PIN_SET
-}GPIO_PinState;
+} GPIO_PinState;
 /**
   * @}
   */
@@ -93,7 +91,7 @@ typedef enum
 
 /** @defgroup GPIO_Exported_Constants GPIO Exported Constants
   * @{
-  */ 
+  */
 
 /** @defgroup GPIO_pins_define GPIO pins define
   * @{
@@ -122,15 +120,15 @@ typedef enum
   */
 
 /** @defgroup GPIO_mode_define GPIO mode define
-  * @brief GPIO Configuration Mode 
+  * @brief GPIO Configuration Mode
   *        Elements values convention: 0xX0yz00YZ
   *           - X  : GPIO mode or EXTI Mode
-  *           - y  : External IT or Event trigger detection 
+  *           - y  : External IT or Event trigger detection
   *           - z  : IO configuration on External IT or Event
   *           - Y  : Output type (Push Pull or Open Drain)
   *           - Z  : IO Direction mode (Input, Output, Alternate or Analog)
   * @{
-  */ 
+  */
 #define  GPIO_MODE_INPUT                        0x00000000U   /*!< Input Floating Mode                   */
 #define  GPIO_MODE_OUTPUT_PP                    0x00000001U   /*!< Output Push Pull Mode                 */
 #define  GPIO_MODE_OUTPUT_OD                    0x00000011U   /*!< Output Open Drain Mode                */
@@ -139,11 +137,11 @@ typedef enum
 #define  GPIO_MODE_AF_INPUT                     GPIO_MODE_INPUT          /*!< Alternate Function Input Mode         */
 
 #define  GPIO_MODE_ANALOG                       0x00000003U   /*!< Analog Mode  */
-    
+
 #define  GPIO_MODE_IT_RISING                    0x10110000U   /*!< External Interrupt Mode with Rising edge trigger detection          */
 #define  GPIO_MODE_IT_FALLING                   0x10210000U   /*!< External Interrupt Mode with Falling edge trigger detection         */
 #define  GPIO_MODE_IT_RISING_FALLING            0x10310000U   /*!< External Interrupt Mode with Rising/Falling edge trigger detection  */
- 
+
 #define  GPIO_MODE_EVT_RISING                   0x10120000U   /*!< External Event Mode with Rising edge trigger detection               */
 #define  GPIO_MODE_EVT_FALLING                  0x10220000U   /*!< External Event Mode with Falling edge trigger detection              */
 #define  GPIO_MODE_EVT_RISING_FALLING           0x10320000U   /*!< External Event Mode with Rising/Falling edge trigger detection       */
@@ -164,17 +162,17 @@ typedef enum
   * @}
   */
 
- /** @defgroup GPIO_pull_define GPIO pull define
+/** @defgroup GPIO_pull_define GPIO pull define
-   * @brief GPIO Pull-Up or Pull-Down Activation
+  * @brief GPIO Pull-Up or Pull-Down Activation
-   * @{
+  * @{
-   */  
+  */
 #define  GPIO_NOPULL        0x00000000U   /*!< No Pull-up or Pull-down activation  */
 #define  GPIO_PULLUP        0x00000001U   /*!< Pull-up activation                  */
 #define  GPIO_PULLDOWN      0x00000002U   /*!< Pull-down activation                */
 /**
   * @}
   */
-  
+
 /**
   * @}
   */
@@ -249,31 +247,20 @@ void  HAL_GPIO_DeInit(GPIO_TypeDef  *GPIOx, uint32_t GPIO_Pin);
   * @{
   */
 /* IO operation functions *****************************************************/
-GPIO_PinState HAL_GPIO_ReadPin(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin);
+GPIO_PinState HAL_GPIO_ReadPin(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin);
-inline void HAL_GPIO_WritePin(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin, GPIO_PinState PinState)
+void HAL_GPIO_WritePin(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin, GPIO_PinState PinState);
-{
+void HAL_GPIO_TogglePin(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin);
-
+HAL_StatusTypeDef HAL_GPIO_LockPin(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin);
-  if(PinState != GPIO_PIN_RESET)
-  {
-    GPIOx->BSRR = GPIO_Pin;
-  }
-  else
-  {
-    GPIOx->BSRR = (uint32_t)GPIO_Pin << 16U;
-  }
-}
-void HAL_GPIO_TogglePin(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin);
-HAL_StatusTypeDef HAL_GPIO_LockPin(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin);
 void HAL_GPIO_EXTI_IRQHandler(uint16_t GPIO_Pin);
 void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin);
 
 /**
   * @}
-  */ 
+  */
 
 /**
   * @}
-  */ 
+  */
 /* Private types -------------------------------------------------------------*/
 /* Private variables ---------------------------------------------------------*/
 /* Private constants ---------------------------------------------------------*/
@@ -322,7 +309,7 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin);
 
 /**
   * @}
-  */ 
+  */
 
 /**
   * @}

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_gpio_ex.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of GPIO HAL Extension module.
   ******************************************************************************
   * @attention
@@ -33,14 +31,14 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   *
   ******************************************************************************
-  */ 
+  */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32F1xx_HAL_GPIO_EX_H
 #define __STM32F1xx_HAL_GPIO_EX_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -52,25 +50,23 @@
 
 /** @defgroup GPIOEx GPIOEx
   * @{
-  */ 
+  */
-
 /* Exported types ------------------------------------------------------------*/
-
 /* Exported constants --------------------------------------------------------*/
 
 /** @defgroup GPIOEx_Exported_Constants GPIOEx Exported Constants
   * @{
-  */ 
+  */
-  
+
 /** @defgroup GPIOEx_EVENTOUT EVENTOUT Cortex Configuration
   * @brief This section propose definition to use the Cortex EVENTOUT signal.
   * @{
   */
-  
+
-/** @defgroup GPIOEx_EVENTOUT_PIN EVENTOUT Pin 
+/** @defgroup GPIOEx_EVENTOUT_PIN EVENTOUT Pin
   * @{
   */
-  
+
 #define AFIO_EVENTOUT_PIN_0  AFIO_EVCR_PIN_PX0 /*!< EVENTOUT on pin 0 */
 #define AFIO_EVENTOUT_PIN_1  AFIO_EVCR_PIN_PX1 /*!< EVENTOUT on pin 1 */
 #define AFIO_EVENTOUT_PIN_2  AFIO_EVCR_PIN_PX2 /*!< EVENTOUT on pin 2 */
@@ -106,12 +102,12 @@
                                        ((__PIN__) == AFIO_EVENTOUT_PIN_15))
 /**
   * @}
-  */ 
+  */
-  
+
 /** @defgroup GPIOEx_EVENTOUT_PORT EVENTOUT Port
   * @{
   */
-  
+
 #define AFIO_EVENTOUT_PORT_A AFIO_EVCR_PORT_PA /*!< EVENTOUT on port A */
 #define AFIO_EVENTOUT_PORT_B AFIO_EVCR_PORT_PB /*!< EVENTOUT on port B */
 #define AFIO_EVENTOUT_PORT_C AFIO_EVCR_PORT_PC /*!< EVENTOUT on port C */
@@ -126,7 +122,7 @@
 /**
   * @}
   */
-  
+
 /**
   * @}
   */
@@ -135,151 +131,132 @@
   * @brief This section propose definition to remap the alternate function to some other port/pins.
   * @{
   */
-  
+
 /**
   * @brief Enable the remapping of SPI1 alternate function NSS, SCK, MISO and MOSI.
   * @note  ENABLE: Remap     (NSS/PA15, SCK/PB3, MISO/PB4, MOSI/PB5)
   * @retval None
   */
-#define __HAL_AFIO_REMAP_SPI1_ENABLE()  SET_BIT(AFIO->MAPR, AFIO_MAPR_SPI1_REMAP)
+#define __HAL_AFIO_REMAP_SPI1_ENABLE()  AFIO_REMAP_ENABLE(AFIO_MAPR_SPI1_REMAP)
 
 /**
   * @brief Disable the remapping of SPI1 alternate function NSS, SCK, MISO and MOSI.
   * @note  DISABLE: No remap (NSS/PA4,  SCK/PA5, MISO/PA6, MOSI/PA7)
   * @retval None
   */
-#define __HAL_AFIO_REMAP_SPI1_DISABLE() CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_SPI1_REMAP)
+#define __HAL_AFIO_REMAP_SPI1_DISABLE()  AFIO_REMAP_DISABLE(AFIO_MAPR_SPI1_REMAP)
 
 /**
   * @brief Enable the remapping of I2C1 alternate function SCL and SDA.
   * @note  ENABLE: Remap     (SCL/PB8, SDA/PB9)
   * @retval None
   */
-#define __HAL_AFIO_REMAP_I2C1_ENABLE()  SET_BIT(AFIO->MAPR, AFIO_MAPR_I2C1_REMAP)
+#define __HAL_AFIO_REMAP_I2C1_ENABLE()  AFIO_REMAP_ENABLE(AFIO_MAPR_I2C1_REMAP)
 
 /**
   * @brief Disable the remapping of I2C1 alternate function SCL and SDA.
   * @note  DISABLE: No remap (SCL/PB6, SDA/PB7)
   * @retval None
   */
-#define __HAL_AFIO_REMAP_I2C1_DISABLE() CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_I2C1_REMAP)
+#define __HAL_AFIO_REMAP_I2C1_DISABLE() AFIO_REMAP_DISABLE(AFIO_MAPR_I2C1_REMAP)
 
 /**
   * @brief Enable the remapping of USART1 alternate function TX and RX.
   * @note  ENABLE: Remap     (TX/PB6, RX/PB7)
   * @retval None
   */
-#define __HAL_AFIO_REMAP_USART1_ENABLE()  SET_BIT(AFIO->MAPR, AFIO_MAPR_USART1_REMAP)
+#define __HAL_AFIO_REMAP_USART1_ENABLE()  AFIO_REMAP_ENABLE(AFIO_MAPR_USART1_REMAP)
 
 /**
   * @brief Disable the remapping of USART1 alternate function TX and RX.
   * @note  DISABLE: No remap (TX/PA9, RX/PA10)
   * @retval None
   */
-#define __HAL_AFIO_REMAP_USART1_DISABLE() CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_USART1_REMAP)
+#define __HAL_AFIO_REMAP_USART1_DISABLE() AFIO_REMAP_DISABLE(AFIO_MAPR_USART1_REMAP)
 
 /**
   * @brief Enable the remapping of USART2 alternate function CTS, RTS, CK, TX and RX.
   * @note  ENABLE: Remap     (CTS/PD3, RTS/PD4, TX/PD5, RX/PD6, CK/PD7)
   * @retval None
   */
-#define __HAL_AFIO_REMAP_USART2_ENABLE()  SET_BIT(AFIO->MAPR, AFIO_MAPR_USART2_REMAP)
+#define __HAL_AFIO_REMAP_USART2_ENABLE()  AFIO_REMAP_ENABLE(AFIO_MAPR_USART2_REMAP)
 
 /**
   * @brief Disable the remapping of USART2 alternate function CTS, RTS, CK, TX and RX.
   * @note  DISABLE: No remap (CTS/PA0, RTS/PA1, TX/PA2, RX/PA3, CK/PA4)
   * @retval None
   */
-#define __HAL_AFIO_REMAP_USART2_DISABLE() CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_USART2_REMAP)
+#define __HAL_AFIO_REMAP_USART2_DISABLE() AFIO_REMAP_DISABLE(AFIO_MAPR_USART2_REMAP)
 
 /**
   * @brief Enable the remapping of USART3 alternate function CTS, RTS, CK, TX and RX.
   * @note  ENABLE: Full remap     (TX/PD8,  RX/PD9,  CK/PD10, CTS/PD11, RTS/PD12)
   * @retval None
   */
-#define __HAL_AFIO_REMAP_USART3_ENABLE()  do{ CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_USART3_REMAP);            \
+#define __HAL_AFIO_REMAP_USART3_ENABLE()  AFIO_REMAP_PARTIAL(AFIO_MAPR_USART3_REMAP_FULLREMAP, AFIO_MAPR_USART3_REMAP_FULLREMAP)
-                                              SET_BIT(AFIO->MAPR, AFIO_MAPR_USART3_REMAP_FULLREMAP);    \
+
-                                            }while(0U)
 /**
   * @brief Enable the remapping of USART3 alternate function CTS, RTS, CK, TX and RX.
   * @note  PARTIAL: Partial remap (TX/PC10, RX/PC11, CK/PC12, CTS/PB13, RTS/PB14)
   * @retval None
   */
-#define __HAL_AFIO_REMAP_USART3_PARTIAL() do{ CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_USART3_REMAP);            \
+#define __HAL_AFIO_REMAP_USART3_PARTIAL()  AFIO_REMAP_PARTIAL(AFIO_MAPR_USART3_REMAP_PARTIALREMAP, AFIO_MAPR_USART3_REMAP_FULLREMAP)
-                                              SET_BIT(AFIO->MAPR, AFIO_MAPR_USART3_REMAP_PARTIALREMAP); \
-                                            }while(0U)
 
 /**
   * @brief Disable the remapping of USART3 alternate function CTS, RTS, CK, TX and RX.
   * @note  DISABLE: No remap      (TX/PB10, RX/PB11, CK/PB12, CTS/PB13, RTS/PB14)
   * @retval None
   */
-#define __HAL_AFIO_REMAP_USART3_DISABLE() do{ CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_USART3_REMAP);       \
+#define __HAL_AFIO_REMAP_USART3_DISABLE()  AFIO_REMAP_PARTIAL(AFIO_MAPR_USART3_REMAP_NOREMAP, AFIO_MAPR_USART3_REMAP_FULLREMAP)
-                                              SET_BIT(AFIO->MAPR, AFIO_MAPR_USART3_REMAP_NOREMAP); \
-                                            }while(0U)
 
 /**
   * @brief Enable the remapping of TIM1 alternate function channels 1 to 4, 1N to 3N, external trigger (ETR) and Break input (BKIN)
   * @note  ENABLE: Full remap     (ETR/PE7,  CH1/PE9, CH2/PE11, CH3/PE13, CH4/PE14, BKIN/PE15, CH1N/PE8,  CH2N/PE10, CH3N/PE12)
   * @retval None
   */
-#define __HAL_AFIO_REMAP_TIM1_ENABLE()  do{ CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_TIM1_REMAP);         \
+#define __HAL_AFIO_REMAP_TIM1_ENABLE()  AFIO_REMAP_PARTIAL(AFIO_MAPR_TIM1_REMAP_FULLREMAP, AFIO_MAPR_TIM1_REMAP_FULLREMAP)
-                                            SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM1_REMAP_FULLREMAP); \
-                                          }while(0U)
 
 /**
   * @brief Enable the remapping of TIM1 alternate function channels 1 to 4, 1N to 3N, external trigger (ETR) and Break input (BKIN)
   * @note  PARTIAL: Partial remap (ETR/PA12, CH1/PA8, CH2/PA9,  CH3/PA10, CH4/PA11, BKIN/PA6,  CH1N/PA7,  CH2N/PB0,  CH3N/PB1)
   * @retval None
   */
-#define __HAL_AFIO_REMAP_TIM1_PARTIAL()  do{ CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_TIM1_REMAP);            \
+#define __HAL_AFIO_REMAP_TIM1_PARTIAL()  AFIO_REMAP_PARTIAL(AFIO_MAPR_TIM1_REMAP_PARTIALREMAP, AFIO_MAPR_TIM1_REMAP_FULLREMAP)
-                                             SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM1_REMAP_PARTIALREMAP); \
-                                           }while(0U)
 
 /**
   * @brief Disable the remapping of TIM1 alternate function channels 1 to 4, 1N to 3N, external trigger (ETR) and Break input (BKIN)
   * @note  DISABLE: No remap      (ETR/PA12, CH1/PA8, CH2/PA9,  CH3/PA10, CH4/PA11, BKIN/PB12, CH1N/PB13, CH2N/PB14, CH3N/PB15)
   * @retval None
   */
-#define __HAL_AFIO_REMAP_TIM1_DISABLE() do{ CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_TIM1_REMAP);       \
+#define __HAL_AFIO_REMAP_TIM1_DISABLE()  AFIO_REMAP_PARTIAL(AFIO_MAPR_TIM1_REMAP_NOREMAP, AFIO_MAPR_TIM1_REMAP_FULLREMAP)
-                                            SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM1_REMAP_NOREMAP); \
-                                          }while(0U)
 
 /**
   * @brief Enable the remapping of TIM2 alternate function channels 1 to 4 and external trigger (ETR)
   * @note  ENABLE: Full remap       (CH1/ETR/PA15, CH2/PB3, CH3/PB10, CH4/PB11)
   * @retval None
   */
-#define __HAL_AFIO_REMAP_TIM2_ENABLE()  do{ CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_TIM2_REMAP);         \
+#define __HAL_AFIO_REMAP_TIM2_ENABLE()  AFIO_REMAP_PARTIAL(AFIO_MAPR_TIM2_REMAP_FULLREMAP, AFIO_MAPR_TIM2_REMAP_FULLREMAP)
-                                            SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM2_REMAP_FULLREMAP); \
-                                          }while(0U)
 
 /**
   * @brief Enable the remapping of TIM2 alternate function channels 1 to 4 and external trigger (ETR)
   * @note  PARTIAL_2: Partial remap (CH1/ETR/PA0,  CH2/PA1, CH3/PB10, CH4/PB11)
   * @retval None
   */
-#define __HAL_AFIO_REMAP_TIM2_PARTIAL_2()  do{ CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_TIM2_REMAP);             \
+#define __HAL_AFIO_REMAP_TIM2_PARTIAL_2()  AFIO_REMAP_PARTIAL(AFIO_MAPR_TIM2_REMAP_PARTIALREMAP2, AFIO_MAPR_TIM2_REMAP_FULLREMAP)
-                                               SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM2_REMAP_PARTIALREMAP2); \
-                                             }while(0U)
 
 /**
   * @brief Enable the remapping of TIM2 alternate function channels 1 to 4 and external trigger (ETR)
   * @note  PARTIAL_1: Partial remap (CH1/ETR/PA15, CH2/PB3, CH3/PA2,  CH4/PA3)
   * @retval None
   */
-#define __HAL_AFIO_REMAP_TIM2_PARTIAL_1()  do{ CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_TIM2_REMAP);             \
+#define __HAL_AFIO_REMAP_TIM2_PARTIAL_1()  AFIO_REMAP_PARTIAL(AFIO_MAPR_TIM2_REMAP_PARTIALREMAP1, AFIO_MAPR_TIM2_REMAP_FULLREMAP)
-                                               SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM2_REMAP_PARTIALREMAP1); \
-                                             }while(0U)
 
 /**
   * @brief Disable the remapping of TIM2 alternate function channels 1 to 4 and external trigger (ETR)
   * @note  DISABLE: No remap        (CH1/ETR/PA0,  CH2/PA1, CH3/PA2,  CH4/PA3)
   * @retval None
   */
-#define __HAL_AFIO_REMAP_TIM2_DISABLE() do{ CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_TIM2_REMAP);         \
+#define __HAL_AFIO_REMAP_TIM2_DISABLE()  AFIO_REMAP_PARTIAL(AFIO_MAPR_TIM2_REMAP_NOREMAP, AFIO_MAPR_TIM2_REMAP_FULLREMAP)
-                                            SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM2_REMAP_NOREMAP);   \
-                                          }while(0U)
 
 /**
   * @brief Enable the remapping of TIM3 alternate function channels 1 to 4
@@ -287,9 +264,7 @@
   * @note  TIM3_ETR on PE0 is not re-mapped.
   * @retval None
   */
-#define __HAL_AFIO_REMAP_TIM3_ENABLE()  do{ CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_TIM3_REMAP);         \
+#define __HAL_AFIO_REMAP_TIM3_ENABLE()  AFIO_REMAP_PARTIAL(AFIO_MAPR_TIM3_REMAP_FULLREMAP, AFIO_MAPR_TIM3_REMAP_FULLREMAP)
-                                            SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM3_REMAP_FULLREMAP); \
-                                          }while(0U)
 
 /**
   * @brief Enable the remapping of TIM3 alternate function channels 1 to 4
@@ -297,9 +272,7 @@
   * @note  TIM3_ETR on PE0 is not re-mapped.
   * @retval None
   */
-#define __HAL_AFIO_REMAP_TIM3_PARTIAL()    do{ CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_TIM3_REMAP);            \
+#define __HAL_AFIO_REMAP_TIM3_PARTIAL()  AFIO_REMAP_PARTIAL(AFIO_MAPR_TIM3_REMAP_PARTIALREMAP, AFIO_MAPR_TIM3_REMAP_FULLREMAP)
-                                               SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM3_REMAP_PARTIALREMAP); \
-                                             }while(0U)
 
 /**
   * @brief Disable the remapping of TIM3 alternate function channels 1 to 4
@@ -307,9 +280,7 @@
   * @note  TIM3_ETR on PE0 is not re-mapped.
   * @retval None
   */
-#define __HAL_AFIO_REMAP_TIM3_DISABLE()   do{ CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_TIM3_REMAP);           \
+#define __HAL_AFIO_REMAP_TIM3_DISABLE()  AFIO_REMAP_PARTIAL(AFIO_MAPR_TIM3_REMAP_NOREMAP, AFIO_MAPR_TIM3_REMAP_FULLREMAP)
-                                              SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM3_REMAP_NOREMAP);     \
-                                            }while(0U)
 
 /**
   * @brief Enable the remapping of TIM4 alternate function channels 1 to 4.
@@ -317,7 +288,7 @@
   * @note  TIM4_ETR on PE0 is not re-mapped.
   * @retval None
   */
-#define __HAL_AFIO_REMAP_TIM4_ENABLE()  SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM4_REMAP)
+#define __HAL_AFIO_REMAP_TIM4_ENABLE()  AFIO_REMAP_ENABLE(AFIO_MAPR_TIM4_REMAP)
 
 /**
   * @brief Disable the remapping of TIM4 alternate function channels 1 to 4.
@@ -325,7 +296,7 @@
   * @note  TIM4_ETR on PE0 is not re-mapped.
   * @retval None
   */
-#define __HAL_AFIO_REMAP_TIM4_DISABLE() CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_TIM4_REMAP)
+#define __HAL_AFIO_REMAP_TIM4_DISABLE() AFIO_REMAP_DISABLE(AFIO_MAPR_TIM4_REMAP)
 
 #if defined(AFIO_MAPR_CAN_REMAP_REMAP1)
 
@@ -334,48 +305,43 @@
   * @note  CASE 1: CAN_RX mapped to PA11, CAN_TX mapped to PA12
   * @retval None
   */
-#define __HAL_AFIO_REMAP_CAN1_1()   do{ CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_CAN_REMAP);         \
+#define __HAL_AFIO_REMAP_CAN1_1()  AFIO_REMAP_PARTIAL(AFIO_MAPR_CAN_REMAP_REMAP1, AFIO_MAPR_CAN_REMAP)
-                                        SET_BIT(AFIO->MAPR, AFIO_MAPR_CAN_REMAP_REMAP1);    \
-                                      }while(0U)
 
 /**
   * @brief Enable or disable the remapping of CAN alternate function CAN_RX and CAN_TX in devices with a single CAN interface.
   * @note  CASE 2: CAN_RX mapped to PB8,  CAN_TX mapped to PB9 (not available on 36-pin package)
   * @retval None
   */
-#define __HAL_AFIO_REMAP_CAN1_2()   do{ CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_CAN_REMAP);         \
+#define __HAL_AFIO_REMAP_CAN1_2()  AFIO_REMAP_PARTIAL(AFIO_MAPR_CAN_REMAP_REMAP2, AFIO_MAPR_CAN_REMAP)
-                                        SET_BIT(AFIO->MAPR, AFIO_MAPR_CAN_REMAP_REMAP2);    \
-                                      }while(0U)
 
 /**
   * @brief Enable or disable the remapping of CAN alternate function CAN_RX and CAN_TX in devices with a single CAN interface.
   * @note  CASE 3: CAN_RX mapped to PD0,  CAN_TX mapped to PD1
   * @retval None
   */
-#define __HAL_AFIO_REMAP_CAN1_3()  do{ CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_CAN_REMAP);                 \
+#define __HAL_AFIO_REMAP_CAN1_3()  AFIO_REMAP_PARTIAL(AFIO_MAPR_CAN_REMAP_REMAP3, AFIO_MAPR_CAN_REMAP)
-                                       SET_BIT(AFIO->MAPR, AFIO_MAPR_CAN_REMAP_REMAP3);       \
+
-                                     }while(0U)
 #endif
 
 /**
-  * @brief Enable the remapping of PD0 and PD1. When the HSE oscillator is not used 
+  * @brief Enable the remapping of PD0 and PD1. When the HSE oscillator is not used
-  *        (application running on internal 8 MHz RC) PD0 and PD1 can be mapped on OSC_IN and 
+  *        (application running on internal 8 MHz RC) PD0 and PD1 can be mapped on OSC_IN and
-  *        OSC_OUT. This is available only on 36, 48 and 64 pins packages (PD0 and PD1 are available 
+  *        OSC_OUT. This is available only on 36, 48 and 64 pins packages (PD0 and PD1 are available
   *        on 100-pin and 144-pin packages, no need for remapping).
   * @note  ENABLE: PD0 remapped on OSC_IN, PD1 remapped on OSC_OUT.
   * @retval None
   */
-#define __HAL_AFIO_REMAP_PD01_ENABLE()  SET_BIT(AFIO->MAPR, AFIO_MAPR_PD01_REMAP)
+#define __HAL_AFIO_REMAP_PD01_ENABLE()  AFIO_REMAP_ENABLE(AFIO_MAPR_PD01_REMAP)
 
 /**
-  * @brief Disable the remapping of PD0 and PD1. When the HSE oscillator is not used 
+  * @brief Disable the remapping of PD0 and PD1. When the HSE oscillator is not used
-  *        (application running on internal 8 MHz RC) PD0 and PD1 can be mapped on OSC_IN and 
+  *        (application running on internal 8 MHz RC) PD0 and PD1 can be mapped on OSC_IN and
-  *        OSC_OUT. This is available only on 36, 48 and 64 pins packages (PD0 and PD1 are available 
+  *        OSC_OUT. This is available only on 36, 48 and 64 pins packages (PD0 and PD1 are available
   *        on 100-pin and 144-pin packages, no need for remapping).
   * @note  DISABLE: No remapping of PD0 and PD1
   * @retval None
   */
-#define __HAL_AFIO_REMAP_PD01_DISABLE() CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_PD01_REMAP)
+#define __HAL_AFIO_REMAP_PD01_DISABLE() AFIO_REMAP_DISABLE(AFIO_MAPR_PD01_REMAP)
 
 #if defined(AFIO_MAPR_TIM5CH4_IREMAP)
 /**
@@ -384,7 +350,7 @@
   * @note  This function is available only in high density value line devices.
   * @retval None
   */
-#define __HAL_AFIO_REMAP_TIM5CH4_ENABLE()  SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM5CH4_IREMAP)
+#define __HAL_AFIO_REMAP_TIM5CH4_ENABLE()  AFIO_REMAP_ENABLE(AFIO_MAPR_TIM5CH4_IREMAP)
 
 /**
   * @brief Disable the remapping of TIM5CH4.
@@ -392,7 +358,7 @@
   * @note  This function is available only in high density value line devices.
   * @retval None
   */
-#define __HAL_AFIO_REMAP_TIM5CH4_DISABLE() CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_TIM5CH4_IREMAP)
+#define __HAL_AFIO_REMAP_TIM5CH4_DISABLE() AFIO_REMAP_DISABLE(AFIO_MAPR_TIM5CH4_IREMAP)
 #endif
 
 #if defined(AFIO_MAPR_ETH_REMAP)
@@ -402,7 +368,7 @@
   * @note  This bit is available only in connectivity line devices and is reserved otherwise.
   * @retval None
   */
-#define __HAL_AFIO_REMAP_ETH_ENABLE()  SET_BIT(AFIO->MAPR, AFIO_MAPR_ETH_REMAP)
+#define __HAL_AFIO_REMAP_ETH_ENABLE()  AFIO_REMAP_ENABLE(AFIO_MAPR_ETH_REMAP)
 
 /**
   * @brief Disable the remapping of Ethernet MAC connections with the PHY.
@@ -410,7 +376,7 @@
   * @note  This bit is available only in connectivity line devices and is reserved otherwise.
   * @retval None
   */
-#define __HAL_AFIO_REMAP_ETH_DISABLE() CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_ETH_REMAP)
+#define __HAL_AFIO_REMAP_ETH_DISABLE() AFIO_REMAP_DISABLE(AFIO_MAPR_ETH_REMAP)
 #endif
 
 #if defined(AFIO_MAPR_CAN2_REMAP)
@@ -421,7 +387,7 @@
   * @note  This bit is available only in connectivity line devices and is reserved otherwise.
   * @retval None
   */
-#define __HAL_AFIO_REMAP_CAN2_ENABLE()  SET_BIT(AFIO->MAPR, AFIO_MAPR_CAN2_REMAP)
+#define __HAL_AFIO_REMAP_CAN2_ENABLE()  AFIO_REMAP_ENABLE(AFIO_MAPR_CAN2_REMAP)
 
 /**
   * @brief Disable the remapping of CAN2 alternate function CAN2_RX and CAN2_TX.
@@ -429,7 +395,7 @@
   * @note  This bit is available only in connectivity line devices and is reserved otherwise.
   * @retval None
   */
-#define __HAL_AFIO_REMAP_CAN2_DISABLE() CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_CAN2_REMAP)
+#define __HAL_AFIO_REMAP_CAN2_DISABLE() AFIO_REMAP_DISABLE(AFIO_MAPR_CAN2_REMAP)
 #endif
 
 #if defined(AFIO_MAPR_MII_RMII_SEL)
@@ -439,7 +405,7 @@
   * @note  This bit is available only in connectivity line devices and is reserved otherwise.
   * @retval None
   */
-#define __HAL_AFIO_ETH_RMII() SET_BIT(AFIO->MAPR, AFIO_MAPR_MII_RMII_SEL)
+#define __HAL_AFIO_ETH_RMII() AFIO_REMAP_ENABLE(AFIO_MAPR_MII_RMII_SEL)
 
 /**
   * @brief Configures the Ethernet MAC internally for use with an external MII or RMII PHY.
@@ -447,7 +413,7 @@
   * @note  This bit is available only in connectivity line devices and is reserved otherwise.
   * @retval None
   */
-#define __HAL_AFIO_ETH_MII()  CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_MII_RMII_SEL)
+#define __HAL_AFIO_ETH_MII()  AFIO_REMAP_DISABLE(AFIO_MAPR_MII_RMII_SEL)
 #endif
 
 /**
@@ -455,28 +421,28 @@
   * @note  ENABLE: ADC1 External Event injected conversion is connected to TIM8 Channel4.
   * @retval None
   */
-#define __HAL_AFIO_REMAP_ADC1_ETRGINJ_ENABLE()  SET_BIT(AFIO->MAPR, AFIO_MAPR_ADC1_ETRGINJ_REMAP)
+#define __HAL_AFIO_REMAP_ADC1_ETRGINJ_ENABLE()  AFIO_REMAP_ENABLE(AFIO_MAPR_ADC1_ETRGINJ_REMAP)
 
 /**
   * @brief Disable the remapping of ADC1_ETRGINJ (ADC 1 External trigger injected conversion).
   * @note  DISABLE: ADC1 External trigger injected conversion is connected to EXTI15
   * @retval None
   */
-#define __HAL_AFIO_REMAP_ADC1_ETRGINJ_DISABLE() CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_ADC1_ETRGINJ_REMAP)
+#define __HAL_AFIO_REMAP_ADC1_ETRGINJ_DISABLE() AFIO_REMAP_DISABLE(AFIO_MAPR_ADC1_ETRGINJ_REMAP)
 
 /**
   * @brief Enable the remapping of ADC1_ETRGREG (ADC 1 External trigger regular conversion).
   * @note  ENABLE: ADC1 External Event regular conversion is connected to TIM8 TRG0.
   * @retval None
   */
-#define __HAL_AFIO_REMAP_ADC1_ETRGREG_ENABLE()  SET_BIT(AFIO->MAPR, AFIO_MAPR_ADC1_ETRGREG_REMAP)
+#define __HAL_AFIO_REMAP_ADC1_ETRGREG_ENABLE()  AFIO_REMAP_ENABLE(AFIO_MAPR_ADC1_ETRGREG_REMAP)
 
 /**
   * @brief Disable the remapping of ADC1_ETRGREG (ADC 1 External trigger regular conversion).
   * @note  DISABLE: ADC1 External trigger regular conversion is connected to EXTI11
   * @retval None
   */
-#define __HAL_AFIO_REMAP_ADC1_ETRGREG_DISABLE() CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_ADC1_ETRGREG_REMAP)
+#define __HAL_AFIO_REMAP_ADC1_ETRGREG_DISABLE() AFIO_REMAP_DISABLE(AFIO_MAPR_ADC1_ETRGREG_REMAP)
 
 #if defined(AFIO_MAPR_ADC2_ETRGINJ_REMAP)
 
@@ -485,14 +451,14 @@
   * @note  ENABLE: ADC2 External Event injected conversion is connected to TIM8 Channel4.
   * @retval None
   */
-#define __HAL_AFIO_REMAP_ADC2_ETRGINJ_ENABLE()  SET_BIT(AFIO->MAPR, AFIO_MAPR_ADC2_ETRGINJ_REMAP)
+#define __HAL_AFIO_REMAP_ADC2_ETRGINJ_ENABLE()  AFIO_REMAP_ENABLE(AFIO_MAPR_ADC2_ETRGINJ_REMAP)
 
 /**
   * @brief Disable the remapping of ADC2_ETRGREG (ADC 2 External trigger injected conversion).
   * @note  DISABLE: ADC2 External trigger injected conversion is connected to EXTI15
   * @retval None
   */
-#define __HAL_AFIO_REMAP_ADC2_ETRGINJ_DISABLE() CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_ADC2_ETRGINJ_REMAP)
+#define __HAL_AFIO_REMAP_ADC2_ETRGINJ_DISABLE() AFIO_REMAP_DISABLE(AFIO_MAPR_ADC2_ETRGINJ_REMAP)
 #endif
 
 #if defined (AFIO_MAPR_ADC2_ETRGREG_REMAP)
@@ -502,14 +468,14 @@
   * @note  ENABLE: ADC2 External Event regular conversion is connected to TIM8 TRG0.
   * @retval None
   */
-#define __HAL_AFIO_REMAP_ADC2_ETRGREG_ENABLE()  SET_BIT(AFIO->MAPR, AFIO_MAPR_ADC2_ETRGREG_REMAP)
+#define __HAL_AFIO_REMAP_ADC2_ETRGREG_ENABLE()  AFIO_REMAP_ENABLE(AFIO_MAPR_ADC2_ETRGREG_REMAP)
 
 /**
   * @brief Disable the remapping of ADC2_ETRGREG (ADC 2 External trigger regular conversion).
   * @note  DISABLE: ADC2 External trigger regular conversion is connected to EXTI11
   * @retval None
   */
-#define __HAL_AFIO_REMAP_ADC2_ETRGREG_DISABLE() CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_ADC2_ETRGREG_REMAP)
+#define __HAL_AFIO_REMAP_ADC2_ETRGREG_DISABLE() AFIO_REMAP_DISABLE(AFIO_MAPR_ADC2_ETRGREG_REMAP)
 #endif
 
 /**
@@ -517,36 +483,29 @@
   * @note  ENABLE: Full SWJ (JTAG-DP + SW-DP): Reset State
   * @retval None
   */
-#define __HAL_AFIO_REMAP_SWJ_ENABLE()  do{ CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_SWJ_CFG);         \
+#define __HAL_AFIO_REMAP_SWJ_ENABLE()  AFIO_DBGAFR_CONFIG(AFIO_MAPR_SWJ_CFG_RESET)
-                                           SET_BIT(AFIO->MAPR, AFIO_MAPR_SWJ_CFG_RESET);     \
-                                         }while(0U)
 
 /**
   * @brief Enable the Serial wire JTAG configuration
   * @note  NONJTRST: Full SWJ (JTAG-DP + SW-DP) but without NJTRST
   * @retval None
   */
-#define __HAL_AFIO_REMAP_SWJ_NONJTRST()   do{ CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_SWJ_CFG);         \
+#define __HAL_AFIO_REMAP_SWJ_NONJTRST()  AFIO_DBGAFR_CONFIG(AFIO_MAPR_SWJ_CFG_NOJNTRST)
-                                              SET_BIT(AFIO->MAPR, AFIO_MAPR_SWJ_CFG_NOJNTRST);  \
-                                            }while(0U)
 
 /**
   * @brief Enable the Serial wire JTAG configuration
   * @note  NOJTAG: JTAG-DP Disabled and SW-DP Enabled
   * @retval None
   */
-#define __HAL_AFIO_REMAP_SWJ_NOJTAG()   do{ CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_SWJ_CFG);           \
+
-                                            SET_BIT(AFIO->MAPR, AFIO_MAPR_SWJ_CFG_JTAGDISABLE); \
+#define __HAL_AFIO_REMAP_SWJ_NOJTAG()  AFIO_DBGAFR_CONFIG(AFIO_MAPR_SWJ_CFG_JTAGDISABLE)
-                                          }while(0U)
 
 /**
   * @brief Disable the Serial wire JTAG configuration
   * @note  DISABLE: JTAG-DP Disabled and SW-DP Disabled
   * @retval None
   */
-#define __HAL_AFIO_REMAP_SWJ_DISABLE()  do{ CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_SWJ_CFG);         \
+#define __HAL_AFIO_REMAP_SWJ_DISABLE()  AFIO_DBGAFR_CONFIG(AFIO_MAPR_SWJ_CFG_DISABLE)
-                                            SET_BIT(AFIO->MAPR, AFIO_MAPR_SWJ_CFG_DISABLE);   \
-                                          }while(0U)
 
 #if defined(AFIO_MAPR_SPI3_REMAP)
 
@@ -556,7 +515,7 @@
   * @note  This bit is available only in connectivity line devices and is reserved otherwise.
   * @retval None
   */
-#define __HAL_AFIO_REMAP_SPI3_ENABLE()  SET_BIT(AFIO->MAPR, AFIO_MAPR_SPI3_REMAP)
+#define __HAL_AFIO_REMAP_SPI3_ENABLE()  AFIO_REMAP_ENABLE(AFIO_MAPR_SPI3_REMAP)
 
 /**
   * @brief Disable the remapping of SPI3 alternate functions SPI3_NSS/I2S3_WS, SPI3_SCK/I2S3_CK, SPI3_MISO, SPI3_MOSI/I2S3_SD.
@@ -564,7 +523,7 @@
   * @note  This bit is available only in connectivity line devices and is reserved otherwise.
   * @retval None
   */
-#define __HAL_AFIO_REMAP_SPI3_DISABLE() CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_SPI3_REMAP)
+#define __HAL_AFIO_REMAP_SPI3_DISABLE() AFIO_REMAP_DISABLE(AFIO_MAPR_SPI3_REMAP)
 #endif
 
 #if defined(AFIO_MAPR_TIM2ITR1_IREMAP)
@@ -575,7 +534,7 @@
   * @note  This bit is available only in connectivity line devices and is reserved otherwise.
   * @retval None
   */
-#define __HAL_AFIO_TIM2ITR1_TO_USB() SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM2ITR1_IREMAP)
+#define __HAL_AFIO_TIM2ITR1_TO_USB() AFIO_REMAP_ENABLE(AFIO_MAPR_TIM2ITR1_IREMAP)
 
 /**
   * @brief Control of TIM2_ITR1 internal mapping.
@@ -583,7 +542,7 @@
   * @note  This bit is available only in connectivity line devices and is reserved otherwise.
   * @retval None
   */
-#define __HAL_AFIO_TIM2ITR1_TO_ETH() CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_TIM2ITR1_IREMAP)
+#define __HAL_AFIO_TIM2ITR1_TO_ETH() AFIO_REMAP_DISABLE(AFIO_MAPR_TIM2ITR1_IREMAP)
 #endif
 
 #if defined(AFIO_MAPR_PTP_PPS_REMAP)
@@ -594,7 +553,7 @@
   * @note  This bit is available only in connectivity line devices and is reserved otherwise.
   * @retval None
   */
-#define __HAL_AFIO_ETH_PTP_PPS_ENABLE()  SET_BIT(AFIO->MAPR, AFIO_MAPR_PTP_PPS_REMAP)
+#define __HAL_AFIO_ETH_PTP_PPS_ENABLE()  AFIO_REMAP_ENABLE(AFIO_MAPR_PTP_PPS_REMAP)
 
 /**
   * @brief Disable the remapping of ADC2_ETRGREG (ADC 2 External trigger regular conversion).
@@ -602,7 +561,7 @@
   * @note  This bit is available only in connectivity line devices and is reserved otherwise.
   * @retval None
   */
-#define __HAL_AFIO_ETH_PTP_PPS_DISABLE() CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_PTP_PPS_REMAP)
+#define __HAL_AFIO_ETH_PTP_PPS_DISABLE() AFIO_REMAP_DISABLE(AFIO_MAPR_PTP_PPS_REMAP)
 #endif
 
 #if defined(AFIO_MAPR2_TIM9_REMAP)
@@ -856,12 +815,12 @@
 
 /**
   * @}
-  */ 
+  */
-  
+
 /**
   * @}
   */
-  
+
 /** @defgroup GPIOEx_Private_Macros GPIOEx Private Macros
   * @{
   */
@@ -883,6 +842,31 @@
                                    ((__GPIOx__) == (GPIOF))? 5U :6U)
 #endif
 
+#define AFIO_REMAP_ENABLE(REMAP_PIN)       do{ uint32_t tmpreg = AFIO->MAPR; \
+                                               tmpreg |= AFIO_MAPR_SWJ_CFG;  \
+                                               tmpreg |= REMAP_PIN;          \
+                                               AFIO->MAPR = tmpreg;          \
+                                               }while(0U)
+
+#define AFIO_REMAP_DISABLE(REMAP_PIN)      do{ uint32_t tmpreg = AFIO->MAPR;  \
+                                               tmpreg |= AFIO_MAPR_SWJ_CFG;   \
+                                               tmpreg &= ~REMAP_PIN;          \
+                                               AFIO->MAPR = tmpreg;           \
+                                               }while(0U)
+
+#define AFIO_REMAP_PARTIAL(REMAP_PIN, REMAP_PIN_MASK) do{ uint32_t tmpreg = AFIO->MAPR; \
+                                                          tmpreg &= ~REMAP_PIN_MASK;    \
+                                                          tmpreg |= AFIO_MAPR_SWJ_CFG;  \
+                                                          tmpreg |= REMAP_PIN;          \
+                                                          AFIO->MAPR = tmpreg;          \
+                                                          }while(0U)
+
+#define AFIO_DBGAFR_CONFIG(DBGAFR_SWJCFG)  do{ uint32_t tmpreg = AFIO->MAPR;     \
+                                               tmpreg &= ~AFIO_MAPR_SWJ_CFG_Msk; \
+                                               tmpreg |= DBGAFR_SWJCFG;          \
+                                               AFIO->MAPR = tmpreg;              \
+                                               }while(0U)
+
 /**
   * @}
   */
@@ -903,20 +887,20 @@ void HAL_GPIOEx_DisableEventout(void);
 
 /**
   * @}
-  */ 
+  */
 
 /**
   * @}
-  */ 
+  */
 
 /**
   * @}
-  */ 
+  */
 
 /**
   * @}
-  */ 
+  */
-  
+
 #ifdef __cplusplus
 }
 #endif

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_hcd.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_hcd.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of HCD HAL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_i2c.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_i2c.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of I2C HAL module.
   ******************************************************************************
   * @attention
@@ -563,7 +561,9 @@ uint32_t HAL_I2C_GetError(I2C_HandleTypeDef *hi2c);
 /** @defgroup I2C_Private_Constants I2C Private Constants
   * @{
   */
-#define I2C_FLAG_MASK  0x0000FFFFU
+#define I2C_FLAG_MASK                    0x0000FFFFU
+#define I2C_MIN_PCLK_FREQ_STANDARD       2000000U     /*!< 2 MHz                     */
+#define I2C_MIN_PCLK_FREQ_FAST           4000000U     /*!< 4 MHz                     */
 /**
   * @}
   */
@@ -572,11 +572,13 @@ uint32_t HAL_I2C_GetError(I2C_HandleTypeDef *hi2c);
 /** @defgroup I2C_Private_Macros I2C Private Macros
   * @{
   */
-    
+
+#define I2C_MIN_PCLK_FREQ(__PCLK__, __SPEED__)             (((__SPEED__) <= 100000U) ? ((__PCLK__) < I2C_MIN_PCLK_FREQ_STANDARD) : ((__PCLK__) < I2C_MIN_PCLK_FREQ_FAST))
+#define I2C_CCR_CALCULATION(__PCLK__, __SPEED__, __COEFF__)     (((((__PCLK__) - 1U)/((__SPEED__) * (__COEFF__))) + 1U) & I2C_CCR_CCR)
 #define I2C_FREQRANGE(__PCLK__)                            ((__PCLK__)/1000000U)
 #define I2C_RISE_TIME(__FREQRANGE__, __SPEED__)            (((__SPEED__) <= 100000U) ? ((__FREQRANGE__) + 1U) : ((((__FREQRANGE__) * 300U) / 1000U) + 1U))
-#define I2C_SPEED_STANDARD(__PCLK__, __SPEED__)            (((((__PCLK__)/((__SPEED__) << 1U)) & I2C_CCR_CCR) < 4U)? 4U:((__PCLK__) / ((__SPEED__) << 1U)))
+#define I2C_SPEED_STANDARD(__PCLK__, __SPEED__)            ((I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 2U) < 4U)? 4U:I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 2U))
-#define I2C_SPEED_FAST(__PCLK__, __SPEED__, __DUTYCYCLE__) (((__DUTYCYCLE__) == I2C_DUTYCYCLE_2)? ((__PCLK__) / ((__SPEED__) * 3U)) : (((__PCLK__) / ((__SPEED__) * 25U)) | I2C_DUTYCYCLE_16_9))
+#define I2C_SPEED_FAST(__PCLK__, __SPEED__, __DUTYCYCLE__) (((__DUTYCYCLE__) == I2C_DUTYCYCLE_2)? I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 3U) : (I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 25U) | I2C_DUTYCYCLE_16_9))
 #define I2C_SPEED(__PCLK__, __SPEED__, __DUTYCYCLE__)      (((__SPEED__) <= 100000U)? (I2C_SPEED_STANDARD((__PCLK__), (__SPEED__))) : \
                                                                   ((I2C_SPEED_FAST((__PCLK__), (__SPEED__), (__DUTYCYCLE__)) & I2C_CCR_CCR) == 0U)? 1U : \
                                                                   ((I2C_SPEED_FAST((__PCLK__), (__SPEED__), (__DUTYCYCLE__))) | I2C_CCR_FS))

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_i2s.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_i2s.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of I2S HAL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_irda.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_irda.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of IRDA HAL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_iwdg.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_iwdg.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of IWDG HAL module.
   ******************************************************************************
   * @attention
@@ -40,7 +38,7 @@
 #define __STM32F1xx_HAL_IWDG_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -59,7 +57,7 @@
   * @{
   */
 
-/** 
+/**
   * @brief  IWDG Init structure definition
   */
 typedef struct
@@ -81,7 +79,7 @@ typedef struct
 
   IWDG_InitTypeDef             Init;       /*!< IWDG required parameters */
 
-}IWDG_HandleTypeDef;
+} IWDG_HandleTypeDef;
 
 /**
   * @}

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_mmc.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_mmc.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of MMC HAL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_nand.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_nand.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of NAND HAL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_nor.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_nor.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of NOR HAL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_pccard.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_pccard.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of PCCARD HAL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_pcd.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_pcd.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of PCD HAL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_pcd_ex.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_pcd_ex.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of Extended PCD HAL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_pwr.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_pwr.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of PWR HAL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_rcc.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_rcc.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of RCC HAL module.
   ******************************************************************************
   * @attention
@@ -1170,7 +1168,7 @@ typedef struct
   */
 
 /* Initialization and de-initialization functions  ******************************/
-void              HAL_RCC_DeInit(void);
+HAL_StatusTypeDef HAL_RCC_DeInit(void);
 HAL_StatusTypeDef HAL_RCC_OscConfig(RCC_OscInitTypeDef  *RCC_OscInitStruct);
 HAL_StatusTypeDef HAL_RCC_ClockConfig(RCC_ClkInitTypeDef  *RCC_ClkInitStruct, uint32_t FLatency);
 

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_rcc_ex.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of RCC HAL Extension module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_rtc.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_rtc.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of RTC HAL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_rtc_ex.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_rtc_ex.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of RTC HAL Extension module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_sd.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_sd.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of SD HAL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_smartcard.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_smartcard.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of SMARTCARD HAL module.
   ******************************************************************************
   * @attention
@@ -40,7 +38,7 @@
 #define __STM32F1xx_HAL_SMARTCARD_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -54,7 +52,7 @@
   * @{
   */
 
-/* Exported types ------------------------------------------------------------*/ 
+/* Exported types ------------------------------------------------------------*/
 /** @defgroup SMARTCARD_Exported_Types SMARTCARD Exported Types
   * @{
   */
@@ -95,7 +93,7 @@ typedef struct
                                            data bit (MSB) has to be output on the SCLK pin in synchronous mode.
                                            This parameter can be a value of @ref SMARTCARD_Last_Bit */
 
-  uint32_t Prescaler;                 /*!< Specifies the SmartCard Prescaler value used for dividing the system clock 
+  uint32_t Prescaler;                 /*!< Specifies the SmartCard Prescaler value used for dividing the system clock
                                            to provide the smartcard clock. The value given in the register (5 significant bits)
                                            is multiplied by 2 to give the division factor of the source clock frequency.
                                            This parameter can be a value of @ref SMARTCARD_Prescaler */
@@ -104,15 +102,15 @@ typedef struct
 
   uint32_t NACKState;                 /*!< Specifies the SmartCard NACK Transmission state
                                            This parameter can be a value of @ref SMARTCARD_NACK_State */
-}SMARTCARD_InitTypeDef;
+} SMARTCARD_InitTypeDef;
 
-/** 
+/**
   * @brief HAL SMARTCARD State structures definition
   * @note  HAL SMARTCARD State value is a combination of 2 different substates: gState and RxState.
-  *        - gState contains SMARTCARD state information related to global Handle management 
+  *        - gState contains SMARTCARD state information related to global Handle management
   *          and also information related to Tx operations.
   *          gState value coding follow below described bitmap :
-  *          b7-b6  Error information 
+  *          b7-b6  Error information
   *             00 : No Error
   *             01 : (Not Used)
   *             10 : Timeout
@@ -157,16 +155,16 @@ typedef enum
                                                         Value is allowed for gState only */
   HAL_SMARTCARD_STATE_BUSY_RX           = 0x22U,    /*!< Data Reception process is ongoing
                                                         Value is allowed for RxState only */
-  HAL_SMARTCARD_STATE_BUSY_TX_RX        = 0x23U,    /*!< Data Transmission and Reception process is ongoing 
+  HAL_SMARTCARD_STATE_BUSY_TX_RX        = 0x23U,    /*!< Data Transmission and Reception process is ongoing
                                                         Not to be used for neither gState nor RxState.
                                                         Value is result of combination (Or) between gState and RxState values */
   HAL_SMARTCARD_STATE_TIMEOUT           = 0xA0U,    /*!< Timeout state
                                                         Value is allowed for gState only */
   HAL_SMARTCARD_STATE_ERROR             = 0xE0U     /*!< Error
                                                         Value is allowed for gState only */
-}HAL_SMARTCARD_StateTypeDef;
+} HAL_SMARTCARD_StateTypeDef;
 
-/** 
+/**
   * @brief  SMARTCARD handle Structure definition
   */
 typedef struct
@@ -193,15 +191,15 @@ typedef struct
 
   HAL_LockTypeDef                  Lock;             /*!< Locking object */
 
-  __IO HAL_SMARTCARD_StateTypeDef  gState;           /*!< SmartCard state information related to global Handle management 
+  __IO HAL_SMARTCARD_StateTypeDef  gState;           /*!< SmartCard state information related to global Handle management
                                                         and also related to Tx operations.
                                                         This parameter can be a value of @ref HAL_SMARTCARD_StateTypeDef */
-  
+
   __IO HAL_SMARTCARD_StateTypeDef  RxState;          /*!< SmartCard state information related to Rx operations.
                                                         This parameter can be a value of @ref HAL_SMARTCARD_StateTypeDef */
 
   __IO uint32_t                    ErrorCode;        /*!< SmartCard Error code */
-}SMARTCARD_HandleTypeDef;
+} SMARTCARD_HandleTypeDef;
 
 /**
   * @}
@@ -246,7 +244,7 @@ typedef struct
   * @{
   */
 #define SMARTCARD_PARITY_EVEN                    ((uint32_t)USART_CR1_PCE)
-#define SMARTCARD_PARITY_ODD                     ((uint32_t)(USART_CR1_PCE | USART_CR1_PS)) 
+#define SMARTCARD_PARITY_ODD                     ((uint32_t)(USART_CR1_PCE | USART_CR1_PS))
 /**
   * @}
   */
@@ -268,7 +266,7 @@ typedef struct
 #define SMARTCARD_POLARITY_HIGH                  ((uint32_t)USART_CR2_CPOL)
 /**
   * @}
-  */ 
+  */
 
 /** @defgroup SMARTCARD_Clock_Phase  SMARTCARD Clock Phase
   * @{
@@ -397,7 +395,7 @@ typedef struct
                                                             (__HANDLE__)->RxState = HAL_SMARTCARD_STATE_RESET;     \
                                                           } while(0U)
 
-/** @brief  Flush the Smartcard DR register 
+/** @brief  Flush the Smartcard DR register
   * @param  __HANDLE__: specifies the SMARTCARD Handle.
   *         SMARTCARD Handle selects the USARTx peripheral (USART availability and x value depending on device).
   */
@@ -427,12 +425,12 @@ typedef struct
   *         This parameter can be any combination of the following values:
   *            @arg SMARTCARD_FLAG_TC:   Transmission Complete flag.
   *            @arg SMARTCARD_FLAG_RXNE: Receive data register not empty flag.
-  *   
+  *
-  * @note   PE (Parity error), FE (Framing error), NE (Noise error) and ORE (OverRun 
+  * @note   PE (Parity error), FE (Framing error), NE (Noise error) and ORE (OverRun
-  *          error) flags are cleared by software sequence: a read operation to 
+  *          error) flags are cleared by software sequence: a read operation to
   *          USART_SR register followed by a read operation to USART_DR register.
   * @note   RXNE flag can be also cleared by a read to the USART_DR register.
-  * @note   TC flag can be also cleared by software sequence: a read operation to 
+  * @note   TC flag can be also cleared by software sequence: a read operation to
   *          USART_SR register followed by a write operation to USART_DR register.
   * @note   TXE flag is cleared only by a write to the USART_DR register.
   */
@@ -619,7 +617,7 @@ uint32_t HAL_SMARTCARD_GetError(SMARTCARD_HandleTypeDef *hsc);
   */
 
 /** @brief SMARTCARD interruptions flag mask
-  * 
+  *
   */
 #define SMARTCARD_IT_MASK                     0x0000FFFFU
 
@@ -670,7 +668,7 @@ uint32_t HAL_SMARTCARD_GetError(SMARTCARD_HandleTypeDef *hsc);
 
 /**
   * @}
-  */ 
+  */
 
 /**
   * @}

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_spi.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_spi.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of SPI HAL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_sram.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_sram.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of SRAM HAL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_tim.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_tim.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of TIM HAL module.
   ******************************************************************************
   * @attention
@@ -460,8 +458,9 @@ typedef struct
 /** @defgroup TIM_Input_Capture_Polarity TIM Input Capture Polarity
   * @{
   */
-#define  TIM_ICPOLARITY_RISING             TIM_INPUTCHANNELPOLARITY_RISING
+#define  TIM_ICPOLARITY_RISING             TIM_INPUTCHANNELPOLARITY_RISING      /*!< Capture triggered by rising edge on timer input */
-#define  TIM_ICPOLARITY_FALLING            TIM_INPUTCHANNELPOLARITY_FALLING
+#define  TIM_ICPOLARITY_FALLING            TIM_INPUTCHANNELPOLARITY_FALLING     /*!< Capture triggered by falling edge on timer input */
+#define  TIM_ICPOLARITY_BOTHEDGE           TIM_INPUTCHANNELPOLARITY_BOTHEDGE    /*!< Capture triggered by both rising and falling edges on timer input */
 /**
   * @}
   */
@@ -939,8 +938,9 @@ typedef struct
                                                 ((CHANNEL) == TIM_CHANNEL_2) || \
                                                 ((CHANNEL) == TIM_CHANNEL_3))
 
-#define IS_TIM_IC_POLARITY(POLARITY) (((POLARITY) == TIM_ICPOLARITY_RISING)   || \
+#define IS_TIM_IC_POLARITY(__POLARITY__) (((__POLARITY__) == TIM_ICPOLARITY_RISING)   || \
-                                      ((POLARITY) == TIM_ICPOLARITY_FALLING))
+                                          ((__POLARITY__) == TIM_ICPOLARITY_FALLING)  || \
+                                          ((__POLARITY__) == TIM_ICPOLARITY_BOTHEDGE))
 
 #define IS_TIM_IC_SELECTION(SELECTION) (((SELECTION) == TIM_ICSELECTION_DIRECTTI)   || \
                                         ((SELECTION) == TIM_ICSELECTION_INDIRECTTI) || \

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_tim_ex.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of TIM HAL Extension module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_uart.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_uart.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of UART HAL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_usart.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_usart.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of USART HAL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_hal_wwdg.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_wwdg.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of WWDG HAL module.
   ******************************************************************************
   * @attention
@@ -33,14 +31,14 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   *
   ******************************************************************************
-  */ 
+  */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32F1xx_HAL_WWDG_H
 #define __STM32F1xx_HAL_WWDG_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -52,14 +50,14 @@
 
 /** @addtogroup WWDG
   * @{
-  */ 
+  */
 
 /* Exported types ------------------------------------------------------------*/
 /** @defgroup WWDG_Exported_Types WWDG Exported Types
   * @{
   */
 
-/** 
+/**
   * @brief  WWDG Init structure definition
   */
 typedef struct
@@ -76,7 +74,7 @@ typedef struct
   uint32_t EWIMode ;      /*!< Specifies if WWDG Early Wakeup Interupt is enable or not.
                                This parameter can be a value of @ref WWDG_EWI_Mode */
 
-}WWDG_InitTypeDef;
+} WWDG_InitTypeDef;
 
 /**
   * @brief  WWDG handle Structure definition
@@ -87,7 +85,7 @@ typedef struct
 
   WWDG_InitTypeDef             Init;       /*!< WWDG required parameters */
 
-}WWDG_HandleTypeDef;
+} WWDG_HandleTypeDef;
 /**
   * @}
   */
@@ -117,7 +115,7 @@ typedef struct
 
 /** @defgroup WWDG_Prescaler WWDG Prescaler
   * @{
-  */ 
+  */
 #define WWDG_PRESCALER_1                 0x00000000U  /*!< WWDG counter clock = (PCLK1/4096)/1 */
 #define WWDG_PRESCALER_2                  WWDG_CFR_WDGTB0  /*!< WWDG counter clock = (PCLK1/4096)/2 */
 #define WWDG_PRESCALER_4                  WWDG_CFR_WDGTB1  /*!< WWDG counter clock = (PCLK1/4096)/4 */
@@ -257,7 +255,7 @@ void                  HAL_WWDG_MspInit(WWDG_HandleTypeDef *hwwdg);
 /* I/O operation functions ******************************************************/
 HAL_StatusTypeDef     HAL_WWDG_Refresh(WWDG_HandleTypeDef *hwwdg);
 void                  HAL_WWDG_IRQHandler(WWDG_HandleTypeDef *hwwdg);
-void                  HAL_WWDG_EarlyWakeupCallback(WWDG_HandleTypeDef* hwwdg);
+void                  HAL_WWDG_EarlyWakeupCallback(WWDG_HandleTypeDef *hwwdg);
 /**
   * @}
   */

workspace/TS100/HAL_Driver/Inc/stm32f1xx_ll_adc.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_ll_adc.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of ADC LL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_ll_bus.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_ll_bus.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of BUS LL module.
 
   @verbatim                

workspace/TS100/HAL_Driver/Inc/stm32f1xx_ll_cortex.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_ll_cortex.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of CORTEX LL module.
   @verbatim
   ==============================================================================

workspace/TS100/HAL_Driver/Inc/stm32f1xx_ll_crc.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_ll_crc.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of CRC LL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_ll_dac.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_ll_dac.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of DAC LL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_ll_dma.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_ll_dma.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of DMA LL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_ll_exti.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_ll_exti.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of EXTI LL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_ll_fsmc.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_ll_fsmc.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of FSMC HAL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_ll_gpio.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_ll_gpio.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of GPIO LL module.
   ******************************************************************************
   * @attention
@@ -58,16 +56,18 @@ extern "C" {
 
 /* Private types -------------------------------------------------------------*/
 /* Private variables ---------------------------------------------------------*/
-
 /* Private constants ---------------------------------------------------------*/
+
 /** @defgroup GPIO_LL_Private_Constants GPIO Private Constants
   * @{
   */
+/* Defines used for Pin Mask Initialization */
+#define GPIO_PIN_MASK_POS   8U
+#define GPIO_PIN_NB         16U
 /**
   * @}
   */
 
-
 /* Private macros ------------------------------------------------------------*/
 #if defined(USE_FULL_LL_DRIVER)
 /** @defgroup GPIO_LL_Private_Macros GPIO Private Macros
@@ -112,7 +112,7 @@ typedef struct
                               This parameter can be a value of @ref GPIO_LL_EC_PULL.
 
                               GPIO HW configuration can be modified afterwards using unitary function @ref LL_GPIO_SetPinPull().*/
-}LL_GPIO_InitTypeDef;
+} LL_GPIO_InitTypeDef;
 
 /**
   * @}
@@ -127,28 +127,28 @@ typedef struct
 /** @defgroup GPIO_LL_EC_PIN PIN
   * @{
   */
-#define LL_GPIO_PIN_0                    (GPIO_BSRR_BS0 << 8)  | 0x00000001U  /*!< Select pin 0 */
+#define LL_GPIO_PIN_0                    ((GPIO_BSRR_BS0  << GPIO_PIN_MASK_POS) | 0x00000001U)  /*!< Select pin 0  */
-#define LL_GPIO_PIN_1                    (GPIO_BSRR_BS1 << 8)  | 0x00000002U  /*!< Select pin 1 */
+#define LL_GPIO_PIN_1                    ((GPIO_BSRR_BS1  << GPIO_PIN_MASK_POS) | 0x00000002U)  /*!< Select pin 1  */
-#define LL_GPIO_PIN_2                    (GPIO_BSRR_BS2 << 8)  | 0x00000004U  /*!< Select pin 2 */
+#define LL_GPIO_PIN_2                    ((GPIO_BSRR_BS2  << GPIO_PIN_MASK_POS) | 0x00000004U)  /*!< Select pin 2  */
-#define LL_GPIO_PIN_3                    (GPIO_BSRR_BS3 << 8)  | 0x00000008U  /*!< Select pin 3 */
+#define LL_GPIO_PIN_3                    ((GPIO_BSRR_BS3  << GPIO_PIN_MASK_POS) | 0x00000008U)  /*!< Select pin 3  */
-#define LL_GPIO_PIN_4                    (GPIO_BSRR_BS4 << 8)  | 0x00000010U  /*!< Select pin 4 */
+#define LL_GPIO_PIN_4                    ((GPIO_BSRR_BS4  << GPIO_PIN_MASK_POS) | 0x00000010U)  /*!< Select pin 4  */
-#define LL_GPIO_PIN_5                    (GPIO_BSRR_BS5 << 8)  | 0x00000020U  /*!< Select pin 5 */
+#define LL_GPIO_PIN_5                    ((GPIO_BSRR_BS5  << GPIO_PIN_MASK_POS) | 0x00000020U)  /*!< Select pin 5  */
-#define LL_GPIO_PIN_6                    (GPIO_BSRR_BS6 << 8)  | 0x00000040U  /*!< Select pin 6 */
+#define LL_GPIO_PIN_6                    ((GPIO_BSRR_BS6  << GPIO_PIN_MASK_POS) | 0x00000040U)  /*!< Select pin 6  */
-#define LL_GPIO_PIN_7                    (GPIO_BSRR_BS7 << 8)  | 0x00000080U  /*!< Select pin 7 */
+#define LL_GPIO_PIN_7                    ((GPIO_BSRR_BS7  << GPIO_PIN_MASK_POS) | 0x00000080U)  /*!< Select pin 7  */
-#define LL_GPIO_PIN_8                    (GPIO_BSRR_BS8 << 8)  | 0x04000001U  /*!< Select pin 8 */
+#define LL_GPIO_PIN_8                    ((GPIO_BSRR_BS8  << GPIO_PIN_MASK_POS) | 0x04000001U)  /*!< Select pin 8  */
-#define LL_GPIO_PIN_9                    (GPIO_BSRR_BS9 << 8)  | 0x04000002U  /*!< Select pin 9 */
+#define LL_GPIO_PIN_9                    ((GPIO_BSRR_BS9  << GPIO_PIN_MASK_POS) | 0x04000002U)  /*!< Select pin 9  */
-#define LL_GPIO_PIN_10                   (GPIO_BSRR_BS10 << 8) | 0x04000004U  /*!< Select pin 10 */
+#define LL_GPIO_PIN_10                   ((GPIO_BSRR_BS10 << GPIO_PIN_MASK_POS) | 0x04000004U)  /*!< Select pin 10 */
-#define LL_GPIO_PIN_11                   (GPIO_BSRR_BS11 << 8) | 0x04000008U  /*!< Select pin 11 */
+#define LL_GPIO_PIN_11                   ((GPIO_BSRR_BS11 << GPIO_PIN_MASK_POS) | 0x04000008U)  /*!< Select pin 11 */
-#define LL_GPIO_PIN_12                   (GPIO_BSRR_BS12 << 8) | 0x04000010U  /*!< Select pin 12 */
+#define LL_GPIO_PIN_12                   ((GPIO_BSRR_BS12 << GPIO_PIN_MASK_POS) | 0x04000010U)  /*!< Select pin 12 */
-#define LL_GPIO_PIN_13                   (GPIO_BSRR_BS13 << 8) | 0x04000020U  /*!< Select pin 13 */
+#define LL_GPIO_PIN_13                   ((GPIO_BSRR_BS13 << GPIO_PIN_MASK_POS) | 0x04000020U)  /*!< Select pin 13 */
-#define LL_GPIO_PIN_14                   (GPIO_BSRR_BS14 << 8) | 0x04000040U  /*!< Select pin 14 */
+#define LL_GPIO_PIN_14                   ((GPIO_BSRR_BS14 << GPIO_PIN_MASK_POS) | 0x04000040U)  /*!< Select pin 14 */
-#define LL_GPIO_PIN_15                   (GPIO_BSRR_BS15 << 8) | 0x04000080U  /*!< Select pin 15 */
+#define LL_GPIO_PIN_15                   ((GPIO_BSRR_BS15 << GPIO_PIN_MASK_POS) | 0x04000080U)  /*!< Select pin 15 */
 #define LL_GPIO_PIN_ALL                  (LL_GPIO_PIN_0  | LL_GPIO_PIN_1  | LL_GPIO_PIN_2  | \
                                           LL_GPIO_PIN_3  | LL_GPIO_PIN_4  | LL_GPIO_PIN_5  | \
                                           LL_GPIO_PIN_6  | LL_GPIO_PIN_7  | LL_GPIO_PIN_8  | \
                                           LL_GPIO_PIN_9  | LL_GPIO_PIN_10 | LL_GPIO_PIN_11 | \
                                           LL_GPIO_PIN_12 | LL_GPIO_PIN_13 | LL_GPIO_PIN_14 | \
-                                          LL_GPIO_PIN_15) /*!< Select all pins */
+                                          LL_GPIO_PIN_15)                                      /*!< Select all pins */
 /**
   * @}
   */
@@ -156,11 +156,11 @@ typedef struct
 /** @defgroup GPIO_LL_EC_MODE Mode
   * @{
   */
-#define LL_GPIO_MODE_ANALOG                0x00000000U   /*!< Select analog mode */
+#define LL_GPIO_MODE_ANALOG              0x00000000U       /*!< Select analog mode */
-#define LL_GPIO_MODE_FLOATING              GPIO_CRL_CNF0_0   /*!< Select floating mode */
+#define LL_GPIO_MODE_FLOATING            GPIO_CRL_CNF0_0   /*!< Select floating mode */
-#define LL_GPIO_MODE_INPUT                 GPIO_CRL_CNF0_1   /*!< Select input mode */
+#define LL_GPIO_MODE_INPUT               GPIO_CRL_CNF0_1   /*!< Select input mode */
-#define LL_GPIO_MODE_OUTPUT                GPIO_CRL_MODE0_0   /*!< Select general purpose output mode */
+#define LL_GPIO_MODE_OUTPUT              GPIO_CRL_MODE0_0  /*!< Select general purpose output mode */
-#define LL_GPIO_MODE_ALTERNATE             (GPIO_CRL_CNF0_1 | GPIO_CRL_MODE0_0) /*!< Select alternate function mode */
+#define LL_GPIO_MODE_ALTERNATE           (GPIO_CRL_CNF0_1 | GPIO_CRL_MODE0_0) /*!< Select alternate function mode */
 /**
   * @}
   */
@@ -168,8 +168,8 @@ typedef struct
 /** @defgroup GPIO_LL_EC_OUTPUT Output Type
   * @{
   */
-#define LL_GPIO_OUTPUT_PUSHPULL            0x00000000U /*!< Select push-pull as output type */
+#define LL_GPIO_OUTPUT_PUSHPULL          0x00000000U                /*!< Select push-pull as output type */
-#define LL_GPIO_OUTPUT_OPENDRAIN           GPIO_CRL_CNF0_0 /*!< Select open-drain as output type */
+#define LL_GPIO_OUTPUT_OPENDRAIN         GPIO_CRL_CNF0_0            /*!< Select open-drain as output type */
 /**
   * @}
   */
@@ -177,13 +177,13 @@ typedef struct
 /** @defgroup GPIO_LL_EC_SPEED Output Speed
   * @{
   */
-#define LL_GPIO_MODE_OUTPUT_10MHz      GPIO_CRL_MODE0_0            /*!< Select Output mode, max speed 10 MHz */
+#define LL_GPIO_MODE_OUTPUT_10MHz        GPIO_CRL_MODE0_0            /*!< Select Output mode, max speed 10 MHz */
-#define LL_GPIO_MODE_OUTPUT_2MHz       GPIO_CRL_MODE0_1            /*!< Select Output mode, max speed 20 MHz */
+#define LL_GPIO_MODE_OUTPUT_2MHz         GPIO_CRL_MODE0_1            /*!< Select Output mode, max speed 20 MHz */
-#define LL_GPIO_MODE_OUTPUT_50MHz      GPIO_CRL_MODE0              /*!< Select Output mode, max speed 50 MHz */
+#define LL_GPIO_MODE_OUTPUT_50MHz        GPIO_CRL_MODE0              /*!< Select Output mode, max speed 50 MHz */
 /**
   * @}
   */
-  
+
 #define LL_GPIO_SPEED_FREQ_LOW           LL_GPIO_MODE_OUTPUT_2MHz    /*!< Select I/O low output speed    */
 #define LL_GPIO_SPEED_FREQ_MEDIUM        LL_GPIO_MODE_OUTPUT_10MHz   /*!< Select I/O medium output speed */
 #define LL_GPIO_SPEED_FREQ_HIGH          LL_GPIO_MODE_OUTPUT_50MHz   /*!< Select I/O high output speed   */
@@ -191,13 +191,13 @@ typedef struct
 /** @defgroup GPIO_LL_EC_PULL Pull Up Pull Down
   * @{
   */
-#define LL_GPIO_PULL_DOWN                  0x00000000U    /*!< Select I/O pull down */
+#define LL_GPIO_PULL_DOWN                0x00000000U    /*!< Select I/O pull down */
-#define LL_GPIO_PULL_UP                    GPIO_ODR_ODR0  /*!< Select I/O pull up */
+#define LL_GPIO_PULL_UP                  GPIO_ODR_ODR0  /*!< Select I/O pull up */
 
 /**
   * @}
   */
-  
+
 /** @defgroup GPIO_LL_EVENTOUT_PIN EVENTOUT Pin
   * @{
   */
@@ -240,13 +240,13 @@ typedef struct
 /** @defgroup GPIO_LL_EC_EXTI_PORT GPIO EXTI PORT
   * @{
   */
-#define LL_GPIO_AF_EXTI_PORTA            (uint32_t)0   /*!< EXTI PORT A */
+#define LL_GPIO_AF_EXTI_PORTA            0U   /*!< EXTI PORT A */
-#define LL_GPIO_AF_EXTI_PORTB            (uint32_t)1   /*!< EXTI PORT B */
+#define LL_GPIO_AF_EXTI_PORTB            1U   /*!< EXTI PORT B */
-#define LL_GPIO_AF_EXTI_PORTC            (uint32_t)2   /*!< EXTI PORT C */
+#define LL_GPIO_AF_EXTI_PORTC            2U   /*!< EXTI PORT C */
-#define LL_GPIO_AF_EXTI_PORTD            (uint32_t)3   /*!< EXTI PORT D */
+#define LL_GPIO_AF_EXTI_PORTD            3U   /*!< EXTI PORT D */
-#define LL_GPIO_AF_EXTI_PORTE            (uint32_t)4   /*!< EXTI PORT E */
+#define LL_GPIO_AF_EXTI_PORTE            4U   /*!< EXTI PORT E */
-#define LL_GPIO_AF_EXTI_PORTF            (uint32_t)5   /*!< EXTI PORT F */
+#define LL_GPIO_AF_EXTI_PORTF            5U   /*!< EXTI PORT F */
-#define LL_GPIO_AF_EXTI_PORTG            (uint32_t)6   /*!< EXTI PORT G */
+#define LL_GPIO_AF_EXTI_PORTG            6U   /*!< EXTI PORT G */
 /**
   * @}
   */
@@ -254,22 +254,22 @@ typedef struct
 /** @defgroup GPIO_LL_EC_EXTI_LINE GPIO EXTI LINE
   * @{
   */
-#define LL_GPIO_AF_EXTI_LINE0            (uint32_t)(0x000FU << 16 | 0)  /*!< EXTI_POSITION_0  | EXTICR[0] */
+#define LL_GPIO_AF_EXTI_LINE0            (0x000FU << 16U | 0U)  /*!< EXTI_POSITION_0  | EXTICR[0] */
-#define LL_GPIO_AF_EXTI_LINE1            (uint32_t)(0x00F0U << 16 | 0)  /*!< EXTI_POSITION_4  | EXTICR[0] */
+#define LL_GPIO_AF_EXTI_LINE1            (0x00F0U << 16U | 0U)  /*!< EXTI_POSITION_4  | EXTICR[0] */
-#define LL_GPIO_AF_EXTI_LINE2            (uint32_t)(0x0F00U << 16 | 0)  /*!< EXTI_POSITION_8  | EXTICR[0] */
+#define LL_GPIO_AF_EXTI_LINE2            (0x0F00U << 16U | 0U)  /*!< EXTI_POSITION_8  | EXTICR[0] */
-#define LL_GPIO_AF_EXTI_LINE3            (uint32_t)(0xF000U << 16 | 0)  /*!< EXTI_POSITION_12 | EXTICR[0] */
+#define LL_GPIO_AF_EXTI_LINE3            (0xF000U << 16U | 0U)  /*!< EXTI_POSITION_12 | EXTICR[0] */
-#define LL_GPIO_AF_EXTI_LINE4            (uint32_t)(0x000FU << 16 | 1)  /*!< EXTI_POSITION_0  | EXTICR[1] */
+#define LL_GPIO_AF_EXTI_LINE4            (0x000FU << 16U | 1U)  /*!< EXTI_POSITION_0  | EXTICR[1] */
-#define LL_GPIO_AF_EXTI_LINE5            (uint32_t)(0x00F0U << 16 | 1)  /*!< EXTI_POSITION_4  | EXTICR[1] */
+#define LL_GPIO_AF_EXTI_LINE5            (0x00F0U << 16U | 1U)  /*!< EXTI_POSITION_4  | EXTICR[1] */
-#define LL_GPIO_AF_EXTI_LINE6            (uint32_t)(0x0F00U << 16 | 1)  /*!< EXTI_POSITION_8  | EXTICR[1] */
+#define LL_GPIO_AF_EXTI_LINE6            (0x0F00U << 16U | 1U)  /*!< EXTI_POSITION_8  | EXTICR[1] */
-#define LL_GPIO_AF_EXTI_LINE7            (uint32_t)(0xF000U << 16 | 1)  /*!< EXTI_POSITION_12 | EXTICR[1] */
+#define LL_GPIO_AF_EXTI_LINE7            (0xF000U << 16U | 1U)  /*!< EXTI_POSITION_12 | EXTICR[1] */
-#define LL_GPIO_AF_EXTI_LINE8            (uint32_t)(0x000FU << 16 | 2)  /*!< EXTI_POSITION_0  | EXTICR[2] */
+#define LL_GPIO_AF_EXTI_LINE8            (0x000FU << 16U | 2U)  /*!< EXTI_POSITION_0  | EXTICR[2] */
-#define LL_GPIO_AF_EXTI_LINE9            (uint32_t)(0x00F0U << 16 | 2)  /*!< EXTI_POSITION_4  | EXTICR[2] */
+#define LL_GPIO_AF_EXTI_LINE9            (0x00F0U << 16U | 2U)  /*!< EXTI_POSITION_4  | EXTICR[2] */
-#define LL_GPIO_AF_EXTI_LINE10           (uint32_t)(0x0F00U << 16 | 2)  /*!< EXTI_POSITION_8  | EXTICR[2] */
+#define LL_GPIO_AF_EXTI_LINE10           (0x0F00U << 16U | 2U)  /*!< EXTI_POSITION_8  | EXTICR[2] */
-#define LL_GPIO_AF_EXTI_LINE11           (uint32_t)(0xF000U << 16 | 2)  /*!< EXTI_POSITION_12 | EXTICR[2] */
+#define LL_GPIO_AF_EXTI_LINE11           (0xF000U << 16U | 2U)  /*!< EXTI_POSITION_12 | EXTICR[2] */
-#define LL_GPIO_AF_EXTI_LINE12           (uint32_t)(0x000FU << 16 | 3)  /*!< EXTI_POSITION_0  | EXTICR[3] */
+#define LL_GPIO_AF_EXTI_LINE12           (0x000FU << 16U | 3U)  /*!< EXTI_POSITION_0  | EXTICR[3] */
-#define LL_GPIO_AF_EXTI_LINE13           (uint32_t)(0x00F0U << 16 | 3)  /*!< EXTI_POSITION_4  | EXTICR[3] */
+#define LL_GPIO_AF_EXTI_LINE13           (0x00F0U << 16U | 3U)  /*!< EXTI_POSITION_4  | EXTICR[3] */
-#define LL_GPIO_AF_EXTI_LINE14           (uint32_t)(0x0F00U << 16 | 3)  /*!< EXTI_POSITION_8  | EXTICR[3] */
+#define LL_GPIO_AF_EXTI_LINE14           (0x0F00U << 16U | 3U)  /*!< EXTI_POSITION_8  | EXTICR[3] */
-#define LL_GPIO_AF_EXTI_LINE15           (uint32_t)(0xF000U << 16 | 3)  /*!< EXTI_POSITION_12 | EXTICR[3] */
+#define LL_GPIO_AF_EXTI_LINE15           (0xF000U << 16U | 3U)  /*!< EXTI_POSITION_12 | EXTICR[3] */
 /**
   * @}
   */
@@ -357,8 +357,8 @@ typedef struct
   */
 __STATIC_INLINE void LL_GPIO_SetPinMode(GPIO_TypeDef *GPIOx, uint32_t Pin, uint32_t Mode)
 {
-  register uint32_t *pReg = (uint32_t *)((uint32_t)((uint32_t)(&GPIOx->CRL) + (Pin>>24)));
+  register uint32_t *pReg = (uint32_t *)((uint32_t)(&GPIOx->CRL) + (Pin >> 24));
-  MODIFY_REG(*pReg, ((GPIO_CRL_CNF0|GPIO_CRL_MODE0) << (POSITION_VAL(Pin) * 4U)), (Mode << (POSITION_VAL(Pin) * 4U)));
+  MODIFY_REG(*pReg, ((GPIO_CRL_CNF0 | GPIO_CRL_MODE0) << (POSITION_VAL(Pin) * 4U)), (Mode << (POSITION_VAL(Pin) * 4U)));
 }
 
 /**
@@ -397,9 +397,8 @@ __STATIC_INLINE void LL_GPIO_SetPinMode(GPIO_TypeDef *GPIOx, uint32_t Pin, uint3
   */
 __STATIC_INLINE uint32_t LL_GPIO_GetPinMode(GPIO_TypeDef *GPIOx, uint32_t Pin)
 {
-  register uint32_t *pReg = (uint32_t *)((uint32_t)((uint32_t)(&GPIOx->CRL) + (Pin>>24)));
+  register uint32_t *pReg = (uint32_t *)((uint32_t)(&GPIOx->CRL) + (Pin >> 24));
-  return (uint32_t)(READ_BIT(*pReg,
+  return (READ_BIT(*pReg, ((GPIO_CRL_CNF0 | GPIO_CRL_MODE0) << (POSITION_VAL(Pin) * 4U))) >> (POSITION_VAL(Pin) * 4U));
-                             ((GPIO_CRL_CNF0|GPIO_CRL_MODE0) << (POSITION_VAL(Pin) * 4U))) >> (POSITION_VAL(Pin) * 4U));
 }
 
 /**
@@ -436,7 +435,7 @@ __STATIC_INLINE uint32_t LL_GPIO_GetPinMode(GPIO_TypeDef *GPIOx, uint32_t Pin)
   */
 __STATIC_INLINE void LL_GPIO_SetPinSpeed(GPIO_TypeDef *GPIOx, uint32_t Pin, uint32_t  Speed)
 {
-  register uint32_t *pReg = (uint32_t *)((uint32_t)((uint32_t)(&GPIOx->CRL) + (Pin>>24)));
+  register uint32_t *pReg = (uint32_t *)((uint32_t)(&GPIOx->CRL) + (Pin >> 24));
   MODIFY_REG(*pReg, (GPIO_CRL_MODE0 << (POSITION_VAL(Pin) * 4U)),
              (Speed << (POSITION_VAL(Pin) * 4U)));
 }
@@ -474,9 +473,8 @@ __STATIC_INLINE void LL_GPIO_SetPinSpeed(GPIO_TypeDef *GPIOx, uint32_t Pin, uint
   */
 __STATIC_INLINE uint32_t LL_GPIO_GetPinSpeed(GPIO_TypeDef *GPIOx, uint32_t Pin)
 {
-  register uint32_t *pReg = (uint32_t *)((uint32_t)((uint32_t)(&GPIOx->CRL) + (Pin>>24)));
+  register uint32_t *pReg = (uint32_t *)((uint32_t)(&GPIOx->CRL) + (Pin >> 24));
-  return (uint32_t)(READ_BIT(*pReg,
+  return (READ_BIT(*pReg, (GPIO_CRL_MODE0 << (POSITION_VAL(Pin) * 4U))) >> (POSITION_VAL(Pin) * 4U));
-                             (GPIO_CRL_MODE0 << (POSITION_VAL(Pin) * 4U))) >> (POSITION_VAL(Pin) * 4U));
 }
 
 /**
@@ -511,7 +509,7 @@ __STATIC_INLINE uint32_t LL_GPIO_GetPinSpeed(GPIO_TypeDef *GPIOx, uint32_t Pin)
   */
 __STATIC_INLINE void LL_GPIO_SetPinOutputType(GPIO_TypeDef *GPIOx, uint32_t Pin, uint32_t OutputType)
 {
-  register uint32_t *pReg = (uint32_t *)((uint32_t)((uint32_t)(&GPIOx->CRL) + (Pin>>24)));
+  register uint32_t *pReg = (uint32_t *)((uint32_t)(&GPIOx->CRL) + (Pin >> 24));
   MODIFY_REG(*pReg, (GPIO_CRL_CNF0_0 << (POSITION_VAL(Pin) * 4U)),
              (OutputType << (POSITION_VAL(Pin) * 4U)));
 }
@@ -548,9 +546,8 @@ __STATIC_INLINE void LL_GPIO_SetPinOutputType(GPIO_TypeDef *GPIOx, uint32_t Pin,
   */
 __STATIC_INLINE uint32_t LL_GPIO_GetPinOutputType(GPIO_TypeDef *GPIOx, uint32_t Pin)
 {
-  register uint32_t *pReg = (uint32_t *)((uint32_t)((uint32_t)(&GPIOx->CRL) + (Pin>>24)));
+  register uint32_t *pReg = (uint32_t *)((uint32_t)(&GPIOx->CRL) + (Pin >> 24));
-  return (uint32_t)(READ_BIT(*pReg,
+  return (READ_BIT(*pReg, (GPIO_CRL_CNF0_0 << (POSITION_VAL(Pin) * 4U))) >> (POSITION_VAL(Pin) * 4U));
-                            (GPIO_CRL_CNF0_0 << (POSITION_VAL(Pin) * 4U))) >> (POSITION_VAL(Pin) * 4U));
 
 }
 
@@ -583,7 +580,7 @@ __STATIC_INLINE uint32_t LL_GPIO_GetPinOutputType(GPIO_TypeDef *GPIOx, uint32_t
   */
 __STATIC_INLINE void LL_GPIO_SetPinPull(GPIO_TypeDef *GPIOx, uint32_t Pin, uint32_t Pull)
 {
-  MODIFY_REG(GPIOx->ODR, (Pin>>8) , Pull << (POSITION_VAL(Pin>>8)));
+  MODIFY_REG(GPIOx->ODR, (Pin >> GPIO_PIN_MASK_POS), Pull << (POSITION_VAL(Pin >> GPIO_PIN_MASK_POS)));
 }
 
 /**
@@ -614,8 +611,7 @@ __STATIC_INLINE void LL_GPIO_SetPinPull(GPIO_TypeDef *GPIOx, uint32_t Pin, uint3
   */
 __STATIC_INLINE uint32_t LL_GPIO_GetPinPull(GPIO_TypeDef *GPIOx, uint32_t Pin)
 {
-  return (uint32_t)(READ_BIT(GPIOx->ODR,
+  return (READ_BIT(GPIOx->ODR, (GPIO_ODR_ODR0 << (POSITION_VAL(Pin >> GPIO_PIN_MASK_POS)))) >> (POSITION_VAL(Pin >> GPIO_PIN_MASK_POS)));
-                             (GPIO_ODR_ODR0 << (POSITION_VAL(Pin>>8)))) >> (POSITION_VAL(Pin>>8)));
 }
 
 /**
@@ -650,9 +646,9 @@ __STATIC_INLINE uint32_t LL_GPIO_GetPinPull(GPIO_TypeDef *GPIOx, uint32_t Pin)
 __STATIC_INLINE void LL_GPIO_LockPin(GPIO_TypeDef *GPIOx, uint32_t PinMask)
 {
   __IO uint32_t temp;
-  WRITE_REG(GPIOx->LCKR, GPIO_LCKR_LCKK | ((PinMask >> 8) & 0x0000FFFFU));
+  WRITE_REG(GPIOx->LCKR, GPIO_LCKR_LCKK | ((PinMask >> GPIO_PIN_MASK_POS) & 0x0000FFFFU));
-  WRITE_REG(GPIOx->LCKR, ((PinMask >>8 ) & 0x0000FFFFU));
+  WRITE_REG(GPIOx->LCKR, ((PinMask >> GPIO_PIN_MASK_POS) & 0x0000FFFFU));
-  WRITE_REG(GPIOx->LCKR, GPIO_LCKR_LCKK | ((PinMask>>8) & 0x0000FFFFU));
+  WRITE_REG(GPIOx->LCKR, GPIO_LCKR_LCKK | ((PinMask >> GPIO_PIN_MASK_POS) & 0x0000FFFFU));
   temp = READ_REG(GPIOx->LCKR);
   (void) temp;
 }
@@ -683,7 +679,7 @@ __STATIC_INLINE void LL_GPIO_LockPin(GPIO_TypeDef *GPIOx, uint32_t PinMask)
   */
 __STATIC_INLINE uint32_t LL_GPIO_IsPinLocked(GPIO_TypeDef *GPIOx, uint32_t PinMask)
 {
-  return (READ_BIT(GPIOx->LCKR, ((PinMask >> 8 ) & 0x0000FFFFU)) == ((PinMask >>8 ) & 0x0000FFFFU));
+  return (READ_BIT(GPIOx->LCKR, ((PinMask >> GPIO_PIN_MASK_POS) & 0x0000FFFFU)) == ((PinMask >> GPIO_PIN_MASK_POS) & 0x0000FFFFU));
 }
 
 /**
@@ -713,7 +709,7 @@ __STATIC_INLINE uint32_t LL_GPIO_IsAnyPinLocked(GPIO_TypeDef *GPIOx)
   */
 __STATIC_INLINE uint32_t LL_GPIO_ReadInputPort(GPIO_TypeDef *GPIOx)
 {
-  return (uint32_t)(READ_REG(GPIOx->IDR));
+  return (READ_REG(GPIOx->IDR));
 }
 
 /**
@@ -742,7 +738,7 @@ __STATIC_INLINE uint32_t LL_GPIO_ReadInputPort(GPIO_TypeDef *GPIOx)
   */
 __STATIC_INLINE uint32_t LL_GPIO_IsInputPinSet(GPIO_TypeDef *GPIOx, uint32_t PinMask)
 {
-  return (READ_BIT(GPIOx->IDR, (PinMask >> 8 ) & 0x0000FFFFU) == ((PinMask >> 8 ) & 0x0000FFFFU));
+  return (READ_BIT(GPIOx->IDR, (PinMask >> GPIO_PIN_MASK_POS) & 0x0000FFFFU) == ((PinMask >> GPIO_PIN_MASK_POS) & 0x0000FFFFU));
 }
 
 /**
@@ -794,7 +790,7 @@ __STATIC_INLINE uint32_t LL_GPIO_ReadOutputPort(GPIO_TypeDef *GPIOx)
   */
 __STATIC_INLINE uint32_t LL_GPIO_IsOutputPinSet(GPIO_TypeDef *GPIOx, uint32_t PinMask)
 {
-  return (READ_BIT(GPIOx->ODR, (PinMask >> 8 ) & 0x0000FFFFU) == ((PinMask >> 8 ) & 0x0000FFFFU));
+  return (READ_BIT(GPIOx->ODR, (PinMask >> GPIO_PIN_MASK_POS) & 0x0000FFFFU) == ((PinMask >> GPIO_PIN_MASK_POS) & 0x0000FFFFU));
 }
 
 /**
@@ -823,7 +819,7 @@ __STATIC_INLINE uint32_t LL_GPIO_IsOutputPinSet(GPIO_TypeDef *GPIOx, uint32_t Pi
   */
 __STATIC_INLINE void LL_GPIO_SetOutputPin(GPIO_TypeDef *GPIOx, uint32_t PinMask)
 {
-  WRITE_REG(GPIOx->BSRR, (PinMask >> 8) & 0x0000FFFFU);
+  WRITE_REG(GPIOx->BSRR, (PinMask >> GPIO_PIN_MASK_POS) & 0x0000FFFFU);
 }
 
 /**
@@ -852,7 +848,7 @@ __STATIC_INLINE void LL_GPIO_SetOutputPin(GPIO_TypeDef *GPIOx, uint32_t PinMask)
   */
 __STATIC_INLINE void LL_GPIO_ResetOutputPin(GPIO_TypeDef *GPIOx, uint32_t PinMask)
 {
-  WRITE_REG(GPIOx->BRR, (PinMask >> 8 ) & 0x0000FFFFU);
+  WRITE_REG(GPIOx->BRR, (PinMask >> GPIO_PIN_MASK_POS) & 0x0000FFFFU);
 }
 
 /**
@@ -881,7 +877,7 @@ __STATIC_INLINE void LL_GPIO_ResetOutputPin(GPIO_TypeDef *GPIOx, uint32_t PinMas
   */
 __STATIC_INLINE void LL_GPIO_TogglePin(GPIO_TypeDef *GPIOx, uint32_t PinMask)
 {
-  WRITE_REG(GPIOx->ODR, READ_REG(GPIOx->ODR) ^ ((PinMask >> 8 ) & 0x0000FFFFU));
+  WRITE_REG(GPIOx->ODR, READ_REG(GPIOx->ODR) ^ ((PinMask >> GPIO_PIN_MASK_POS) & 0x0000FFFFU));
 }
 
 /**
@@ -1031,7 +1027,7 @@ __STATIC_INLINE uint32_t LL_GPIO_AF_IsEnabledRemap_USART2(void)
 __STATIC_INLINE void LL_GPIO_AF_EnableRemap_USART3(void)
 {
   CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_USART3_REMAP);
-  SET_BIT(AFIO->MAPR, AFIO_MAPR_USART3_REMAP_FULLREMAP); 
+  SET_BIT(AFIO->MAPR, AFIO_MAPR_USART3_REMAP_FULLREMAP);
 }
 
 /**
@@ -1043,7 +1039,7 @@ __STATIC_INLINE void LL_GPIO_AF_EnableRemap_USART3(void)
 __STATIC_INLINE void LL_GPIO_AF_RemapPartial_USART3(void)
 {
   CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_USART3_REMAP);
-  SET_BIT(AFIO->MAPR, AFIO_MAPR_USART3_REMAP_PARTIALREMAP); 
+  SET_BIT(AFIO->MAPR, AFIO_MAPR_USART3_REMAP_PARTIALREMAP);
 }
 
 /**
@@ -1055,7 +1051,7 @@ __STATIC_INLINE void LL_GPIO_AF_RemapPartial_USART3(void)
 __STATIC_INLINE void LL_GPIO_AF_DisableRemap_USART3(void)
 {
   CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_USART3_REMAP);
-  SET_BIT(AFIO->MAPR, AFIO_MAPR_USART3_REMAP_NOREMAP); 
+  SET_BIT(AFIO->MAPR, AFIO_MAPR_USART3_REMAP_NOREMAP);
 }
 #endif
 
@@ -1068,7 +1064,7 @@ __STATIC_INLINE void LL_GPIO_AF_DisableRemap_USART3(void)
 __STATIC_INLINE void LL_GPIO_AF_EnableRemap_TIM1(void)
 {
   CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_TIM1_REMAP);
-  SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM1_REMAP_FULLREMAP); 
+  SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM1_REMAP_FULLREMAP);
 }
 
 /**
@@ -1080,7 +1076,7 @@ __STATIC_INLINE void LL_GPIO_AF_EnableRemap_TIM1(void)
 __STATIC_INLINE void LL_GPIO_AF_RemapPartial_TIM1(void)
 {
   CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_TIM1_REMAP);
-  SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM1_REMAP_PARTIALREMAP); 
+  SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM1_REMAP_PARTIALREMAP);
 }
 
 /**
@@ -1092,7 +1088,7 @@ __STATIC_INLINE void LL_GPIO_AF_RemapPartial_TIM1(void)
 __STATIC_INLINE void LL_GPIO_AF_DisableRemap_TIM1(void)
 {
   CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_TIM1_REMAP);
-  SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM1_REMAP_NOREMAP); 
+  SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM1_REMAP_NOREMAP);
 }
 
 /**
@@ -1104,7 +1100,7 @@ __STATIC_INLINE void LL_GPIO_AF_DisableRemap_TIM1(void)
 __STATIC_INLINE void LL_GPIO_AF_EnableRemap_TIM2(void)
 {
   CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_TIM2_REMAP);
-  SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM2_REMAP_FULLREMAP); 
+  SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM2_REMAP_FULLREMAP);
 }
 
 /**
@@ -1116,7 +1112,7 @@ __STATIC_INLINE void LL_GPIO_AF_EnableRemap_TIM2(void)
 __STATIC_INLINE void LL_GPIO_AF_RemapPartial2_TIM2(void)
 {
   CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_TIM2_REMAP);
-  SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM2_REMAP_PARTIALREMAP2); 
+  SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM2_REMAP_PARTIALREMAP2);
 }
 
 /**
@@ -1128,7 +1124,7 @@ __STATIC_INLINE void LL_GPIO_AF_RemapPartial2_TIM2(void)
 __STATIC_INLINE void LL_GPIO_AF_RemapPartial1_TIM2(void)
 {
   CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_TIM2_REMAP);
-  SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM2_REMAP_PARTIALREMAP1); 
+  SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM2_REMAP_PARTIALREMAP1);
 }
 
 /**
@@ -1140,7 +1136,7 @@ __STATIC_INLINE void LL_GPIO_AF_RemapPartial1_TIM2(void)
 __STATIC_INLINE void LL_GPIO_AF_DisableRemap_TIM2(void)
 {
   CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_TIM2_REMAP);
-  SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM2_REMAP_NOREMAP); 
+  SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM2_REMAP_NOREMAP);
 }
 
 /**
@@ -1153,7 +1149,7 @@ __STATIC_INLINE void LL_GPIO_AF_DisableRemap_TIM2(void)
 __STATIC_INLINE void LL_GPIO_AF_EnableRemap_TIM3(void)
 {
   CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_TIM3_REMAP);
-  SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM3_REMAP_FULLREMAP); 
+  SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM3_REMAP_FULLREMAP);
 }
 
 /**
@@ -1166,7 +1162,7 @@ __STATIC_INLINE void LL_GPIO_AF_EnableRemap_TIM3(void)
 __STATIC_INLINE void LL_GPIO_AF_RemapPartial_TIM3(void)
 {
   CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_TIM3_REMAP);
-  SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM3_REMAP_PARTIALREMAP); 
+  SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM3_REMAP_PARTIALREMAP);
 }
 
 /**
@@ -1179,7 +1175,7 @@ __STATIC_INLINE void LL_GPIO_AF_RemapPartial_TIM3(void)
 __STATIC_INLINE void LL_GPIO_AF_DisableRemap_TIM3(void)
 {
   CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_TIM3_REMAP);
-  SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM3_REMAP_NOREMAP); 
+  SET_BIT(AFIO->MAPR, AFIO_MAPR_TIM3_REMAP_NOREMAP);
 }
 
 #if defined(AFIO_MAPR_TIM4_REMAP)
@@ -1228,7 +1224,7 @@ __STATIC_INLINE uint32_t LL_GPIO_AF_IsEnabledRemap_TIM4(void)
 __STATIC_INLINE void LL_GPIO_AF_RemapPartial1_CAN1(void)
 {
   CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_CAN_REMAP);
-  SET_BIT(AFIO->MAPR, AFIO_MAPR_CAN_REMAP_REMAP1); 
+  SET_BIT(AFIO->MAPR, AFIO_MAPR_CAN_REMAP_REMAP1);
 }
 
 /**
@@ -1240,7 +1236,7 @@ __STATIC_INLINE void LL_GPIO_AF_RemapPartial1_CAN1(void)
 __STATIC_INLINE void LL_GPIO_AF_RemapPartial2_CAN1(void)
 {
   CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_CAN_REMAP);
-  SET_BIT(AFIO->MAPR, AFIO_MAPR_CAN_REMAP_REMAP2); 
+  SET_BIT(AFIO->MAPR, AFIO_MAPR_CAN_REMAP_REMAP2);
 }
 
 /**
@@ -1252,7 +1248,7 @@ __STATIC_INLINE void LL_GPIO_AF_RemapPartial2_CAN1(void)
 __STATIC_INLINE void LL_GPIO_AF_RemapPartial3_CAN1(void)
 {
   CLEAR_BIT(AFIO->MAPR, AFIO_MAPR_CAN_REMAP);
-  SET_BIT(AFIO->MAPR, AFIO_MAPR_CAN_REMAP_REMAP3); 
+  SET_BIT(AFIO->MAPR, AFIO_MAPR_CAN_REMAP_REMAP3);
 }
 #endif
 
@@ -1575,7 +1571,7 @@ __STATIC_INLINE uint32_t LL_GPIO_AF_IsEnabledRemap_ADC2_ETRGREG(void)
 __STATIC_INLINE void LL_GPIO_AF_EnableRemap_SWJ(void)
 {
   CLEAR_BIT(AFIO->MAPR,AFIO_MAPR_SWJ_CFG);
-  SET_BIT(AFIO->MAPR, AFIO_MAPR_SWJ_CFG_RESET);  
+  SET_BIT(AFIO->MAPR, AFIO_MAPR_SWJ_CFG_RESET);
 }
 
 /**
@@ -1611,7 +1607,7 @@ __STATIC_INLINE void LL_GPIO_AF_Remap_SWJ_NOJTAG(void)
 __STATIC_INLINE void LL_GPIO_AF_DisableRemap_SWJ(void)
 {
   CLEAR_BIT(AFIO->MAPR,AFIO_MAPR_SWJ_CFG);
-  SET_BIT(AFIO->MAPR, AFIO_MAPR_SWJ_CFG_DISABLE);  
+  SET_BIT(AFIO->MAPR, AFIO_MAPR_SWJ_CFG_DISABLE);
 }
 
 #if defined(AFIO_MAPR_SPI3_REMAP)

workspace/TS100/HAL_Driver/Inc/stm32f1xx_ll_i2c.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_ll_i2c.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of I2C LL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_ll_iwdg.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_ll_iwdg.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of IWDG LL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_ll_pwr.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_ll_pwr.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of PWR LL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_ll_rcc.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_ll_rcc.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of RCC LL module.
   ******************************************************************************
   * @attention
@@ -424,8 +422,8 @@ typedef struct
 #define LL_RCC_PLLSOURCE_PLL2              (RCC_CFGR_PLLSRC | RCC_CFGR2_PREDIV1SRC << 4U) /*!< PLL2/PREDIV1 clock selected as PLL entry clock source */
 #endif /*RCC_CFGR2_PREDIV1SRC*/
 
-#define LL_RCC_PLLSOURCE_HSE_DIV_1         RCC_CFGR_PLLSRC                                /*!< HSE clock selected as PLL entry clock source */
 #if defined(RCC_CFGR2_PREDIV1)
+#define LL_RCC_PLLSOURCE_HSE_DIV_1         (RCC_CFGR_PLLSRC | RCC_CFGR2_PREDIV1_DIV1)    /*!< HSE/1 clock selected as PLL entry clock source */
 #define LL_RCC_PLLSOURCE_HSE_DIV_2         (RCC_CFGR_PLLSRC | RCC_CFGR2_PREDIV1_DIV2)    /*!< HSE/2 clock selected as PLL entry clock source */
 #define LL_RCC_PLLSOURCE_HSE_DIV_3         (RCC_CFGR_PLLSRC | RCC_CFGR2_PREDIV1_DIV3)    /*!< HSE/3 clock selected as PLL entry clock source */
 #define LL_RCC_PLLSOURCE_HSE_DIV_4         (RCC_CFGR_PLLSRC | RCC_CFGR2_PREDIV1_DIV4)    /*!< HSE/4 clock selected as PLL entry clock source */
@@ -442,6 +440,7 @@ typedef struct
 #define LL_RCC_PLLSOURCE_HSE_DIV_15        (RCC_CFGR_PLLSRC | RCC_CFGR2_PREDIV1_DIV15)   /*!< HSE/15 clock selected as PLL entry clock source */
 #define LL_RCC_PLLSOURCE_HSE_DIV_16        (RCC_CFGR_PLLSRC | RCC_CFGR2_PREDIV1_DIV16)   /*!< HSE/16 clock selected as PLL entry clock source */
 #if defined(RCC_CFGR2_PREDIV1SRC)
+#define LL_RCC_PLLSOURCE_PLL2_DIV_1        (RCC_CFGR_PLLSRC | RCC_CFGR2_PREDIV1_DIV1 | RCC_CFGR2_PREDIV1SRC << 4U)    /*!< PLL2/1 clock selected as PLL entry clock source */
 #define LL_RCC_PLLSOURCE_PLL2_DIV_2        (RCC_CFGR_PLLSRC | RCC_CFGR2_PREDIV1_DIV2 | RCC_CFGR2_PREDIV1SRC << 4U)    /*!< PLL2/2 clock selected as PLL entry clock source */
 #define LL_RCC_PLLSOURCE_PLL2_DIV_3        (RCC_CFGR_PLLSRC | RCC_CFGR2_PREDIV1_DIV3 | RCC_CFGR2_PREDIV1SRC << 4U)    /*!< PLL2/3 clock selected as PLL entry clock source */
 #define LL_RCC_PLLSOURCE_PLL2_DIV_4        (RCC_CFGR_PLLSRC | RCC_CFGR2_PREDIV1_DIV4 | RCC_CFGR2_PREDIV1SRC << 4U)    /*!< PLL2/4 clock selected as PLL entry clock source */
@@ -459,6 +458,7 @@ typedef struct
 #define LL_RCC_PLLSOURCE_PLL2_DIV_16       (RCC_CFGR_PLLSRC | RCC_CFGR2_PREDIV1_DIV16 | RCC_CFGR2_PREDIV1SRC << 4U)   /*!< PLL2/16 clock selected as PLL entry clock source */
 #endif /*RCC_CFGR2_PREDIV1SRC*/
 #else
+#define LL_RCC_PLLSOURCE_HSE_DIV_1         (RCC_CFGR_PLLSRC | 0x00000000U)               /*!< HSE/1 clock selected as PLL entry clock source */
 #define LL_RCC_PLLSOURCE_HSE_DIV_2         (RCC_CFGR_PLLSRC | RCC_CFGR_PLLXTPRE)         /*!< HSE/2 clock selected as PLL entry clock source */
 #endif /*RCC_CFGR2_PREDIV1*/
 /**
@@ -1451,6 +1451,7 @@ __STATIC_INLINE uint32_t LL_RCC_PLL_IsReady(void)
   *         @arg @ref LL_RCC_PLLSOURCE_HSE_DIV_14 (*)
   *         @arg @ref LL_RCC_PLLSOURCE_HSE_DIV_15 (*)
   *         @arg @ref LL_RCC_PLLSOURCE_HSE_DIV_16 (*)
+  *         @arg @ref LL_RCC_PLLSOURCE_PLL2_DIV_1 (*)
   *         @arg @ref LL_RCC_PLLSOURCE_PLL2_DIV_2 (*)
   *         @arg @ref LL_RCC_PLLSOURCE_PLL2_DIV_3 (*)
   *         @arg @ref LL_RCC_PLLSOURCE_PLL2_DIV_4 (*)
@@ -1503,6 +1504,24 @@ __STATIC_INLINE void LL_RCC_PLL_ConfigDomain_SYS(uint32_t Source, uint32_t PLLMu
 #endif /*RCC_CFGR2_PREDIV1*/
 }
 
+/**
+  * @brief  Configure PLL clock source
+  * @rmtoll CFGR      PLLSRC        LL_RCC_PLL_SetMainSource\n
+  *         CFGR2     PREDIV1SRC    LL_RCC_PLL_SetMainSource
+  * @param PLLSource This parameter can be one of the following values:
+  *         @arg @ref LL_RCC_PLLSOURCE_HSI_DIV_2
+  *         @arg @ref LL_RCC_PLLSOURCE_HSE
+  *         @arg @ref LL_RCC_PLLSOURCE_PLL2 (*)
+  * @retval None
+  */
+__STATIC_INLINE void LL_RCC_PLL_SetMainSource(uint32_t PLLSource)
+{
+#if defined(RCC_CFGR2_PREDIV1SRC)
+  MODIFY_REG(RCC->CFGR2, RCC_CFGR2_PREDIV1SRC, ((PLLSource & (RCC_CFGR2_PREDIV1SRC << 4U)) >> 4U));
+#endif /* RCC_CFGR2_PREDIV1SRC */
+  MODIFY_REG(RCC->CFGR, RCC_CFGR_PLLSRC, PLLSource);
+}
+
 /**
   * @brief  Get the oscillator used as PLL clock source.
   * @rmtoll CFGR         PLLSRC        LL_RCC_PLL_GetMainSource\n
@@ -1583,7 +1602,7 @@ __STATIC_INLINE uint32_t LL_RCC_PLL_GetPrediv(void)
 #if defined(RCC_CFGR2_PREDIV1)
   return (uint32_t)(READ_BIT(RCC->CFGR2, RCC_CFGR2_PREDIV1));
 #else
-  return (uint32_t)(READ_BIT(RCC->CFGR, RCC_CFGR_PLLXTPRE));
+  return (uint32_t)(READ_BIT(RCC->CFGR, RCC_CFGR_PLLXTPRE) >> RCC_CFGR_PLLXTPRE_Pos);
 #endif /*RCC_CFGR2_PREDIV1*/
 }
 

workspace/TS100/HAL_Driver/Inc/stm32f1xx_ll_rtc.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_ll_rtc.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of RTC LL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_ll_sdmmc.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_ll_sdmmc.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of low layer SDMMC HAL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_ll_spi.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_ll_spi.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of SPI LL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_ll_system.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_ll_system.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of SYSTEM LL module.
   @verbatim
   ==============================================================================

workspace/TS100/HAL_Driver/Inc/stm32f1xx_ll_tim.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_ll_tim.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of TIM LL module.
   ******************************************************************************
   * @attention
@@ -1059,7 +1057,7 @@ __STATIC_INLINE uint32_t LL_TIM_IsEnabledCounter(TIM_TypeDef *TIMx)
   */
 __STATIC_INLINE void LL_TIM_EnableUpdateEvent(TIM_TypeDef *TIMx)
 {
-  SET_BIT(TIMx->CR1, TIM_CR1_UDIS);
+  CLEAR_BIT(TIMx->CR1, TIM_CR1_UDIS);
 }
 
 /**
@@ -1070,7 +1068,7 @@ __STATIC_INLINE void LL_TIM_EnableUpdateEvent(TIM_TypeDef *TIMx)
   */
 __STATIC_INLINE void LL_TIM_DisableUpdateEvent(TIM_TypeDef *TIMx)
 {
-  CLEAR_BIT(TIMx->CR1, TIM_CR1_UDIS);
+  SET_BIT(TIMx->CR1, TIM_CR1_UDIS);
 }
 
 /**
@@ -1150,6 +1148,9 @@ __STATIC_INLINE uint32_t LL_TIM_GetOnePulseMode(TIM_TypeDef *TIMx)
   * @note Macro @ref IS_TIM_COUNTER_MODE_SELECT_INSTANCE(TIMx) can be used to
   *       check whether or not the counter mode selection feature is supported
   *       by a timer instance.
+  * @note Switching from Center Aligned counter mode to Edge counter mode (or reverse)
+  *       requires a timer reset to avoid unexpected direction
+  *       due to DIR bit readonly in center aligned mode.
   * @rmtoll CR1          DIR           LL_TIM_SetCounterMode\n
   *         CR1          CMS           LL_TIM_SetCounterMode
   * @param  TIMx Timer instance

workspace/TS100/HAL_Driver/Inc/stm32f1xx_ll_usart.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_ll_usart.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of USART LL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_ll_usb.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_ll_usb.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of USB Low Layer HAL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Inc/stm32f1xx_ll_utils.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_ll_utils.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of UTILS LL module.
   @verbatim
   ==============================================================================

workspace/TS100/HAL_Driver/Inc/stm32f1xx_ll_wwdg.h

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_ll_wwdg.h
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   Header file of WWDG LL module.
   ******************************************************************************
   * @attention

workspace/TS100/HAL_Driver/Src/stm32f1xx_hal.c

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal.c
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   HAL module driver.
   *          This is the common part of the HAL initialization
   *
@@ -13,9 +11,9 @@
   ==============================================================================
     [..]
     The common HAL driver contains a set of generic and common APIs that can be
-    used by the PPP peripheral drivers and the user to start using the HAL. 
+    used by the PPP peripheral drivers and the user to start using the HAL.
     [..]
-    The HAL contains two APIs' categories: 
+    The HAL contains two APIs' categories:
          (+) Common HAL APIs
          (+) Services HAL APIs
 
@@ -71,11 +69,11 @@
   * @{
   */
 /**
- * @brief STM32F1xx HAL Driver version number V1.1.1
+ * @brief STM32F1xx HAL Driver version number V1.1.3
    */
 #define __STM32F1xx_HAL_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
 #define __STM32F1xx_HAL_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
-#define __STM32F1xx_HAL_VERSION_SUB2   (0x01U) /*!< [15:8]  sub2 version */
+#define __STM32F1xx_HAL_VERSION_SUB2   (0x03U) /*!< [15:8]  sub2 version */
 #define __STM32F1xx_HAL_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
 #define __STM32F1xx_HAL_VERSION         ((__STM32F1xx_HAL_VERSION_MAIN << 24)\
                                         |(__STM32F1xx_HAL_VERSION_SUB1 << 16)\
@@ -95,6 +93,8 @@
   * @{
   */
 __IO uint32_t uwTick;
+uint32_t uwTickPrio   = (1UL << __NVIC_PRIO_BITS); /* Invalid PRIO */
+HAL_TickFreqTypeDef uwTickFreq = HAL_TICK_FREQ_DEFAULT;  /* 1KHz */
 /**
   * @}
   */
@@ -105,7 +105,7 @@ __IO uint32_t uwTick;
   * @{
   */
 
-/** @defgroup HAL_Exported_Functions_Group1 Initialization and de-initialization Functions 
+/** @defgroup HAL_Exported_Functions_Group1 Initialization and de-initialization Functions
  *  @brief    Initialization and de-initialization functions
  *
 @verbatim
@@ -113,33 +113,33 @@ __IO uint32_t uwTick;
               ##### Initialization and de-initialization functions #####
  ===============================================================================
    [..]  This section provides functions allowing to:
-      (+) Initializes the Flash interface, the NVIC allocation and initial clock 
+      (+) Initializes the Flash interface, the NVIC allocation and initial clock
-          configuration. It initializes the source of time base also when timeout 
+          configuration. It initializes the systick also when timeout is needed
-          is needed and the backup domain when enabled.
+          and the backup domain when enabled.
       (+) de-Initializes common part of the HAL.
-      (+) Configure The time base source to have 1ms time base with a dedicated 
+      (+) Configure The time base source to have 1ms time base with a dedicated
-          Tick interrupt priority. 
+          Tick interrupt priority.
-        (++) Systick timer is used by default as source of time base, but user 
+        (++) SysTick timer is used by default as source of time base, but user
-             can eventually implement his proper time base source (a general purpose 
+             can eventually implement his proper time base source (a general purpose
-             timer for example or other time source), keeping in mind that Time base 
+             timer for example or other time source), keeping in mind that Time base
-             duration should be kept 1ms since PPP_TIMEOUT_VALUEs are defined and 
+             duration should be kept 1ms since PPP_TIMEOUT_VALUEs are defined and
              handled in milliseconds basis.
-        (++) Time base configuration function (HAL_InitTick ()) is called automatically 
+        (++) Time base configuration function (HAL_InitTick ()) is called automatically
-             at the beginning of the program after reset by HAL_Init() or at any time 
+             at the beginning of the program after reset by HAL_Init() or at any time
-             when clock is configured, by HAL_RCC_ClockConfig(). 
+             when clock is configured, by HAL_RCC_ClockConfig().
-        (++) Source of time base is configured  to generate interrupts at regular 
+        (++) Source of time base is configured  to generate interrupts at regular
-             time intervals. Care must be taken if HAL_Delay() is called from a 
+             time intervals. Care must be taken if HAL_Delay() is called from a
-             peripheral ISR process, the Tick interrupt line must have higher priority 
+             peripheral ISR process, the Tick interrupt line must have higher priority
-            (numerically lower) than the peripheral interrupt. Otherwise the caller 
+            (numerically lower) than the peripheral interrupt. Otherwise the caller
-            ISR process will be blocked. 
+            ISR process will be blocked.
-       (++) functions affecting time base configurations are declared as __weak  
+       (++) functions affecting time base configurations are declared as __weak
              to make  override possible  in case of other  implementations in user file.
 @endverbatim
   * @{
   */
 
 /**
-  * @brief  This function is used to initialize the HAL Library; it must be the first 
+  * @brief  This function is used to initialize the HAL Library; it must be the first
   *         instruction to be executed in the main program (before to call any other
   *         HAL function), it performs the following:
   *           Configure the Flash prefetch.
@@ -147,9 +147,9 @@ __IO uint32_t uwTick;
   *           which is clocked by the HSI (at this stage, the clock is not yet
   *           configured and thus the system is running from the internal HSI at 16 MHz).
   *           Set NVIC Group Priority to 4.
-  *           Calls the HAL_MspInit() callback function defined in user file 
+  *           Calls the HAL_MspInit() callback function defined in user file
-  *           "stm32f1xx_hal_msp.c" to do the global low level hardware initialization 
+  *           "stm32f1xx_hal_msp.c" to do the global low level hardware initialization
-  *            
+  *
   * @note   SysTick is used as time base for the HAL_Delay() function, the application
   *         need to ensure that the SysTick time base is always set to 1 millisecond
   *         to have correct HAL operation.
@@ -172,7 +172,7 @@ HAL_StatusTypeDef HAL_Init(void)
   /* Set Interrupt Group Priority */
   HAL_NVIC_SetPriorityGrouping(NVIC_PRIORITYGROUP_4);
 
-  /* Use systick as time base source and configure 1ms tick (default clock after Reset is MSI) */
+  /* Use systick as time base source and configure 1ms tick (default clock after Reset is HSI) */
   HAL_InitTick(TICK_INT_PRIORITY);
 
   /* Init the low level hardware */
@@ -183,7 +183,7 @@ HAL_StatusTypeDef HAL_Init(void)
 }
 
 /**
-  * @brief This function de-Initializes common part of the HAL and stops the source
+  * @brief This function de-Initializes common part of the HAL and stops the systick.
   *        of time base.
   * @note This function is optional.
   * @retval HAL status
@@ -201,21 +201,21 @@ HAL_StatusTypeDef HAL_DeInit(void)
   __HAL_RCC_AHB_FORCE_RESET();
   __HAL_RCC_AHB_RELEASE_RESET();
 #endif
-  
+
   /* De-Init the low level hardware */
   HAL_MspDeInit();
-    
+
   /* Return function status */
   return HAL_OK;
 }
 
 /**
-  * @brief  Initializes the MSP.
+  * @brief  Initialize the MSP.
   * @retval None
   */
 __weak void HAL_MspInit(void)
 {
-  /* NOTE : This function Should not be modified, when the callback is needed,
+  /* NOTE : This function should not be modified, when the callback is needed,
             the HAL_MspInit could be implemented in the user file
    */
 }
@@ -226,34 +226,45 @@ __weak void HAL_MspInit(void)
   */
 __weak void HAL_MspDeInit(void)
 {
-  /* NOTE : This function Should not be modified, when the callback is needed,
+  /* NOTE : This function should not be modified, when the callback is needed,
             the HAL_MspDeInit could be implemented in the user file
    */
 }
 
 /**
-  * @brief This function configures the source of the time base. 
+  * @brief This function configures the source of the time base.
-  *        The time source is configured  to have 1ms time base with a dedicated 
+  *        The time source is configured  to have 1ms time base with a dedicated
   *        Tick interrupt priority.
   * @note This function is called  automatically at the beginning of program after
-  *       reset by HAL_Init() or at any time when clock is reconfigured  by HAL_RCC_ClockConfig(). 
+  *       reset by HAL_Init() or at any time when clock is reconfigured  by HAL_RCC_ClockConfig().
-  * @note In the default implementation, SysTick timer is the source of time base. 
+  * @note In the default implementation, SysTick timer is the source of time base.
-  *       It is used to generate interrupts at regular time intervals. 
+  *       It is used to generate interrupts at regular time intervals.
-  *       Care must be taken if HAL_Delay() is called from a peripheral ISR process, 
+  *       Care must be taken if HAL_Delay() is called from a peripheral ISR process,
-  *       The the SysTick interrupt must have higher priority (numerically lower) 
+  *       The SysTick interrupt must have higher priority (numerically lower)
   *       than the peripheral interrupt. Otherwise the caller ISR process will be blocked.
   *       The function is declared as __weak  to be overwritten  in case of other
   *       implementation  in user file.
-  * @param TickPriority: Tick interrupt priority.
+  * @param TickPriority Tick interrupt priority.
   * @retval HAL status
   */
 __weak HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 {
-  /*Configure the SysTick to have interrupt in 1ms time basis*/
+  /* Configure the SysTick to have interrupt in 1ms time basis*/
-  HAL_SYSTICK_Config(SystemCoreClock/1000U);
+  if (HAL_SYSTICK_Config(SystemCoreClock / (1000U / uwTickFreq)) > 0U)
+  {
+    return HAL_ERROR;
+  }
 
-  /*Configure the SysTick IRQ priority */
+  /* Configure the SysTick IRQ priority */
-  HAL_NVIC_SetPriority(SysTick_IRQn, TickPriority ,0U);
+  if (TickPriority < (1UL << __NVIC_PRIO_BITS))
+  {
+    HAL_NVIC_SetPriority(SysTick_IRQn, TickPriority, 0U);
+    uwTickPrio = TickPriority;
+  }
+  else
+  {
+    return HAL_ERROR;
+  }
 
   /* Return function status */
   return HAL_OK;
@@ -263,7 +274,7 @@ __weak HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
   * @}
   */
 
-/** @defgroup HAL_Exported_Functions_Group2 HAL Control functions 
+/** @defgroup HAL_Exported_Functions_Group2 HAL Control functions
   *  @brief    HAL Control functions
   *
 @verbatim
@@ -290,19 +301,19 @@ __weak HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
   * @brief This function is called to increment  a global variable "uwTick"
   *        used as application time base.
   * @note In the default implementation, this variable is incremented each 1ms
-  *       in Systick ISR.
+  *       in SysTick ISR.
-  * @note This function is declared as __weak to be overwritten in case of other 
+  * @note This function is declared as __weak to be overwritten in case of other
   *      implementations in user file.
   * @retval None
   */
 __weak void HAL_IncTick(void)
 {
-  uwTick++;
+  uwTick += uwTickFreq;
 }
 
 /**
   * @brief Provides a tick value in millisecond.
-  * @note  This function is declared as __weak  to be overwritten  in case of other 
+  * @note  This function is declared as __weak to be overwritten in case of other
   *       implementations in user file.
   * @retval tick value
   */
@@ -312,28 +323,66 @@ __weak uint32_t HAL_GetTick(void)
 }
 
 /**
-  * @brief This function provides minimum delay (in milliseconds) based 
+  * @brief This function returns a tick priority.
+  * @retval tick priority
+  */
+uint32_t HAL_GetTickPrio(void)
+{
+  return uwTickPrio;
+}
+
+/**
+  * @brief Set new tick Freq.
+  * @retval Status
+  */
+HAL_StatusTypeDef HAL_SetTickFreq(HAL_TickFreqTypeDef Freq)
+{
+  HAL_StatusTypeDef status  = HAL_OK;
+  assert_param(IS_TICKFREQ(Freq));
+
+  if (uwTickFreq != Freq)
+  {
+    uwTickFreq = Freq;
+
+    /* Apply the new tick Freq  */
+    status = HAL_InitTick(uwTickPrio);
+  }
+
+  return status;
+}
+
+/**
+  * @brief Return tick frequency.
+  * @retval tick period in Hz
+  */
+HAL_TickFreqTypeDef HAL_GetTickFreq(void)
+{
+  return uwTickFreq;
+}
+
+/**
+  * @brief This function provides minimum delay (in milliseconds) based
   *        on variable incremented.
   * @note In the default implementation , SysTick timer is the source of time base.
   *       It is used to generate interrupts at regular time intervals where uwTick
   *       is incremented.
   * @note This function is declared as __weak to be overwritten in case of other
   *       implementations in user file.
-  * @param Delay: specifies the delay time length, in milliseconds.
+  * @param Delay specifies the delay time length, in milliseconds.
   * @retval None
   */
-__weak void HAL_Delay(__IO uint32_t Delay)
+__weak void HAL_Delay(uint32_t Delay)
 {
   uint32_t tickstart = HAL_GetTick();
   uint32_t wait = Delay;
-  
+
-  /* Add a period to guarantee minimum wait */
+  /* Add a freq to guarantee minimum wait */
   if (wait < HAL_MAX_DELAY)
   {
-     wait++;
+    wait += (uint32_t)(uwTickFreq);
   }
-  
+
-  while((HAL_GetTick() - tickstart) < wait)
+  while ((HAL_GetTick() - tickstart) < wait)
   {
   }
 }
@@ -342,7 +391,7 @@ __weak void HAL_Delay(__IO uint32_t Delay)
   * @brief Suspend Tick increment.
   * @note In the default implementation , SysTick timer is the source of time base. It is
   *       used to generate interrupts at regular time intervals. Once HAL_SuspendTick()
-  *       is called, the SysTick interrupt will be disabled and so Tick increment 
+  *       is called, the SysTick interrupt will be disabled and so Tick increment
   *       is suspended.
   * @note This function is declared as __weak to be overwritten in case of other
   *       implementations in user file.
@@ -351,14 +400,14 @@ __weak void HAL_Delay(__IO uint32_t Delay)
 __weak void HAL_SuspendTick(void)
 {
   /* Disable SysTick Interrupt */
-  CLEAR_BIT(SysTick->CTRL,SysTick_CTRL_TICKINT_Msk);
+  CLEAR_BIT(SysTick->CTRL, SysTick_CTRL_TICKINT_Msk);
 }
 
 /**
   * @brief Resume Tick increment.
   * @note In the default implementation , SysTick timer is the source of time base. It is
   *       used to generate interrupts at regular time intervals. Once HAL_ResumeTick()
-  *       is called, the SysTick interrupt will be enabled and so Tick increment 
+  *       is called, the SysTick interrupt will be enabled and so Tick increment
   *       is resumed.
   * @note This function is declared as __weak to be overwritten in case of other
   *       implementations in user file.
@@ -367,16 +416,16 @@ __weak void HAL_SuspendTick(void)
 __weak void HAL_ResumeTick(void)
 {
   /* Enable SysTick Interrupt */
-  SET_BIT(SysTick->CTRL,SysTick_CTRL_TICKINT_Msk);
+  SET_BIT(SysTick->CTRL, SysTick_CTRL_TICKINT_Msk);
 }
 
 /**
   * @brief  Returns the HAL revision
-  * @retval version : 0xXYZR (8bits for each decimal, R for RC)
+  * @retval version 0xXYZR (8bits for each decimal, R for RC)
   */
 uint32_t HAL_GetHalVersion(void)
 {
- return __STM32F1xx_HAL_VERSION;
+  return __STM32F1xx_HAL_VERSION;
 }
 
 /**
@@ -385,14 +434,14 @@ uint32_t HAL_GetHalVersion(void)
   *                  STM32F101xC/D/E and STM32F103xC/D/E,
   *                  STM32F101xF/G and STM32F103xF/G
   *                  STM32F10xx4 and STM32F10xx6
-  *       Debug registers DBGMCU_IDCODE and DBGMCU_CR are accessible only in 
+  *       Debug registers DBGMCU_IDCODE and DBGMCU_CR are accessible only in
   *       debug mode (not accessible by the user software in normal mode).
   *       Refer to errata sheet of these devices for more details.
   * @retval Device revision identifier
   */
 uint32_t HAL_GetREVID(void)
 {
-  return((DBGMCU->IDCODE) >> DBGMCU_IDCODE_REV_ID_Pos);
+  return ((DBGMCU->IDCODE) >> DBGMCU_IDCODE_REV_ID_Pos);
 }
 
 /**
@@ -401,14 +450,14 @@ uint32_t HAL_GetREVID(void)
   *                  STM32F101xC/D/E and STM32F103xC/D/E,
   *                  STM32F101xF/G and STM32F103xF/G
   *                  STM32F10xx4 and STM32F10xx6
-  *       Debug registers DBGMCU_IDCODE and DBGMCU_CR are accessible only in 
+  *       Debug registers DBGMCU_IDCODE and DBGMCU_CR are accessible only in
   *       debug mode (not accessible by the user software in normal mode).
   *       Refer to errata sheet of these devices for more details.
   * @retval Device identifier
   */
 uint32_t HAL_GetDEVID(void)
 {
-   return((DBGMCU->IDCODE) & IDCODE_DEVID_MASK);
+  return ((DBGMCU->IDCODE) & IDCODE_DEVID_MASK);
 }
 
 /**
@@ -426,7 +475,7 @@ void HAL_DBGMCU_EnableDBGSleepMode(void)
   *                  STM32F101xC/D/E and STM32F103xC/D/E,
   *                  STM32F101xF/G and STM32F103xF/G
   *                  STM32F10xx4 and STM32F10xx6
-  *       Debug registers DBGMCU_IDCODE and DBGMCU_CR are accessible only in 
+  *       Debug registers DBGMCU_IDCODE and DBGMCU_CR are accessible only in
   *       debug mode (not accessible by the user software in normal mode).
   *       Refer to errata sheet of these devices for more details.
   * @retval None
@@ -442,18 +491,18 @@ void HAL_DBGMCU_DisableDBGSleepMode(void)
   *                  STM32F101xC/D/E and STM32F103xC/D/E,
   *                  STM32F101xF/G and STM32F103xF/G
   *                  STM32F10xx4 and STM32F10xx6
-  *       Debug registers DBGMCU_IDCODE and DBGMCU_CR are accessible only in 
+  *       Debug registers DBGMCU_IDCODE and DBGMCU_CR are accessible only in
   *       debug mode (not accessible by the user software in normal mode).
   *       Refer to errata sheet of these devices for more details.
   * Note: On all STM32F1 devices:
-  *       If the system tick timer interrupt is enabled during the Stop mode 
+  *       If the system tick timer interrupt is enabled during the Stop mode
   *       debug (DBG_STOP bit set in the DBGMCU_CR register ), it will wakeup
   *       the system from Stop mode.
-  *       Workaround: To debug the Stop mode, disable the system tick timer 
+  *       Workaround: To debug the Stop mode, disable the system tick timer
   *       interrupt.
   *       Refer to errata sheet of these devices for more details.
   * Note: On all STM32F1 devices:
-  *       If the system tick timer interrupt is enabled during the Stop mode  
+  *       If the system tick timer interrupt is enabled during the Stop mode
   *       debug (DBG_STOP bit set in the DBGMCU_CR register ), it will wakeup
   *       the system from Stop mode.
   *       Workaround: To debug the Stop mode, disable the system tick timer
@@ -472,7 +521,7 @@ void HAL_DBGMCU_EnableDBGStopMode(void)
   *                  STM32F101xC/D/E and STM32F103xC/D/E,
   *                  STM32F101xF/G and STM32F103xF/G
   *                  STM32F10xx4 and STM32F10xx6
-  *       Debug registers DBGMCU_IDCODE and DBGMCU_CR are accessible only in 
+  *       Debug registers DBGMCU_IDCODE and DBGMCU_CR are accessible only in
   *       debug mode (not accessible by the user software in normal mode).
   *       Refer to errata sheet of these devices for more details.
   * @retval None
@@ -488,7 +537,7 @@ void HAL_DBGMCU_DisableDBGStopMode(void)
   *                  STM32F101xC/D/E and STM32F103xC/D/E,
   *                  STM32F101xF/G and STM32F103xF/G
   *                  STM32F10xx4 and STM32F10xx6
-  *       Debug registers DBGMCU_IDCODE and DBGMCU_CR are accessible only in 
+  *       Debug registers DBGMCU_IDCODE and DBGMCU_CR are accessible only in
   *       debug mode (not accessible by the user software in normal mode).
   *       Refer to errata sheet of these devices for more details.
   * @retval None
@@ -504,7 +553,7 @@ void HAL_DBGMCU_EnableDBGStandbyMode(void)
   *                  STM32F101xC/D/E and STM32F103xC/D/E,
   *                  STM32F101xF/G and STM32F103xF/G
   *                  STM32F10xx4 and STM32F10xx6
-  *       Debug registers DBGMCU_IDCODE and DBGMCU_CR are accessible only in 
+  *       Debug registers DBGMCU_IDCODE and DBGMCU_CR are accessible only in
   *       debug mode (not accessible by the user software in normal mode).
   *       Refer to errata sheet of these devices for more details.
   * @retval None
@@ -516,7 +565,7 @@ void HAL_DBGMCU_DisableDBGStandbyMode(void)
 
 /**
   * @brief Return the unique device identifier (UID based on 96 bits)
-  * @param UID: pointer to 3 words array.
+  * @param UID pointer to 3 words array.
   * @retval Device identifier
   */
 void HAL_GetUID(uint32_t *UID)

workspace/TS100/HAL_Driver/Src/stm32f1xx_hal_adc.c

@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32f1xx_hal_adc.c
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    12-May-2017
   * @brief   This file provides firmware functions to manage the following 
   *          functionalities of the Analog to Digital Convertor (ADC)
   *          peripheral: